electrum

commit 4b37343c6255d156d9b25190d22e7fb8a602d2a2
parent d6b4268fdeabd9c8c004e1a226a1ed2118375a00
Author: SomberNight <somber.night@protonmail.com>
Date:   Thu, 18 Oct 2018 15:37:01 +0200

unify hardcoded regtest fee

Diffstat:
M
electrum/lnbase.py
 | 
4
++--
M
electrum/simple_config.py
 | 
3
++-

2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/electrum/lnbase.py b/electrum/lnbase.py
@@ -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)
 
     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:
-            return 45000
-        from .simple_config import FEE_LN_ETA_TARGET, FEERATE_FALLBACK_STATIC_FEE
+            return FEERATE_REGTEST_HARDCODED // 4
         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
@@ -28,6 +28,7 @@ FEERATE_FALLBACK_STATIC_FEE = 150000
 FEERATE_DEFAULT_RELAY = 1000
 FEERATE_STATIC_VALUES = [1000, 2000, 5000, 10000, 20000, 30000,
                          50000, 70000, 100000, 150000, 200000, 300000]
+FEERATE_REGTEST_HARDCODED = 180000  # for eclair compat
 
 
 config = None
@@ -511,7 +512,7 @@ class SimpleConfig(Logger):
         fee_level: float between 0.0 and 1.0, representing fee slider position
         """
         if constants.net is constants.BitcoinRegtest:
-            return 45000
+            return FEERATE_REGTEST_HARDCODED
         if dyn is None:
             dyn = self.is_dynfee()
         if mempool is None: