LBRYFoundation/LBRY-Vault
1
0
Fork 0
mirror of https://github.com/LBRYFoundation/LBRY-Vault.git synced 2025-08-23 17:47:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fee estimation: split eta_to_fee into two methods

Browse source
This commit is contained in:
SomberNight 2018-07-30 19:15:05 +02:00
parent 8e69174374
commit 629b9cb3b5
No known key found for this signature in database
GPG key ID: B33B5F232C6271E9
1 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
electrum/simple_config.py
View file

@ -4,7 +4,7 @@ import time
import os import os
import stat import stat
from decimal import Decimal from decimal import Decimal
from typing import Union from typing import Union, Optional
from numbers import Real from numbers import Real
from copy import deepcopy from copy import deepcopy
@ -296,19 +296,27 @@ class SimpleConfig(PrintError):
return fee return fee
return get_fee_within_limits return get_fee_within_limits
@impose_hard_limits_on_fee def eta_to_fee(self, slider_pos) -> Optional[int]:
def eta_to_fee(self, slider_pos) -> Union[int, None]:
"""Returns fee in sat/kbyte.""" """Returns fee in sat/kbyte."""
slider_pos = max(slider_pos, 0) slider_pos = max(slider_pos, 0)
slider_pos = min(slider_pos, len(FEE_ETA_TARGETS)) slider_pos = min(slider_pos, len(FEE_ETA_TARGETS))
if slider_pos < len(FEE_ETA_TARGETS): if slider_pos < len(FEE_ETA_TARGETS):
target_blocks = FEE_ETA_TARGETS[slider_pos] num_blocks = FEE_ETA_TARGETS[slider_pos]
fee = self.fee_estimates.get(target_blocks) fee = self.eta_target_to_fee(num_blocks)
else: 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) fee = self.fee_estimates.get(2)
if fee is not None: if fee is not None:
fee += fee/2 fee += fee / 2
fee = int(fee) fee = int(fee)
else:
fee = self.fee_estimates.get(num_blocks)
return fee return fee
def fee_to_depth(self, target_fee: Real) -> int: def fee_to_depth(self, target_fee: Real) -> int: