1
0

qt: fix sweeping

closes https://github.com/spesmilo/electrum/issues/8340

regression from 2f6d60c715
This commit is contained in:
SomberNight
2023-04-23 15:10:38 +00:00
parent ad58916729
commit 1a2d4494eb
3 changed files with 25 additions and 14 deletions

View File

@@ -4,7 +4,7 @@
import asyncio
from decimal import Decimal
from typing import Optional, TYPE_CHECKING, Sequence, List
from typing import Optional, TYPE_CHECKING, Sequence, List, Callable, Any
from urllib.parse import urlparse
from PyQt5.QtCore import pyqtSignal, QPoint
@@ -238,14 +238,18 @@ class SendTab(QWidget, MessageBoxMixin, Logger):
self,
outputs: List[PartialTxOutput], *,
nonlocal_only=False,
external_keypairs=None) -> None:
external_keypairs=None,
get_coins: Callable[..., Sequence[PartialTxInput]] = None,
) -> None:
# trustedcoin requires this
if run_hook('abort_send', self):
return
is_sweep = bool(external_keypairs)
# we call get_coins inside make_tx, so that inputs can be changed dynamically
if get_coins is None:
get_coins = self.window.get_coins
make_tx = lambda fee_est, *, confirmed_only=False: self.wallet.make_unsigned_transaction(
coins=self.window.get_coins(nonlocal_only=nonlocal_only, confirmed_only=confirmed_only),
coins=get_coins(nonlocal_only=nonlocal_only, confirmed_only=confirmed_only),
outputs=outputs,
fee=fee_est,
is_sweep=is_sweep)
@@ -266,7 +270,7 @@ class SendTab(QWidget, MessageBoxMixin, Logger):
return
is_preview = conf_dlg.is_preview
if is_preview:
self.window.show_transaction(tx)
self.window.show_transaction(tx, external_keypairs=external_keypairs)
return
self.save_pending_invoice()
def sign_done(success):