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-27 01:21:12 +04:00
parent e52ec9ba95
commit a25b6d2eb0
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pybtc/connector/block_loader.py
View File

@ -265,10 +265,11 @@ class Worker:
o = b"".join((block["rawTx"][z]["txId"], int_to_bytes(i))) o = b"".join((block["rawTx"][z]["txId"], int_to_bytes(i)))
pointer = (x << 42) + (z << 21) + i pointer = (x << 42) + (z << 21) + i
try: try:
address = block["rawTx"][z]["vOut"][i]["scriptPubKey"]
except:
address = b"".join((bytes([block["rawTx"][z]["vOut"][i]["nType"]]), address = b"".join((bytes([block["rawTx"][z]["vOut"][i]["nType"]]),
block["rawTx"][z]["vOut"][i]["addressHash"])) block["rawTx"][z]["vOut"][i]["addressHash"]))
except:
address = block["rawTx"][z]["vOut"][i]["scriptPubKey"]
self.coins[o] = (pointer, block["rawTx"][z]["vOut"][i]["value"], address) self.coins[o] = (pointer, block["rawTx"][z]["vOut"][i]["value"], address)
if not block["rawTx"][z]["coinbase"]: if not block["rawTx"][z]["coinbase"]:
for i in block["rawTx"][z]["vIn"]: for i in block["rawTx"][z]["vIn"]:

9
pybtc/connector/connector.py
View File

@ -540,9 +540,9 @@ class Connector:
continue continue
pointer = (block["height"] << 42) + (q << 21) + i pointer = (block["height"] << 42) + (q << 21) + i
try: try:
address = b"".join((bytes([out["nType"]]), out["scriptPubKey"]))
except:
address = b"".join((bytes([out["nType"]]), out["addressHash"])) address = b"".join((bytes([out["nType"]]), out["addressHash"]))
except:
address = b"".join((bytes([out["nType"]]), out["scriptPubKey"]))
self.utxo.set(b"".join((tx["txId"], int_to_bytes(i))), pointer, out["value"], address) self.utxo.set(b"".join((tx["txId"], int_to_bytes(i))), pointer, out["value"], address)
c = 0 c = 0
@ -745,9 +745,10 @@ class Connector:
continue continue
pointer = (block_height << 42) + (block_index << 21) + i pointer = (block_height << 42) + (block_index << 21) + i
try: try:
address = b"".join((bytes([out["nType"]]), out["scriptPubKey"]))
except:
address = b"".join((bytes([out["nType"]]), out["addressHash"])) address = b"".join((bytes([out["nType"]]), out["addressHash"]))
except:
address = b"".join((bytes([out["nType"]]), out["scriptPubKey"]))
self.utxo.set(b"".join((tx["txId"], int_to_bytes(i))), pointer, out["value"], address) self.utxo.set(b"".join((tx["txId"], int_to_bytes(i))), pointer, out["value"], address)
self.tx_cache.set(tx["txId"], True) self.tx_cache.set(tx["txId"], True)