validate zeroconf channel once mined

Author: f321x

electrum/lnchannel.py

@@ -191,6 +191,7 @@ class AbstractChannel(Logger, ABC):
     short_channel_id: Optional[ShortChannelID] = None
     funding_outpoint: Outpoint
     node_id: bytes  # note that it might not be the full 33 bytes; for OCB it is only the prefix
+    should_request_force_close: bool = False
     _state: ChannelState
 
     def set_short_channel_id(self, short_id: ShortChannelID) -> None:
@@ -398,13 +399,20 @@ def update_funded_state(self, *, funding_txid: str, funding_height: TxMinedInfo)
         if funding_height.conf>0:
             self.set_short_channel_id(ShortChannelID.from_components(
                 funding_height.height, funding_height.txpos, self.funding_outpoint.output_index))
-            if self.is_zeroconf():
-                # remove zeroconf flag as we are now confirmed, this is to prevent an electrum server causing
-                # us to remove a channel later in update_unfunded_state by omitting its funding tx
-                self.remove_zeroconf_flag()
         if self.get_state() == ChannelState.OPENING:
             if self.is_funding_tx_mined(funding_height):
                 self.set_state(ChannelState.FUNDED)
+        elif self.is_zeroconf() and funding_height.conf >= 3 and not self.should_request_force_close:
+            if not self.is_funding_tx_mined(funding_height):
+                # funding tx is invalid (invalid amount or address) we need to get rid of the channel again
+                self.should_request_force_close = True
+                if self.lnworker and self.node_id in self.lnworker.peers:
+                    # reconnect to trigger force close request
+                    self.lnworker.peers[self.node_id].close_and_cleanup()
+            else:
+                # remove zeroconf flag as we are now confirmed, this is to prevent an electrum server causing
+                # us to remove a channel later in update_unfunded_state by omitting its funding tx
+                self.remove_zeroconf_flag()
 
     def update_closed_state(self, *, funding_txid: str, funding_height: TxMinedInfo,
                             closing_txid: str, closing_height: TxMinedInfo, keep_watching: bool) -> None:
@@ -775,7 +783,6 @@ def __init__(self, state: 'StoredDict', *, name=None, lnworker=None, initial_fee
         self.revocation_store = RevocationStore(state["revocation_store"])
         self._can_send_ctx_updates = True  # type: bool
         self._receive_fail_reasons = {}  # type: Dict[int, (bytes, OnionRoutingFailure)]
-        self.should_request_force_close = False
         self.unconfirmed_closing_txid = None # not a state, only for GUI
         self.sent_channel_ready = False # no need to persist this, because channel_ready is re-sent in channel_reestablish
         self.sent_announcement_signatures = False

tests/regtest.py

@@ -4,8 +4,6 @@
 import subprocess
 from typing import Mapping, Any
 
-from electrum.simple_config import SimpleConfig
-
 
 class TestLightning(unittest.TestCase):
     agents: Mapping[str, Mapping[str, Any]]
@@ -51,7 +49,7 @@ class TestLightningAB(TestLightning):
         'alice': {
         },
         'bob': {
-            SimpleConfig.LIGHTNING_LISTEN.key(): 'localhost:9735',
+            'lightning_listen': 'localhost:9735',
         }
     }
 
@@ -83,15 +81,15 @@ def test_breach_with_spent_htlc(self):
 class TestLightningSwapserver(TestLightning):
     agents = {
         'alice': {
-            SimpleConfig.LIGHTNING_USE_GOSSIP.key(): 'false',
-            SimpleConfig.SWAPSERVER_URL.key(): 'http://localhost:5455',
-            SimpleConfig.NOSTR_RELAYS.key(): "''",
+            'use_gossip': 'false',
+            'swapserver_url': 'http://localhost:5455',
+            'nostr_relays': "''",
         },
         'bob': {
-            SimpleConfig.LIGHTNING_LISTEN.key(): 'localhost:9735',
+            'lightning_listen': 'localhost:9735',
             'enable_plugin_swapserver': 'true',
-            SimpleConfig.SWAPSERVER_PORT.key(): '5455',
-            SimpleConfig.NOSTR_RELAYS.key(): "''",
+            'swapserver_port': '5455',
+            'nostr_relays': "''",
         }
     }
 
@@ -111,14 +109,14 @@ class TestLightningWatchtower(TestLightning):
         'alice': {
         },
         'bob': {
-            SimpleConfig.LIGHTNING_LISTEN.key(): 'localhost:9735',
-            SimpleConfig.WATCHTOWER_CLIENT_URL.key(): 'http://wtuser:[email protected]:12345',
+            'lightning_listen': 'localhost:9735',
+            'watchtower_url': 'http://wtuser:[email protected]:12345',
         },
         'carol': {
             'enable_plugin_watchtower': 'true',
-            SimpleConfig.WATCHTOWER_SERVER_USER.key(): 'wtuser',
-            SimpleConfig.WATCHTOWER_SERVER_PASSWORD.key(): 'wtpassword',
-            SimpleConfig.WATCHTOWER_SERVER_PORT.key(): '12345',
+            'watchtower_user': 'wtuser',
+            'watchtower_password': 'wtpassword',
+            'watchtower_port': '12345',
         }
     }
 
@@ -129,12 +127,12 @@ def test_watchtower(self):
 class TestLightningJIT(TestLightning):
     agents = {
         'alice': {
-            SimpleConfig.ACCEPT_ZEROCONF_CHANNELS.key(): 'true',
+            'accept_zeroconf_channels': 'true',
         },
         'bob': {
-            SimpleConfig.LIGHTNING_LISTEN.key(): 'localhost:9735',
-            SimpleConfig.EXPERIMENTAL_LN_FORWARD_PAYMENTS.key(): 'true',
-            SimpleConfig.ACCEPT_ZEROCONF_CHANNELS.key(): 'true',
+            'lightning_listen': 'localhost:9735',
+            'lightning_forward_payments': 'true',
+            'accept_zeroconf_channels': 'true',
         },
         'carol': {
         }
@@ -147,16 +145,16 @@ def test_just_in_time(self):
 class TestLightningJITTrampoline(TestLightningJIT):
     agents = {
         'alice': {
-            SimpleConfig.LIGHTNING_USE_GOSSIP.key(): 'false',
-            SimpleConfig.ACCEPT_ZEROCONF_CHANNELS.key(): 'true',
+            'use_gossip': 'false',
+            'accept_zeroconf_channels': 'true',
         },
         'bob': {
-            SimpleConfig.LIGHTNING_LISTEN.key(): 'localhost:9735',
-            SimpleConfig.EXPERIMENTAL_LN_FORWARD_PAYMENTS.key(): 'true',
-            SimpleConfig.EXPERIMENTAL_LN_FORWARD_TRAMPOLINE_PAYMENTS.key(): 'true',
-            SimpleConfig.ACCEPT_ZEROCONF_CHANNELS.key(): 'true',
+            'lightning_listen': 'localhost:9735',
+            'lightning_forward_payments': 'true',
+            'lightning_forward_trampoline_payments': 'true',
+            'accept_zeroconf_channels': 'true',
         },
         'carol': {
-            SimpleConfig.LIGHTNING_USE_GOSSIP.key(): 'false',
+            'use_gossip': 'false',
         }
     }