LBRYFoundation/LBRY-Vault
1
0
Fork 0
mirror of https://github.com/LBRYFoundation/LBRY-Vault.git synced 2025-08-23 17:47:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

qt: re sweeping, minor clean-up

Browse source
This commit is contained in:
SomberNight 2018-11-05 01:53:35 +01:00
parent a89e67eeed
commit 1b46866e34
No known key found for this signature in database
GPG key ID: B33B5F232C6271E9
1 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
electrum/gui/qt/main_window.py
View file

@ -57,7 +57,8 @@ from electrum.util import (format_time, format_satoshis, format_fee_satoshis,
UnknownBaseUnit, DECIMAL_POINT_DEFAULT) UnknownBaseUnit, DECIMAL_POINT_DEFAULT)
from electrum.transaction import Transaction, TxOutput from electrum.transaction import Transaction, TxOutput
from electrum.address_synchronizer import AddTransactionException from electrum.address_synchronizer import AddTransactionException
from electrum.wallet import Multisig_Wallet, CannotBumpFee, Abstract_Wallet from electrum.wallet import (Multisig_Wallet, CannotBumpFee, Abstract_Wallet,
sweep_preparations)
from electrum.version import ELECTRUM_VERSION from electrum.version import ELECTRUM_VERSION
from electrum.network import Network from electrum.network import Network
from electrum.exchange_rate import FxThread from electrum.exchange_rate import FxThread
@ -2601,19 +2602,20 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, PrintError):
address_e.textChanged.connect(on_address) address_e.textChanged.connect(on_address)
if not d.exec_(): if not d.exec_():
return return
from electrum.wallet import sweep_preparations # user pressed "sweep"
try: try:
self.do_clear()
coins, keypairs = sweep_preparations(get_pk(), self.network) coins, keypairs = sweep_preparations(get_pk(), self.network)
except Exception as e: # FIXME too broad...
#traceback.print_exc(file=sys.stderr)
self.show_message(str(e))
return
self.do_clear()
self.tx_external_keypairs = keypairs self.tx_external_keypairs = keypairs
self.spend_coins(coins) self.spend_coins(coins)
self.payto_e.setText(get_address()) self.payto_e.setText(get_address())
self.spend_max() self.spend_max()
self.payto_e.setFrozen(True) self.payto_e.setFrozen(True)
self.amount_e.setFrozen(True) self.amount_e.setFrozen(True)
except Exception as e: # FIXME too broad...
self.show_message(str(e))
return
self.warn_if_watching_only() self.warn_if_watching_only()
def _do_import(self, title, header_layout, func): def _do_import(self, title, header_layout, func):