From b9af8bf60a9731e2f60b05b5d824b4c258196c7c Mon Sep 17 00:00:00 2001 From: SomberNight Date: Thu, 12 Sep 2019 17:22:35 +0200 Subject: [PATCH] get_tx_fee: further follow-up 7b828359c6049ab1910154e80490fbb1baaf5fa3 --- electrum/gui/qt/main_window.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/electrum/gui/qt/main_window.py b/electrum/gui/qt/main_window.py index 5860b6486..0de8a76a1 100644 --- a/electrum/gui/qt/main_window.py +++ b/electrum/gui/qt/main_window.py @@ -3005,7 +3005,7 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, Logger): total_size = parent_tx.estimated_size() + new_tx.estimated_size() parent_txid = parent_tx.txid() assert parent_txid - parent_fee, _calc_by_us = self.wallet.get_tx_fee(parent_txid) + parent_fee = self.wallet.get_tx_fee(parent_txid) if parent_fee is None: self.show_error(_("Can't CPFP: unknown fee for parent transaction.")) return @@ -3084,8 +3084,8 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, Logger): def bump_fee_dialog(self, tx: Transaction): txid = tx.txid() assert txid - fee, is_calc_by_us = self.wallet.get_tx_fee(txid) - if fee is None or not is_calc_by_us: + fee = self.wallet.get_tx_fee(txid) + if fee is None: self.show_error(_("Can't bump fee: unknown fee for original transaction.")) return tx_label = self.wallet.get_label(txid)