From 8f5b395ddc9f8e4ea5589ae0eaed667576360f45 Mon Sep 17 00:00:00 2001 From: SomberNight Date: Mon, 13 Jan 2025 14:53:16 +0000 Subject: [PATCH] lnworker.open_channel: move max funding_sat check deeper in call stack open_channel_with_peer was missing this check --- electrum/lnworker.py | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/electrum/lnworker.py b/electrum/lnworker.py index b4b8ce734..a00dc12e2 100644 --- a/electrum/lnworker.py +++ b/electrum/lnworker.py @@ -1311,8 +1311,14 @@ class LNWallet(LNWorker): public: bool, zeroconf=False, opening_fee=None, - password: Optional[str]) -> Tuple[Channel, PartialTransaction]: + password: Optional[str], + ) -> Tuple[Channel, PartialTransaction]: + if funding_sat > self.config.LIGHTNING_MAX_FUNDING_SAT: + raise Exception( + _("Requested channel capacity is over maximum.") + + f"\n{funding_sat} sat > {self.config.LIGHTNING_MAX_FUNDING_SAT} sat" + ) coro = peer.channel_establishment_flow( funding_tx=funding_tx, funding_sat=funding_sat, @@ -1409,10 +1415,8 @@ class LNWallet(LNWorker): funding_sat: int, push_amt_sat: int, public: bool = False, - password: str = None) -> Tuple[Channel, PartialTransaction]: - - if funding_sat > self.config.LIGHTNING_MAX_FUNDING_SAT: - raise Exception(_("Requested channel capacity is over maximum.")) + password: str = None, + ) -> Tuple[Channel, PartialTransaction]: fut = asyncio.run_coroutine_threadsafe(self.add_peer(connect_str), self.network.asyncio_loop) try: