AaronFiore/electrum
1
0
Fork 0
Code Activity

properly remember wallet password and pass to tx signing call

Browse Source
This commit is contained in:
Sander van Grieken
2022-09-29 13:47:37 +02:00
parent e0a3efe5b5
commit e579f5b8a5
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
electrum/gui/qml/qedaemon.py
View File

@@ -161,7 +161,9 @@ class QEDaemon(AuthMixin, QObject):
if not password: if not password:
password = self._password password = self._password
if self._path not in self.daemon._wallets: wallet_already_open = self._path in self.daemon._wallets
if not wallet_already_open:
# pre-checks, let walletdb trigger any necessary user interactions # pre-checks, let walletdb trigger any necessary user interactions
self._walletdb.path = self._path self._walletdb.path = self._path
self._walletdb.password = password self._walletdb.password = password
@@ -172,9 +174,10 @@ class QEDaemon(AuthMixin, QObject):
try: try:
wallet = self.daemon.load_wallet(self._path, password) wallet = self.daemon.load_wallet(self._path, password)
if wallet != None: if wallet != None:
self._loaded_wallets.add_wallet(wallet_path=self._path, wallet=wallet)
self._current_wallet = QEWallet.getInstanceFor(wallet) self._current_wallet = QEWallet.getInstanceFor(wallet)
self._current_wallet.password = password if not wallet_already_open:
self._loaded_wallets.add_wallet(wallet_path=self._path, wallet=wallet)
self._current_wallet.password = password
self.walletLoaded.emit() self.walletLoaded.emit()
if self.daemon.config.get('single_password'): if self.daemon.config.get('single_password'):

5
electrum/gui/qml/qewallet.py
View File

@@ -554,7 +554,10 @@ class QEWallet(AuthMixin, QObject, QtEventListener):
addr = None addr = None
if self.wallet.config.get('bolt11_fallback', True): if self.wallet.config.get('bolt11_fallback', True):
addr = self.wallet.get_unused_address() addr = self.wallet.get_unused_address()
# if addr is None, we ran out of addresses. for lightning enabled wallets, ignore for now # if addr is None, we ran out of addresses
if addr is None:
# TODO: remove oldest unpaid request having a fallback address and try again
pass
key = self.wallet.create_request(None, None, default_expiry, addr) key = self.wallet.create_request(None, None, default_expiry, addr)
else: else:
key, addr = self.create_bitcoin_request(None, None, default_expiry, ignore_gap) key, addr = self.create_bitcoin_request(None, None, default_expiry, ignore_gap)