From d62a4833e596831b322bdc55d954d35dc4f273ff Mon Sep 17 00:00:00 2001 From: SomberNight Date: Sat, 3 Apr 2021 04:13:28 +0200 Subject: [PATCH] lnpeer.channel_establishment_flow: check funding_sat in bounds earlier closes #7169 --- electrum/lnpeer.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/electrum/lnpeer.py b/electrum/lnpeer.py index 91f281d1e..9553281e6 100644 --- a/electrum/lnpeer.py +++ b/electrum/lnpeer.py @@ -600,9 +600,6 @@ class Peer(Logger): if not self.lnworker.channel_db and not self.lnworker.is_trampoline_peer(self.pubkey): raise Exception('Not a trampoline node: ' + str(self.their_features)) - feerate = self.lnworker.current_feerate_per_kw() - local_config = self.make_local_config(funding_sat, push_msat, LOCAL) - if funding_sat > LN_MAX_FUNDING_SAT: raise Exception( f"MUST set funding_satoshis to less than 2^24 satoshi. " @@ -614,6 +611,9 @@ class Peer(Logger): if funding_sat < lnutil.MIN_FUNDING_SAT: raise Exception(f"funding_sat too low: {funding_sat} < {lnutil.MIN_FUNDING_SAT}") + feerate = self.lnworker.current_feerate_per_kw() + local_config = self.make_local_config(funding_sat, push_msat, LOCAL) + # for the first commitment transaction per_commitment_secret_first = get_per_commitment_secret_from_seed( local_config.per_commitment_secret_seed,