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 15:23:47 +04:00
parent 2d025c661c
commit f80d2ccf63
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pybtc/connector/block_loader.py
View File

@ -211,6 +211,7 @@ class Worker:
self.in_reader = in_reader self.in_reader = in_reader
self.coins = MRU(500000) self.coins = MRU(500000)
self.destroyed_coins = MRU(500000) self.destroyed_coins = MRU(500000)
self.a_coins = MRU(500000)
signal.signal(signal.SIGTERM, self.terminate) signal.signal(signal.SIGTERM, self.terminate)
self.loop.create_task(self.message_loop()) self.loop.create_task(self.message_loop())
self.loop.run_forever() self.loop.run_forever()
@ -248,11 +249,7 @@ class Worker:
outpoint = b"".join((inp["txId"], int_to_bytes(inp["vOut"]))) outpoint = b"".join((inp["txId"], int_to_bytes(inp["vOut"])))
try: try:
r = self.coins.delete(outpoint) r = self.coins.delete(outpoint)
h = r[0] >> 42 block["rawTx"][z]["vIn"][i]["_c_"] = r
if h >= start_height and h < height:
block["rawTx"][z]["vIn"][i]["_c_"] = r
else:
block["rawTx"][z]["vIn"][i]["_c_"] = r
t += 1 t += 1
self.destroyed_coins[r[0]] = True self.destroyed_coins[r[0]] = True
except: except:
@ -275,8 +272,17 @@ class Worker:
try: try:
pointer = (x << 42) + (y << 21) + i pointer = (x << 42) + (y << 21) + i
r = self.destroyed_coins.delete(pointer) r = self.destroyed_coins.delete(pointer)
self.a_coins[pointer]=True
blocks[x]["rawTx"][y]["vOut"][i]["_s_"] = r blocks[x]["rawTx"][y]["vOut"][i]["_s_"] = r
except: pass except: pass
if not blocks[x]["rawTx"][y]["coinbase"]:
for i in blocks[x]["rawTx"][y]["vOut"]:
try:
r = blocks[x]["rawTx"][y]["vIn"][i]["_c_"]
self.a_coins.delete(r[0])
blocks[x]["rawTx"][y]["vIn"][i]["_a_"] = True
except:
pass
blocks[x] = pickle.dumps(blocks[x]) blocks[x] = pickle.dumps(blocks[x])
self.pipe_sent_msg(b'result', pickle.dumps(blocks)) self.pipe_sent_msg(b'result', pickle.dumps(blocks))

3
pybtc/connector/connector.py
View File

@ -617,12 +617,13 @@ class Connector:
outpoint = b"".join((inp["txId"], int_to_bytes(inp["vOut"]))) outpoint = b"".join((inp["txId"], int_to_bytes(inp["vOut"])))
tx["vIn"][i]["outpoint"] = outpoint tx["vIn"][i]["outpoint"] = outpoint
try: try:
inp["_a_"]
tx["vIn"][i]["coin"] = inp["_c_"] tx["vIn"][i]["coin"] = inp["_c_"]
c += 1 c += 1
self.yy += 1 self.yy += 1
except: except:
try: try:
tx["vIn"][i]["coin"] = inp["_a_"] tx["vIn"][i]["coin"] = inp["_c_"]
c += 1 c += 1
self.aa += 1 self.aa += 1
try: try: