From f97338ba73dfe36d4905145663b5778aa19414ba Mon Sep 17 00:00:00 2001 From: 4tochka Date: Thu, 9 May 2019 13:06:06 +0400 Subject: [PATCH] connector --- .../lib.macosx-10.9-x86_64-3.7/pybtc/connector.py | 4 ++-- pybtc/connector/block_loader.py | 15 +++++++++------ 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/build/lib.macosx-10.9-x86_64-3.7/pybtc/connector.py b/build/lib.macosx-10.9-x86_64-3.7/pybtc/connector.py index 3966d55..d0ce532 100644 --- a/build/lib.macosx-10.9-x86_64-3.7/pybtc/connector.py +++ b/build/lib.macosx-10.9-x86_64-3.7/pybtc/connector.py @@ -597,7 +597,7 @@ class Connector: for i in tx["vIn"]: outpoint = b"".join((inp["txId"], int_to_bytes(inp["vOut"]))) try: - stxo.add(outpoint, tx["vIn"][i]["__coin__"]) + stxo.add(outpoint, tx["vIn"][i]["_c_"]) except: inp = tx["vIn"][i] r = self.utxo.get(outpoint, block_height) @@ -618,7 +618,7 @@ class Connector: if self.utxo: for i in tx["vOut"]: try: - tx["vOut"][i]["__spent__"] + tx["vOut"][i]["_s_"] except: out = tx["vOut"][i] # if self.skip_opreturn and out["nType"] in (3, 8): diff --git a/pybtc/connector/block_loader.py b/pybtc/connector/block_loader.py index 3d720c4..55e5dba 100644 --- a/pybtc/connector/block_loader.py +++ b/pybtc/connector/block_loader.py @@ -227,10 +227,12 @@ class Worker: for i in block["rawTx"][z]["vIn"]: inp = block["rawTx"][z]["vIn"][i] outpoint = b"".join((inp["txId"], int_to_bytes(inp["vOut"]))) - r = self.coins[outpoint] - if r: - block["rawTx"][z]["vIn"][i]["_c_"] = r - self.destroyed_coins[outpoint] = True + try: + r = self.coins[outpoint] + block["rawTx"][z]["vIn"][i]["_c_"] = r + self.destroyed_coins[r[0]] = True + except: + pass for i in block["rawTx"][z]["vOut"]: o = b"".join((block["rawTx"][z]["txId"], int_to_bytes(i))) pointer = (x << 42) + (z << 21) + i @@ -244,9 +246,10 @@ class Worker: for x in blocks: for y in blocks[x]["rawTx"]: for i in blocks[x]["rawTx"][y]["vOut"]: - if self.destroyed_coins[pointer]: + try: pointer = (x << 42) + (y << 21) + i - blocks[x]["rawTx"][y]["vOut"][i]["_s_"] = 1 + blocks[x]["rawTx"][y]["vOut"][i]["_s_"] = self.destroyed_coins[pointer] + except: pass blocks[x] = pickle.dumps(blocks[x]) # self.log.critical(str(len(blocks))) self.pipe_sent_msg(b'result', pickle.dumps(blocks))