AaronFiore/electrum
1
0
Fork 0
Code Activity

unify hardcoded regtest fee

Browse Source
This commit is contained in:
SomberNight
2018-10-18 15:37:01 +02:00
committed by ThomasV
parent d6b4268fde
commit 4b37343c62
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
electrum/lnbase.py
View File

@@ -1052,9 +1052,9 @@ class Peer(PrintError):
await self.update_channel(chan, "update_fee", channel_id=chan.channel_id, feerate_per_kw=feerate_per_kw) await self.update_channel(chan, "update_fee", channel_id=chan.channel_id, feerate_per_kw=feerate_per_kw)
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
if constants.net is constants.BitcoinRegtest: if constants.net is constants.BitcoinRegtest:
return 45000 return FEERATE_REGTEST_HARDCODED // 4
from .simple_config import FEE_LN_ETA_TARGET, FEERATE_FALLBACK_STATIC_FEE
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

@@ -28,6 +28,7 @@ FEERATE_FALLBACK_STATIC_FEE = 150000
FEERATE_DEFAULT_RELAY = 1000 FEERATE_DEFAULT_RELAY = 1000
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
config = None config = None
@@ -511,7 +512,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 45000 return FEERATE_REGTEST_HARDCODED
if dyn is None: if dyn is None:
dyn = self.is_dynfee() dyn = self.is_dynfee()
if mempool is None: if mempool is None: