RanchiMall/pyflo
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

connector

Browse Source
This commit is contained in:
4tochka 2019-05-02 00:39:36 +04:00
parent 612046b5f5
commit a4c0c03dec
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pybtc/connector.py
View File

@ -63,7 +63,8 @@ class Connector:
self.block_dependency_tx = 0 # counter of tx that have dependencies in block self.block_dependency_tx = 0 # counter of tx that have dependencies in block
self.active = True self.active = True
self.get_next_block_mutex = False self.get_next_block_mutex = asyncio.Future()
self.get_next_block_mutex.set_result(True)
self.active_block = asyncio.Future() self.active_block = asyncio.Future()
self.active_block.set_result(True) self.active_block.set_result(True)
self.last_zmq_msg = int(time.time()) self.last_zmq_msg = int(time.time())
@ -271,10 +272,10 @@ class Connector:
async def get_next_block(self): async def get_next_block(self):
if self.active: if self.active:
if self.get_next_block_mutex: if not self.get_next_block_mutex.done():
return await self.get_next_block_mutex
try: try:
self.get_next_block_mutex = True self.get_next_block_mutex = asyncio.Future()
if self.node_last_block <= self.last_block_height + self.backlog: if self.node_last_block <= self.last_block_height + self.backlog:
d = await self.rpc.getblockcount() d = await self.rpc.getblockcount()
@ -307,7 +308,7 @@ class Connector:
except Exception as err: except Exception as err:
self.log.error("get next block failed %s" % str(err)) self.log.error("get next block failed %s" % str(err))
finally: finally:
self.get_next_block_mutex = False self.get_next_block_mutex.set_result(True)
async def _get_block_by_hash(self, hash): async def _get_block_by_hash(self, hash):
self.log.debug("get block by hash %s" % hash) self.log.debug("get block by hash %s" % hash)
@ -332,7 +333,6 @@ class Connector:
if self.block_cache.get(block["hash"]) is not None: if self.block_cache.get(block["hash"]) is not None:
return return
if self.deep_synchronization: if self.deep_synchronization:
block["height"] = self.last_block_height + 1 block["height"] = self.last_block_height + 1
if not self.active or not self.active_block.done() or self.last_block_height >= block["height"]: if not self.active or not self.active_block.done() or self.last_block_height >= block["height"]:
return return
@ -438,6 +438,9 @@ class Connector:
self.log.debug("Transactions received: %s [%s] received tx rate tx/s ->> %s <<" % (tx_count, time.time() - q, rate)) self.log.debug("Transactions received: %s [%s] received tx rate tx/s ->> %s <<" % (tx_count, time.time() - q, rate))
async def verify_block_position(self, block): async def verify_block_position(self, block):
if self.block_cache.get(block["hash"]) is not None:
self.log.error("duplicated block %s" % block["hash"])
raise Exception("duplicated block")
if "previousblockhash" not in block : if "previousblockhash" not in block :
return return
lb = self.block_cache.get_last_key() lb = self.block_cache.get_last_key()