AaronFiore/electrum
1
0
Fork 0
Code Activity

follow-up 7b828359c6

Browse Source
This commit is contained in:
ThomasV
2019-09-12 13:12:48 +02:00
parent 79de0489e3
commit 3d04399581
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
electrum/wallet.py
View File

@@ -409,7 +409,7 @@ class Abstract_Wallet(AddressSynchronizer):
elif tx_mined_status.height in (TX_HEIGHT_UNCONF_PARENT, TX_HEIGHT_UNCONFIRMED): elif tx_mined_status.height in (TX_HEIGHT_UNCONF_PARENT, TX_HEIGHT_UNCONFIRMED):
status = _('Unconfirmed') status = _('Unconfirmed')
if fee is None: if fee is None:
fee = self.get_tx_fee(tx_hash, trust_server=True) fee = self.get_tx_fee(tx_hash)
if fee and self.network and self.config.has_fee_mempool(): if fee and self.network and self.config.has_fee_mempool():
size = tx.estimated_size() size = tx.estimated_size()
fee_per_byte = fee / size fee_per_byte = fee / size
@@ -722,7 +722,7 @@ class Abstract_Wallet(AddressSynchronizer):
is_final = tx and tx.is_final() is_final = tx and tx.is_final()
if not is_final: if not is_final:
extra.append('rbf') extra.append('rbf')
fee = self.get_tx_fee(tx_hash, trust_server=True) fee = self.get_tx_fee(tx_hash)
if fee is not None: if fee is not None:
size = tx.estimated_size() size = tx.estimated_size()
fee_per_byte = fee / size fee_per_byte = fee / size