AaronFiore/electrum
1
0
Fork 0
Code Activity

fee_policy: move regtest fallback even deeper

Browse Source
This commit is contained in:
SomberNight
2025-06-28 04:25:10 +00:00
parent 848e605a80
commit 50d48aee2d
2 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
electrum/fee_policy.py
View File

@@ -218,9 +218,6 @@ class FeePolicy(Logger):
"""Returns sat/kvB fee to pay for a txn. """Returns sat/kvB fee to pay for a txn.
Note: might return None. Note: might return None.
""" """
if self.use_dynamic_estimates and constants.net is constants.BitcoinRegtest:
return FEERATE_REGTEST_STATIC_FEE
if self.method == FeeMethod.FEERATE: if self.method == FeeMethod.FEERATE:
fee_rate = self.value fee_rate = self.value
elif self.method == FeeMethod.MEMPOOL: elif self.method == FeeMethod.MEMPOOL:
@@ -426,4 +423,7 @@ class FeeTimeEstimates:
fee = self.data.get(num_blocks) fee = self.data.get(num_blocks)
if fee is not None: if fee is not None:
fee = int(fee) fee = int(fee)
# fallback for regtest
if fee is None and constants.net is constants.BitcoinRegtest:
return FEERATE_REGTEST_STATIC_FEE
return fee return fee

7
electrum/lnworker.py
View File

@@ -40,7 +40,7 @@ from .util import (
) )
from .fee_policy import ( from .fee_policy import (
FeePolicy, FEERATE_FALLBACK_STATIC_FEE, FEE_LN_ETA_TARGET, FEE_LN_LOW_ETA_TARGET, FeePolicy, FEERATE_FALLBACK_STATIC_FEE, FEE_LN_ETA_TARGET, FEE_LN_LOW_ETA_TARGET,
FEERATE_PER_KW_MIN_RELAY_LIGHTNING, FEE_LN_MINIMUM_ETA_TARGET, FEERATE_REGTEST_STATIC_FEE FEERATE_PER_KW_MIN_RELAY_LIGHTNING, FEE_LN_MINIMUM_ETA_TARGET
) )
from .invoices import Invoice, PR_UNPAID, PR_PAID, PR_INFLIGHT, PR_FAILED, LN_EXPIRY_NEVER, BaseInvoice from .invoices import Invoice, PR_UNPAID, PR_PAID, PR_INFLIGHT, PR_FAILED, LN_EXPIRY_NEVER, BaseInvoice
from .bitcoin import COIN, opcodes, make_op_return, address_to_scripthash, DummyAddress from .bitcoin import COIN, opcodes, make_op_return, address_to_scripthash, DummyAddress
@@ -3075,10 +3075,7 @@ class LNWallet(LNWorker):
target: int = FEE_LN_MINIMUM_ETA_TARGET if has_anchors else FEE_LN_ETA_TARGET target: int = FEE_LN_MINIMUM_ETA_TARGET if has_anchors else FEE_LN_ETA_TARGET
feerate_per_kvbyte = self.network.fee_estimates.eta_target_to_fee(target) feerate_per_kvbyte = self.network.fee_estimates.eta_target_to_fee(target)
if feerate_per_kvbyte is None: if feerate_per_kvbyte is None:
if constants.net is constants.BitcoinRegtest: return None
feerate_per_kvbyte = FEERATE_REGTEST_STATIC_FEE
else:
return None
if has_anchors: if has_anchors:
# set a floor of 5 sat/vb to have some safety margin in case the mempool # set a floor of 5 sat/vb to have some safety margin in case the mempool
# grows quickly # grows quickly