From 78742525f890d1e5596389baedcf7495a98a3eb7 Mon Sep 17 00:00:00 2001 From: 4tochka Date: Fri, 17 May 2019 14:47:06 +0400 Subject: [PATCH] connector --- pybtc/connector/block_loader.py | 6 +----- pybtc/connector/connector.py | 28 ++++++++++++++-------------- 2 files changed, 15 insertions(+), 19 deletions(-) diff --git a/pybtc/connector/block_loader.py b/pybtc/connector/block_loader.py index 111bea0..938a3ea 100644 --- a/pybtc/connector/block_loader.py +++ b/pybtc/connector/block_loader.py @@ -248,11 +248,7 @@ class Worker: outpoint = b"".join((inp["txId"], int_to_bytes(inp["vOut"]))) try: r = self.coins.delete(outpoint) - h = r[0] >> 42 - if h >= start_height and h < height: - block["rawTx"][z]["vIn"][i]["_a_"] = r - else: - block["rawTx"][z]["vIn"][i]["_c_"] = r + block["rawTx"][z]["vIn"][i]["_c_"] = r t += 1 self.destroyed_coins[r[0]] = True except: diff --git a/pybtc/connector/connector.py b/pybtc/connector/connector.py index 3fa8e53..0125b64 100644 --- a/pybtc/connector/connector.py +++ b/pybtc/connector/connector.py @@ -621,21 +621,21 @@ class Connector: c += 1 self.yy += 1 except: - try: - tx["vIn"][i]["coin"] = inp["_a_"] + # try: + # tx["vIn"][i]["coin"] = inp["_a_"] + # c += 1 + # self.aa += 1 + # try: + # self.utxo.get(outpoint) + # except: + # self.utxo.deleted.add(outpoint) + # except: + r = self.utxo.get(outpoint) + if r: + tx["vIn"][i]["coin"] = r c += 1 - self.aa += 1 - try: - self.utxo.get(outpoint) - except: - self.utxo.deleted.add(outpoint) - except: - r = self.utxo.get(outpoint) - if r: - tx["vIn"][i]["coin"] = r - c += 1 - else: - missed.add((outpoint, (block_height << 42) + (block_index << 21) + i, i)) + else: + missed.add((outpoint, (block_height << 42) + (block_index << 21) + i, i)) if missed: await self.utxo.load_utxo()