diff --git a/electrum/lnworker.py b/electrum/lnworker.py index eab583ace..e23856bd1 100644 --- a/electrum/lnworker.py +++ b/electrum/lnworker.py @@ -2743,10 +2743,10 @@ class LNWallet(LNWorker): await self.taskgroup.spawn(self.reestablish_peer_for_given_channel(chan)) def current_feerate_per_kw(self): - from .simple_config import FEE_LN_ETA_TARGET, FEERATE_FALLBACK_STATIC_FEE, FEERATE_REGTEST_HARDCODED + from .simple_config import FEE_LN_ETA_TARGET, FEERATE_FALLBACK_STATIC_FEE from .simple_config import FEERATE_PER_KW_MIN_RELAY_LIGHTNING if constants.net is constants.BitcoinRegtest: - return FEERATE_REGTEST_HARDCODED // 4 + return self.network.config.FEE_EST_STATIC_FEERATE feerate_per_kvbyte = self.network.config.eta_target_to_fee(FEE_LN_ETA_TARGET) if feerate_per_kvbyte is None: feerate_per_kvbyte = FEERATE_FALLBACK_STATIC_FEE diff --git a/electrum/simple_config.py b/electrum/simple_config.py index 0d9400604..8431dbcea 100644 --- a/electrum/simple_config.py +++ b/electrum/simple_config.py @@ -34,7 +34,6 @@ FEERATE_DEFAULT_RELAY = 1000 FEERATE_MAX_RELAY = 50000 FEERATE_STATIC_VALUES = [1000, 2000, 5000, 10000, 20000, 30000, 50000, 70000, 100000, 150000, 200000, 300000] -FEERATE_REGTEST_HARDCODED = 180000 # for eclair compat # The min feerate_per_kw that can be used in lightning so that # the resulting onchain tx pays the min relay fee. @@ -728,7 +727,7 @@ class SimpleConfig(Logger): fee_level: float between 0.0 and 1.0, representing fee slider position """ if constants.net is constants.BitcoinRegtest: - return FEERATE_REGTEST_HARDCODED + return self.FEE_EST_STATIC_FEERATE if dyn is None: dyn = self.is_dynfee() if mempool is None: