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-06-03 21:19:31 +04:00
parent 9e91e4decd
commit f74327dae5
2 changed files with 25 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pybtc/connector/connector.py
View File

@ -93,6 +93,8 @@ class Connector:
self.total_received_tx_last = 0 self.total_received_tx_last = 0
self.start_time_last = time.time() self.start_time_last = time.time()
self.batch_time = time.time() self.batch_time = time.time()
self.batch_load_utxo = 0
self.batch_parsing = 0
# cache and system # cache and system
self.block_preload_cache_limit = block_preload_cache_limit self.block_preload_cache_limit = block_preload_cache_limit
self.block_hashes_cache_limit = block_hashes_cache_limit self.block_hashes_cache_limit = block_hashes_cache_limit
@ -340,6 +342,7 @@ class Connector:
if not block: if not block:
h = await self.rpc.getblockhash(self.last_block_height + 1) h = await self.rpc.getblockhash(self.last_block_height + 1)
block = await self._get_block_by_hash(h) block = await self._get_block_by_hash(h)
block["checkpoint"] = h
self.loop.create_task(self._new_block(block)) self.loop.create_task(self._new_block(block))
except Exception as err: except Exception as err:
@ -440,6 +443,10 @@ class Connector:
if self.deep_synchronization: if self.deep_synchronization:
self.log.debug("- Batch ---------------") self.log.debug("- Batch ---------------")
self.log.debug(" Rate %s; transactions %s" % (tx_rate_last, batch_tx_count)) self.log.debug(" Rate %s; transactions %s" % (tx_rate_last, batch_tx_count))
self.log.debug(" Load utxo %s; parsing %s" % (self.batch_load_utxo,
self.batch_parsing))
self.batch_load_utxo = 0
self.batch_parsing = 0
self.log.debug("- Blocks --------------") self.log.debug("- Blocks --------------")
@ -566,7 +573,8 @@ class Connector:
async def _block_as_transactions_batch(self, block): async def _block_as_transactions_batch(self, block):
try: try:
t2 = 0
t = time.time()
if self.utxo: if self.utxo:
for q in block["rawTx"]: for q in block["rawTx"]:
tx = block["rawTx"][q] tx = block["rawTx"][q]
@ -621,7 +629,10 @@ class Connector:
missed.add((outpoint, (block["height"] << 39) + (q << 20) + (1 << 19) + i, q, i)) missed.add((outpoint, (block["height"] << 39) + (q << 20) + (1 << 19) + i, q, i))
if missed: if missed:
t2 = time.time()
await self.utxo.load_utxo() await self.utxo.load_utxo()
t2 =time.time() - t2
self.batch_load_utxo += t2
for o, s, q, i in missed: for o, s, q, i in missed:
block["rawTx"][q]["vIn"][i]["coin"] = self.utxo.get_loaded(o) block["rawTx"][q]["vIn"][i]["coin"] = self.utxo.get_loaded(o)
c += 1 c += 1
@ -632,6 +643,7 @@ class Connector:
self.total_received_tx += len(block["rawTx"]) self.total_received_tx += len(block["rawTx"])
self.total_received_tx_last += len(block["rawTx"]) self.total_received_tx_last += len(block["rawTx"])
self.batch_parsing += (time.time() - t) - t2
except Exception as err: except Exception as err:
self.log.critical("new block error %s " % err) self.log.critical("new block error %s " % err)
self.log.critical(str(traceback.format_exc())) self.log.critical(str(traceback.format_exc()))

23
pybtc/test/block.py
View File

@ -600,18 +600,19 @@ class BlockDeserializeTests(unittest.TestCase):
f = open('./pybtc/test/raw_block.txt') f = open('./pybtc/test/raw_block.txt')
fc = f.readline() fc = f.readline()
qt = time.time() qt = time.time()
bt = ( bt = Block(fc[:-1], format="raw", keep_raw_tx=False)
Block(fc[:-1], format="raw", keep_raw_tx=False), print(len(bt["tx"]))
) print([t["txId"] for t in bt["tx"].values()])
print(merkle_branches([t["txId"] for t in bt["tx"].values()]))
import ujson as pickle # import pickle
qt = time.time() # qt = time.time()
k = pickle.dumps(bt[0]["tx"][0]) # k = pickle.dumps(bt[0]["tx"][0])
print("decoded block dump", time.time() - qt) # print("decoded block dump", time.time() - qt)
qt = time.time() # qt = time.time()
p = pickle.loads(k) # p = pickle.loads(k)
print("decoded block load", time.time() - qt) # print("decoded block load", time.time() - qt)
print(p[0]["hash"]) # print(p)