AaronFiore/electrum
1
0
Fork 0
Code Activity

follow-up afa2ed1fe285886fdd087aa8b1e303e2634d9098

Browse Source
This commit is contained in:
ThomasV
2022-06-10 10:58:21 +02:00
parent 121d8732f1
commit 151500fb72
2 changed files with 2 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
electrum/gui/kivy/uix/dialogs/tx_dialog.py
View File

@@ -261,7 +261,7 @@ class TxDialog(Factory.Popup):
total_size = parent_tx.estimated_size() + new_tx.estimated_size() total_size = parent_tx.estimated_size() + new_tx.estimated_size()
parent_txid = parent_tx.txid() parent_txid = parent_tx.txid()
assert parent_txid assert parent_txid
parent_fee = self.wallet.get_tx_fee(parent_txid) parent_fee = self.wallet.adb.get_tx_fee(parent_txid)
if parent_fee is None: if parent_fee is None:
self.app.show_error(_("Can't CPFP: unknown fee for parent transaction.")) self.app.show_error(_("Can't CPFP: unknown fee for parent transaction."))
return return
@@ -356,7 +356,7 @@ class TxDialog(Factory.Popup):
def on_prompt(b): def on_prompt(b):
if b: if b:
self.wallet.remove_transaction(txid) self.wallet.adb.remove_transaction(txid)
self.wallet.save_db() self.wallet.save_db()
self.app._trigger_update_wallet() # FIXME private... self.app._trigger_update_wallet() # FIXME private...
self.dismiss() self.dismiss()

10
electrum/wallet.py
View File

@@ -991,16 +991,6 @@ class Abstract_Wallet(ABC):
self.set_label(tx_hash, "; ".join(labels)) self.set_label(tx_hash, "; ".join(labels))
return bool(labels) return bool(labels)
# fixme: this needs a callback
#def add_transaction(self, tx, *, allow_unrelated=False):
# is_known = bool(self.db.get_transaction(tx.txid()))
# tx_was_added = self.adb.add_transaction(tx, allow_unrelated=allow_unrelated)
# if tx_was_added and not is_known:
# self._maybe_set_tx_label_based_on_invoices(tx)
# if self.lnworker:
# self.lnworker.maybe_add_backup_from_tx(tx)
# return tx_was_added
@profiler @profiler
def get_full_history(self, fx=None, *, onchain_domain=None, include_lightning=True): def get_full_history(self, fx=None, *, onchain_domain=None, include_lightning=True):
transactions_tmp = OrderedDictWithIndex() transactions_tmp = OrderedDictWithIndex()