tfee estimation: split eta_to_fee into two methods - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit 629b9cb3b54cd067da9673c8fb84d49e417903bf
DIR parent 8e69174374aee87d73cd2f8005fbbe87c93eee9c
HTML Author: SomberNight <somber.night@protonmail.com>
Date: Mon, 30 Jul 2018 19:15:05 +0200
fee estimation: split eta_to_fee into two methods
Diffstat:
M electrum/simple_config.py | 20 ++++++++++++++------
1 file changed, 14 insertions(+), 6 deletions(-)
---
DIR diff --git a/electrum/simple_config.py b/electrum/simple_config.py
t@@ -4,7 +4,7 @@ import time
import os
import stat
from decimal import Decimal
-from typing import Union
+from typing import Union, Optional
from numbers import Real
from copy import deepcopy
t@@ -296,19 +296,27 @@ class SimpleConfig(PrintError):
return fee
return get_fee_within_limits
- @impose_hard_limits_on_fee
- def eta_to_fee(self, slider_pos) -> Union[int, None]:
+ def eta_to_fee(self, slider_pos) -> Optional[int]:
"""Returns fee in sat/kbyte."""
slider_pos = max(slider_pos, 0)
slider_pos = min(slider_pos, len(FEE_ETA_TARGETS))
if slider_pos < len(FEE_ETA_TARGETS):
- target_blocks = FEE_ETA_TARGETS[slider_pos]
- fee = self.fee_estimates.get(target_blocks)
+ num_blocks = FEE_ETA_TARGETS[slider_pos]
+ fee = self.eta_target_to_fee(num_blocks)
else:
+ fee = self.eta_target_to_fee(1)
+ return fee
+
+ @impose_hard_limits_on_fee
+ def eta_target_to_fee(self, num_blocks: int) -> Optional[int]:
+ """Returns fee in sat/kbyte."""
+ if num_blocks == 1:
fee = self.fee_estimates.get(2)
if fee is not None:
- fee += fee/2
+ fee += fee / 2
fee = int(fee)
+ else:
+ fee = self.fee_estimates.get(num_blocks)
return fee
def fee_to_depth(self, target_fee: Real) -> int: