Madiator2011/lbry-sdk
1
0
Fork 0
forked from LBRYCommunity/lbry-sdk
Code Pull requests Activity

Merge pull request #3581 from lbryio/deterministic_channel_keys_post_unlock

Browse source 
eagerly load deterministic channel keys immediately after wallet is unlocked
This commit is contained in:
Lex Berezhny 2022-03-14 12:36:04 -04:00 committed by GitHub
commit ad489ed606
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lbry/wallet/wallet.py
View file

@ -203,11 +203,12 @@ class Wallet:
return True return True
return False return False
def unlock(self, password): async def unlock(self, password):
for account in self.accounts: for account in self.accounts:
if account.encrypted: if account.encrypted:
if not account.decrypt(password): if not account.decrypt(password):
return False return False
await account.deterministic_channel_keys.ensure_cache_primed()
self.encryption_password = password self.encryption_password = password
return True return True

14
tests/integration/blockchain/test_wallet_commands.py
View file

@ -327,7 +327,7 @@ class WalletEncryptionAndSynchronization(CommandTestCase):
with self.assertRaisesRegex(AssertionError, "Cannot lock an unencrypted wallet, encrypt first."): with self.assertRaisesRegex(AssertionError, "Cannot lock an unencrypted wallet, encrypt first."):
daemon.jsonrpc_wallet_lock() daemon.jsonrpc_wallet_lock()
# safe to call unlock and decrypt, they are no-ops at this point # safe to call unlock and decrypt, they are no-ops at this point
daemon.jsonrpc_wallet_unlock('password') # already unlocked await daemon.jsonrpc_wallet_unlock('password') # already unlocked
daemon.jsonrpc_wallet_decrypt() # already not encrypted daemon.jsonrpc_wallet_decrypt() # already not encrypted
daemon.jsonrpc_wallet_encrypt('password') daemon.jsonrpc_wallet_encrypt('password')
@ -343,7 +343,7 @@ class WalletEncryptionAndSynchronization(CommandTestCase):
# can't sign transactions with locked wallet # can't sign transactions with locked wallet
with self.assertRaises(AssertionError): with self.assertRaises(AssertionError):
await daemon.jsonrpc_channel_create('@foo', '1.0') await daemon.jsonrpc_channel_create('@foo', '1.0')
daemon.jsonrpc_wallet_unlock('password') await daemon.jsonrpc_wallet_unlock('password')
self.assertEqual(daemon.jsonrpc_wallet_status(), {'is_locked': False, 'is_encrypted': True, self.assertEqual(daemon.jsonrpc_wallet_status(), {'is_locked': False, 'is_encrypted': True,
'is_syncing': False}) 'is_syncing': False})
await daemon.jsonrpc_channel_create('@foo', '1.0') await daemon.jsonrpc_channel_create('@foo', '1.0')
@ -361,7 +361,7 @@ class WalletEncryptionAndSynchronization(CommandTestCase):
await daemon2.jsonrpc_channel_import(exported) await daemon2.jsonrpc_channel_import(exported)
self.assertTrue(daemon2.jsonrpc_wallet_encrypt('password')) self.assertTrue(daemon2.jsonrpc_wallet_encrypt('password'))
self.assertTrue(daemon2.jsonrpc_wallet_lock()) self.assertTrue(daemon2.jsonrpc_wallet_lock())
self.assertTrue(daemon2.jsonrpc_wallet_unlock("password")) self.assertTrue(await daemon2.jsonrpc_wallet_unlock("password"))
self.assertEqual(daemon2.jsonrpc_wallet_status(), self.assertEqual(daemon2.jsonrpc_wallet_status(),
{'is_locked': False, 'is_encrypted': True, 'is_syncing': False}) {'is_locked': False, 'is_encrypted': True, 'is_syncing': False})
@ -369,7 +369,7 @@ class WalletEncryptionAndSynchronization(CommandTestCase):
self.assertTrue(self.daemon.jsonrpc_wallet_encrypt("password")) self.assertTrue(self.daemon.jsonrpc_wallet_encrypt("password"))
self.assertTrue(self.daemon.jsonrpc_wallet_lock()) self.assertTrue(self.daemon.jsonrpc_wallet_lock())
self.account.deterministic_channel_keys._private_key = None self.account.deterministic_channel_keys._private_key = None
self.assertTrue(self.daemon.jsonrpc_wallet_unlock("password")) self.assertTrue(await self.daemon.jsonrpc_wallet_unlock("password"))
await self.channel_create() await self.channel_create()
async def test_sync_with_encryption_and_password_change(self): async def test_sync_with_encryption_and_password_change(self):
@ -398,8 +398,8 @@ class WalletEncryptionAndSynchronization(CommandTestCase):
# check new password is active # check new password is active
daemon.jsonrpc_wallet_lock() daemon.jsonrpc_wallet_lock()
self.assertFalse(daemon.jsonrpc_wallet_unlock('password')) self.assertFalse(await daemon.jsonrpc_wallet_unlock('password'))
self.assertTrue(daemon.jsonrpc_wallet_unlock('password2')) self.assertTrue(await daemon.jsonrpc_wallet_unlock('password2'))
# propagate disk encryption to daemon2 # propagate disk encryption to daemon2
data = await daemon.jsonrpc_sync_apply('password3') data = await daemon.jsonrpc_sync_apply('password3')
@ -415,4 +415,4 @@ class WalletEncryptionAndSynchronization(CommandTestCase):
self.assertWalletEncrypted(wallet2.storage.path, True) self.assertWalletEncrypted(wallet2.storage.path, True)
daemon2.jsonrpc_wallet_lock() daemon2.jsonrpc_wallet_lock()
self.assertTrue(daemon2.jsonrpc_wallet_unlock('password3')) self.assertTrue(await daemon2.jsonrpc_wallet_unlock('password3'))