AaronFiore/electrum
1
0
Fork 0
Code Activity

Show fee slider for static fees too. Add fee slider to RBF dialog (fix #2083)

Browse Source
This commit is contained in:
ThomasV
2017-01-06 10:45:05 +01:00
parent 0b08de65de
commit d09e91e631
2 changed files with 51 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/wallet.py
View File

@@ -757,7 +757,9 @@ class Abstract_Wallet(PrintError):
if b and self.network and self.network.dynfee(i):
return self.network.dynfee(i)
else:
return config.get('fee_per_kb', bitcoin.RECOMMENDED_FEE)
fee_per_kb = config.get('fee_per_kb', RECOMMENDED_FEE)
coeff = {0:0.3, 1:0.5, 2:1, 3:1.5, 4:2}
return fee_per_kb * coeff[i]
def get_tx_status(self, tx_hash, height, conf, timestamp):
from util import format_time