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

Merge branch 'walletcatchup' into development

Browse source
This commit is contained in:
Jimmy Kiselak 2016-03-12 14:59:23 -05:00
commit 7f11da8650
1 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
lbrynet/core/LBRYcrdWallet.py
View file

@ -869,7 +869,7 @@ class LBRYumWallet(LBRYWallet):
def setup_network(): def setup_network():
self.config = SimpleConfig() self.config = SimpleConfig()
self.network = Network(self.config) self.network = Network(self.config)
alert.info("Starting the wallet...") alert.info("Loading the wallet...")
return defer.succeed(self.network.start()) return defer.succeed(self.network.start())
d = setup_network() d = setup_network()
@ -882,7 +882,6 @@ class LBRYumWallet(LBRYWallet):
return False return False
start_check.stop() start_check.stop()
if self.network.is_connected(): if self.network.is_connected():
alert.info("Wallet started.")
network_start_d.callback(True) network_start_d.callback(True)
else: else:
network_start_d.errback(ValueError("Failed to connect to network.")) network_start_d.errback(ValueError("Failed to connect to network."))
@ -926,9 +925,24 @@ class LBRYumWallet(LBRYWallet):
wallet.synchronize() wallet.synchronize()
self.wallet = wallet self.wallet = wallet
blockchain_caught_d = defer.Deferred()
def check_caught_up():
local_height = self.network.get_local_height()
remote_height = self.network.get_server_height()
if remote_height != 0 and remote_height - local_height <= 5:
alert.info('Wallet loaded.')
catch_up_check.stop()
blockchain_caught_d.callback(True)
catch_up_check = task.LoopingCall(check_caught_up)
d = threads.deferToThread(get_wallet) d = threads.deferToThread(get_wallet)
d.addCallback(self._save_wallet) d.addCallback(self._save_wallet)
d.addCallback(lambda _: self.wallet.start_threads(self.network)) d.addCallback(lambda _: self.wallet.start_threads(self.network))
d.addCallback(lambda _: catch_up_check.start(.1))
d.addCallback(lambda _: blockchain_caught_d)
return d return d
def _get_cmd_runner(self): def _get_cmd_runner(self):