AaronFiore/electrum
1
0
Fork 0
Code Activity

wallet: add sanity check for storage encryption version

Browse Source 
multisig wallet cannot have StorageEncryptionVersion.XPUB_PASSWORD
This commit is contained in:
SomberNight
2023-09-20 17:28:18 +00:00
parent f8c2a38954
commit baa443295d
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
electrum/wallet.py
View File

@@ -315,7 +315,7 @@ class Abstract_Wallet(ABC, Logger, EventListener):
self.config = config self.config = config
assert self.config is not None, "config must not be None" assert self.config is not None, "config must not be None"
self.db = db self.db = db
self.storage = db.storage self.storage = db.storage # type: Optional[WalletStorage]
# load addresses needs to be called before constructor for sanity checks # load addresses needs to be called before constructor for sanity checks
db.load_addresses(self.wallet_type) db.load_addresses(self.wallet_type)
self.keystore = None # type: Optional[KeyStore] # will be set by load_keystore self.keystore = None # type: Optional[KeyStore] # will be set by load_keystore
@@ -363,6 +363,10 @@ class Abstract_Wallet(ABC, Logger, EventListener):
self._up_to_date = False self._up_to_date = False
self.test_addresses_sanity() self.test_addresses_sanity()
if self.storage and self.has_storage_encryption():
if (se := self.storage.get_encryption_version()) != (ae := self.get_available_storage_encryption_version()):
raise WalletFileException(f"unexpected storage encryption type. found: {se!r}. allowed: {ae!r}")
self.register_callbacks() self.register_callbacks()
def _init_lnworker(self): def _init_lnworker(self):