AaronFiore/electrum
1
0
Fork 0
Code Activity

regtest: use static fees instead of hardcoded value

Browse Source 
this allows to bump fees using "setfeerate"
This commit is contained in:
ThomasV
2023-10-24 12:22:36 +02:00
parent eb676b3dc1
commit 45b248fdef
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
electrum/lnworker.py
View File

@@ -2743,10 +2743,10 @@ class LNWallet(LNWorker):
await self.taskgroup.spawn(self.reestablish_peer_for_given_channel(chan)) await self.taskgroup.spawn(self.reestablish_peer_for_given_channel(chan))
def current_feerate_per_kw(self): 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 from .simple_config import FEERATE_PER_KW_MIN_RELAY_LIGHTNING
if constants.net is constants.BitcoinRegtest: 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) feerate_per_kvbyte = self.network.config.eta_target_to_fee(FEE_LN_ETA_TARGET)
if feerate_per_kvbyte is None: if feerate_per_kvbyte is None:
feerate_per_kvbyte = FEERATE_FALLBACK_STATIC_FEE feerate_per_kvbyte = FEERATE_FALLBACK_STATIC_FEE

3
electrum/simple_config.py
View File

@@ -34,7 +34,6 @@ FEERATE_DEFAULT_RELAY = 1000
FEERATE_MAX_RELAY = 50000 FEERATE_MAX_RELAY = 50000
FEERATE_STATIC_VALUES = [1000, 2000, 5000, 10000, 20000, 30000, FEERATE_STATIC_VALUES = [1000, 2000, 5000, 10000, 20000, 30000,
50000, 70000, 100000, 150000, 200000, 300000] 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 min feerate_per_kw that can be used in lightning so that
# the resulting onchain tx pays the min relay fee. # 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 fee_level: float between 0.0 and 1.0, representing fee slider position
""" """
if constants.net is constants.BitcoinRegtest: if constants.net is constants.BitcoinRegtest:
return FEERATE_REGTEST_HARDCODED return self.FEE_EST_STATIC_FEERATE
if dyn is None: if dyn is None:
dyn = self.is_dynfee() dyn = self.is_dynfee()
if mempool is None: if mempool is None: