LBRYFoundation/LBRY-Vault
1
0
Fork 0
mirror of https://github.com/LBRYFoundation/LBRY-Vault.git synced 2025-09-01 17:55:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix lnwatcher: network triggers were renamed

Browse source
This commit is contained in:
SomberNight 2018-09-24 16:38:59 +02:00 • committed by ThomasV
parent d29191b010
commit c91fe27e7d
3 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
electrum/lnwatcher.py
View file

@ -93,7 +93,7 @@ class LNWatcher(PrintError):
e_tx2 = EncumberedTransaction.from_json(e_tx) e_tx2 = EncumberedTransaction.from_json(e_tx)
self.sweepstore[funding_outpoint][ctx_txid].add(e_tx2) self.sweepstore[funding_outpoint][ctx_txid].add(e_tx2)
self.network.register_callback(self.on_network_update, ['updated']) self.network.register_callback(self.on_network_update, ['network_updated', 'blockchain_updated', 'verified'])
def write_to_disk(self): def write_to_disk(self):
# FIXME: json => every update takes linear instead of constant disk write # FIXME: json => every update takes linear instead of constant disk write
@ -128,6 +128,10 @@ class LNWatcher(PrintError):
@aiosafe @aiosafe
async def on_network_update(self, event, *args): async def on_network_update(self, event, *args):
if event == 'verified':
wallet = args[0]
if wallet != self.addr_sync:
return
if not self.addr_sync.synchronizer: if not self.addr_sync.synchronizer:
self.print_error("synchronizer not set yet") self.print_error("synchronizer not set yet")
return return

5
electrum/lnworker.py
View file

@ -57,7 +57,7 @@ class LNWorker(PrintError):
self._last_tried_peer = {} # LNPeerAddr -> unix timestamp self._last_tried_peer = {} # LNPeerAddr -> unix timestamp
self._add_peers_from_config() self._add_peers_from_config()
# wait until we see confirmations # wait until we see confirmations
self.network.register_callback(self.on_network_update, ['updated', 'verified', 'fee']) # thread safe self.network.register_callback(self.on_network_update, ['network_updated', 'verified', 'fee']) # thread safe
asyncio.run_coroutine_threadsafe(self.network.main_taskgroup.spawn(self.main_loop()), self.network.asyncio_loop) asyncio.run_coroutine_threadsafe(self.network.main_taskgroup.spawn(self.main_loop()), self.network.asyncio_loop)
def _add_peers_from_config(self): def _add_peers_from_config(self):
@ -346,7 +346,8 @@ class LNWorker(PrintError):
asyncio.run_coroutine_threadsafe(coro, self.network.asyncio_loop) asyncio.run_coroutine_threadsafe(coro, self.network.asyncio_loop)
async def main_loop(self): async def main_loop(self):
await self.on_network_update('updated') # shortcut (don't block) if funding tx locked and verified await self.on_network_update('network_updated') # shortcut (don't block) if funding tx locked and verified
await self.network.lnwatcher.on_network_update('network_updated') # ping watcher to check our channels
while True: while True:
await asyncio.sleep(1) await asyncio.sleep(1)
now = time.time() now = time.time()

4
electrum/verifier.py
View file

@ -133,8 +133,8 @@ class SPV(NetworkJobOnDefaultServer):
txpos=pos, txpos=pos,
header_hash=header_hash) header_hash=header_hash)
self.wallet.add_verified_tx(tx_hash, tx_info) self.wallet.add_verified_tx(tx_hash, tx_info)
#if self.is_up_to_date() and self.wallet.is_up_to_date(): if self.is_up_to_date() and self.wallet.is_up_to_date():
# self.wallet.save_verified_tx(write=True) self.wallet.save_verified_tx(write=True)
@classmethod @classmethod
def hash_merkle_root(cls, merkle_branch: Sequence[str], tx_hash: str, leaf_pos_in_tree: int): def hash_merkle_root(cls, merkle_branch: Sequence[str], tx_hash: str, leaf_pos_in_tree: int):