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-17 13:47:33 +04:00
parent 291ef675c0
commit e815ee10e1
2 changed files with 2 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pybtc/connector/connector.py
View File

@ -387,7 +387,7 @@ class Connector:
# self.utxo.checkpoints = n # self.utxo.checkpoints = n
if self.utxo.checkpoints[0] < block["height"]: if self.utxo.checkpoints[0] < block["height"]:
self.utxo.deleted_last_block = block["height"] self.utxo.deleted_last_block = block["height"]
self.utxo.pending_deleted = self.utxo.pending_deleted.union(self.utxo.deleted) for d in self.utxo.deleted: self.utxo.pending_deleted.add(d)
self.utxo.deleted = set() self.utxo.deleted = set()
self.loop.create_task(self.utxo.save_utxo()) self.loop.create_task(self.utxo.save_utxo())

45
pybtc/connector/utxo.py
View File

@ -90,38 +90,6 @@ class UTXO():
self.log.critical("checkpoint not found " +str(lb) +" > "+ str(self.checkpoints)) self.log.critical("checkpoint not found " +str(lb) +" > "+ str(self.checkpoints))
await asyncio.sleep(5) await asyncio.sleep(5)
return return
# self.log.critical("checkpoints " + str(self.checkpoints) + " > " + str(checkpoint))
# self.log.critical("found checkpoint " + str(lb) + " len " + str(len(utxo)) + " cached " + str(len(self.cached)) )
# self.log.critical(">" + str(len(self.cached)))
#
# block_height
# for key in iter(self.cached):
# i = self.cached[key]
# if c>0 and (i[0] >> 42) <= block_height:
# c -= 1
# lb = i[0] >> 42
# continue
# break
#
# if lb:
# d = set()
# for key in range(self.last_saved_block + 1, lb + 1):
# try:
# [d.add(i) for i in self.deleted[key]]
# except:
# pass
#
# a = set()
# for key in iter(self.cached):
# i = self.cached[key]
# if (i[0] >> 42) > lb: break
# a.add((key,b"".join((int_to_c_int(i[0]),
# int_to_c_int(i[1]),
# i[2]))))
# insert to db
# self.log.critical("start " + str(len(utxo)))
async with self._db_pool.acquire() as conn: async with self._db_pool.acquire() as conn:
@ -140,18 +108,7 @@ class UTXO():
self.deleted_utxo += len(self.pending_deleted) self.deleted_utxo += len(self.pending_deleted)
self.pending_deleted = set() self.pending_deleted = set()
# # remove from cache
# for key in a:
# try:
# self.cached.pop(key[0])
# except:
# pass
#
# for key in range(self.last_saved_block + 1, lb + 1):
# try:
# self.deleted.pop(key)
# except:
# pass
self.last_saved_block = lb self.last_saved_block = lb
except: except:
import traceback import traceback