LBRYCommunity/lbry-sdk
1
0
Fork 1
Code Issues Pull requests Projects Releases 282 Packages Wiki Activity

update Wallet.check_locked

Browse source
This commit is contained in:
hackrush 2018-07-24 12:29:06 -04:00 • committed by Jack Robison
parent 944200ca8c
commit 5a2075019c
No known key found for this signature in database
GPG key ID: DF25C68FE0239BB2
1 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
lbrynet/core/Wallet.py
View file

@ -938,9 +938,7 @@ class LBRYumWallet(Wallet):
self._lag_counter = 0 self._lag_counter = 0
self.blocks_behind = 0 self.blocks_behind = 0
self.catchup_progress = 0 self.catchup_progress = 0
self.is_wallet_unlocked = None
# fired when the wallet actually unlocks (wallet_unlocked_d can be called multiple times)
self.wallet_unlock_success = defer.Deferred()
def _is_first_run(self): def _is_first_run(self):
return (not self.printed_retrieving_headers and return (not self.printed_retrieving_headers and
@ -953,21 +951,23 @@ class LBRYumWallet(Wallet):
return self._cmd_runner return self._cmd_runner
def check_locked(self): def check_locked(self):
if not self.wallet.use_encryption: """
log.info("Wallet is not encrypted") Checks if the wallet is encrypted(locked) or not
self.wallet_unlock_success.callback(True)
elif not self._cmd_runner: :return: (boolean) indicating whether the wallet is locked or not
"""
if not self._cmd_runner:
raise Exception("Command runner hasn't been initialized yet") raise Exception("Command runner hasn't been initialized yet")
elif self._cmd_runner.locked: elif self._cmd_runner.locked:
log.info("Waiting for wallet password") log.info("Waiting for wallet password")
self.wallet_unlocked_d.addCallback(self.unlock) self.wallet_unlocked_d.addCallback(self.unlock)
return self.wallet_unlock_success return self.is_wallet_unlocked
def unlock(self, password): def unlock(self, password):
if self._cmd_runner and self._cmd_runner.locked: if self._cmd_runner and self._cmd_runner.locked:
try: try:
self._cmd_runner.unlock_wallet(password) self._cmd_runner.unlock_wallet(password)
self.wallet_unlock_success.callback(True) self.is_wallet_unlocked = True
log.info("Unlocked the wallet!") log.info("Unlocked the wallet!")
except InvalidPassword: except InvalidPassword:
log.warning("Incorrect password, try again") log.warning("Incorrect password, try again")
@ -1054,6 +1054,7 @@ class LBRYumWallet(Wallet):
wallet.create_main_account() wallet.create_main_account()
wallet.synchronize() wallet.synchronize()
self.wallet = wallet self.wallet = wallet
self.is_wallet_unlocked = not self.wallet.use_encryption
self._check_large_wallet() self._check_large_wallet()
return defer.succeed(True) return defer.succeed(True)