AaronFiore/electrum
1
0
Fork 0
Code Activity

make_unsigned_transaction: call get_unconfirmed_base_tx_for_batching lazily

Browse Source
This commit is contained in:
ThomasV
2023-03-07 18:13:27 +01:00
parent 0545edd4c6
commit a5c7cc65ee
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

@@ -1668,8 +1668,8 @@ class Abstract_Wallet(ABC, Logger, EventListener):
# Let the coin chooser select the coins to spend # Let the coin chooser select the coins to spend
coin_chooser = coinchooser.get_coin_chooser(self.config) coin_chooser = coinchooser.get_coin_chooser(self.config)
# If there is an unconfirmed RBF tx, merge with it # If there is an unconfirmed RBF tx, merge with it
base_tx = self.get_unconfirmed_base_tx_for_batching() base_tx = self.get_unconfirmed_base_tx_for_batching() if self.config.get('batch_rbf', False) else None
if self.config.get('batch_rbf', False) and base_tx: if base_tx:
# make sure we don't try to spend change from the tx-to-be-replaced: # make sure we don't try to spend change from the tx-to-be-replaced:
coins = [c for c in coins if c.prevout.txid.hex() != base_tx.txid()] coins = [c for c in coins if c.prevout.txid.hex() != base_tx.txid()]
is_local = self.adb.get_tx_height(base_tx.txid()).height == TX_HEIGHT_LOCAL is_local = self.adb.get_tx_height(base_tx.txid()).height == TX_HEIGHT_LOCAL