AaronFiore/electrum
1
0
Fork 0
Code Activity

Merge pull request #8417 from SomberNight/202305_db_version_52

Browse Source 
wallet_db version 52: break non-homogeneous multisig wallets
This commit is contained in:
ThomasV
2023-05-11 16:35:42 +02:00
committed by GitHub
parent f8ce6c6564 68fb996d20
commit ca49d73312
7 changed files with 111 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
electrum/gui/qml/components/main.qml
View File

@@ -495,7 +495,7 @@ ApplicationWindow
}
function onWalletOpenError(error) {
console.log('wallet open error')
var dialog = app.messageDialog.createObject(app, {'text': error})
var dialog = app.messageDialog.createObject(app, { title: qsTr('Error'), 'text': error })
dialog.open()
}
function onAuthRequired(method, authMessage) {

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

@@ -223,7 +223,7 @@ class QEDaemon(AuthMixin, QObject):
self._backendWalletLoaded.emit(local_password)
except WalletFileException as e:
self._logger.error(str(e))
self._logger.error(f"load_wallet_task errored opening wallet: {e!r}")
self.walletOpenError.emit(str(e))
finally:
self._loading = False

56
electrum/gui/qml/qewalletdb.py
View File

@@ -8,7 +8,7 @@ from electrum.storage import WalletStorage, StorageEncryptionVersion
from electrum.wallet_db import WalletDB
from electrum.wallet import Wallet
from electrum.bip32 import normalize_bip32_derivation, xpub_type
from electrum.util import InvalidPassword, WalletFileException
from electrum.util import InvalidPassword, WalletFileException, send_exception_to_crash_reporter
from electrum import keystore
if TYPE_CHECKING:
@@ -120,9 +120,16 @@ class QEWalletDB(QObject):
@pyqtSlot()
def verify(self):
self.load_storage()
if self._storage:
self.load_db()
try:
self._load_storage()
if self._storage:
self._load_db()
except WalletFileException as e:
self._logger.error(f"verify errored: {repr(e)}")
self._storage = None
self.walletOpenProblem.emit(str(e))
if e.should_report_crash:
send_exception_to_crash_reporter(e)
@pyqtSlot()
def doSplit(self):
@@ -134,7 +141,8 @@ class QEWalletDB(QObject):
self.splitFinished.emit()
def load_storage(self):
def _load_storage(self):
"""can raise WalletFileException"""
self._storage = WalletStorage(self._path)
if not self._storage.file_exists():
self._logger.warning('file does not exist')
@@ -170,27 +178,23 @@ class QEWalletDB(QObject):
if not self._storage.is_past_initial_decryption():
self._storage = None
def load_db(self):
def _load_db(self):
"""can raise WalletFileException"""
# needs storage accessible
try:
self._db = WalletDB(self._storage.read(), manual_upgrades=True)
if self._db.requires_split():
self._logger.warning('wallet requires split')
self._requiresSplit = True
self.requiresSplitChanged.emit()
return
if self._db.get_action():
self._logger.warning('action pending. QML version doesn\'t support continuation of wizard')
return
self._db = WalletDB(self._storage.read(), manual_upgrades=True)
if self._db.requires_split():
self._logger.warning('wallet requires split')
self._requiresSplit = True
self.requiresSplitChanged.emit()
return
if self._db.get_action():
self._logger.warning('action pending. QML version doesn\'t support continuation of wizard')
return
if self._db.requires_upgrade():
self._logger.warning('wallet requires upgrade, upgrading')
self._db.upgrade()
self._db.write(self._storage)
if self._db.requires_upgrade():
self._logger.warning('wallet requires upgrade, upgrading')
self._db.upgrade()
self._db.write(self._storage)
self._ready = True
self.readyChanged.emit()
except WalletFileException as e:
self._logger.error(f'{repr(e)}')
self._storage = None
self.walletOpenProblem.emit(str(e))
self._ready = True
self.readyChanged.emit()