From 4aab7af4110e2f0e053fa05ceaf53a9687e372d8 Mon Sep 17 00:00:00 2001
From: Ouziel Slama <ouziel@gmail.com>
Date: Mon, 6 Jan 2025 12:52:32 +0000
Subject: [PATCH] delete python deserializer

---
 .../counterpartycore/lib/backend/bitcoind.py  |  25 ---
 .../counterpartycore/lib/bc_data_stream.py    | 156 -----------------
 .../counterpartycore/lib/blocks.py            |   8 +-
 .../counterpartycore/lib/composer.py          |   2 +-
 .../counterpartycore/lib/deserialize.py       | 165 ++++--------------
 .../counterpartycore/lib/follow.py            |   7 +-
 .../counterpartycore/lib/gettxinfo.py         |   2 +-
 .../counterpartycore/lib/mempool.py           |   2 +-
 .../counterpartycore/test/conftest.py         |   5 +
 .../counterpartycore/test/deserialize_test.py |  16 +-
 .../fixtures/contract_vectors/gettxinfo.py    |  30 +++-
 .../counterpartycore/test/util_test.py        |   7 +-
 counterparty-rs/src/indexer/bitcoin_client.rs |   1 +
 13 files changed, 93 insertions(+), 333 deletions(-)
 delete mode 100644 counterparty-core/counterpartycore/lib/bc_data_stream.py

diff --git a/counterparty-core/counterpartycore/lib/backend/bitcoind.py b/counterparty-core/counterpartycore/lib/backend/bitcoind.py
index acf322d857..b9088ba793 100644
--- a/counterparty-core/counterpartycore/lib/backend/bitcoind.py
+++ b/counterparty-core/counterpartycore/lib/backend/bitcoind.py
@@ -350,21 +350,6 @@ def add_block_in_cache(block_index, block):
         add_transaction_in_cache(transaction["tx_hash"], transaction)
 
 
-def get_decoded_block(block_index):
-    if block_index in BLOCKS_CACHE:
-        # remove from cache when used
-        return BLOCKS_CACHE.pop(block_index)
-
-    block_hash = getblockhash(block_index)
-    raw_block = getblock(block_hash)
-    use_txid = util.enabled("correct_segwit_txids", block_index=block_index)
-    block = deserialize.deserialize_block(raw_block, use_txid=use_txid)
-
-    add_block_in_cache(block_index, block)
-
-    return block
-
-
 def get_decoded_transaction(tx_hash, block_index=None):
     if isinstance(tx_hash, bytes):
         tx_hash = ib2h(tx_hash)
@@ -389,16 +374,6 @@ def get_utxo_value(tx_hash, vout):
     return get_tx_out_amount(tx_hash, vout)
 
 
-class BlockFetcher:
-    def __init__(self, first_block) -> None:
-        self.current_block = first_block
-
-    def get_block(self):
-        block = get_decoded_block(self.current_block)
-        self.current_block += 1
-        return block
-
-
 def sendrawtransaction(signedhex: str):
     """
     Proxy to `sendrawtransaction` RPC call.
diff --git a/counterparty-core/counterpartycore/lib/bc_data_stream.py b/counterparty-core/counterpartycore/lib/bc_data_stream.py
deleted file mode 100644
index f65c1ea3b0..0000000000
--- a/counterparty-core/counterpartycore/lib/bc_data_stream.py
+++ /dev/null
@@ -1,156 +0,0 @@
-#
-# Workalike python implementation of Bitcoin's CDataStream class.
-#
-import mmap
-import struct
-
-from .exceptions import SerializationError
-
-
-class BCDataStream(object):
-    def __init__(self):
-        self.input = None
-        self.read_cursor = 0
-
-    def clear(self):
-        self.input = None
-        self.read_cursor = 0
-
-    def write(self, bytes):  # Initialize with string of bytes
-        if self.input is None:
-            self.input = bytes
-        else:
-            self.input += bytes
-
-    def map_file(self, file, start):  # Initialize with bytes from file
-        self.input = mmap.mmap(file.fileno(), 0, access=mmap.ACCESS_READ)
-        self.read_cursor = start
-
-    def map_hex(self, data):  # Initialize with hex string
-        data_bytes = bytes.fromhex(data)
-        self.input = data_bytes
-        self.read_cursor = 0
-
-    def seek_file(self, position):
-        self.read_cursor = position
-
-    def close_file(self):
-        self.input.close()
-
-    def read_string(self):
-        # Strings are encoded depending on length:
-        # 0 to 252 :  1-byte-length followed by bytes (if any)
-        # 253 to 65,535 : byte'253' 2-byte-length followed by bytes
-        # 65,536 to 4,294,967,295 : byte '254' 4-byte-length followed by bytes
-        # ... and the Bitcoin client is coded to understand:
-        # greater than 4,294,967,295 : byte '255' 8-byte-length followed by bytes of string
-        # ... but I don't think it actually handles any strings that big.
-        if self.input is None:
-            raise SerializationError("call write(bytes) before trying to deserialize")
-
-        try:
-            length = self.read_compact_size()
-        except IndexError:
-            raise SerializationError("attempt to read past end of buffer")  # noqa: B904
-
-        return self.read_bytes(length)
-
-    def write_string(self, string):
-        # Length-encoded as with read-string
-        self.write_compact_size(len(string))
-        self.write(string)
-
-    def read_bytes(self, length):
-        try:
-            result = self.input[self.read_cursor : self.read_cursor + length]
-            self.read_cursor += length
-            return result
-        except IndexError:
-            raise SerializationError("attempt to read past end of buffer")  # noqa: B904
-
-    def read_boolean(self):
-        return self.read_bytes(1)[0] != chr(0)
-
-    def read_int16(self):
-        return self._read_num("<h")
-
-    def read_uint16(self):
-        return self._read_num("<H")
-
-    def read_int32(self):
-        return self._read_num("<i")
-
-    def read_uint32(self):
-        return self._read_num("<I")
-
-    def read_int64(self):
-        return self._read_num("<q")
-
-    def read_uint64(self):
-        return self._read_num("<Q")
-
-    def write_boolean(self, val):
-        return self.write(chr(1) if val else chr(0))
-
-    def write_int16(self, val):
-        return self._write_num("<h", val)
-
-    def write_uint16(self, val):
-        return self._write_num("<H", val)
-
-    def write_int32(self, val):
-        return self._write_num("<i", val)
-
-    def write_uint32(self, val):
-        return self._write_num("<I", val)
-
-    def write_int64(self, val):
-        return self._write_num("<q", val)
-
-    def write_uint64(self, val):
-        return self._write_num("<Q", val)
-
-    def read_compact_size(self):
-        size = self.input[self.read_cursor]
-        self.read_cursor += 1
-        if size == 253:
-            return self._read_num("<H")
-        elif size == 254:
-            return self._read_num("<I")
-        elif size == 255:
-            return self._read_num("<Q")
-        return size
-
-    def write_compact_size(self, size):
-        if size < 0:
-            raise SerializationError("attempt to write size < 0")
-        elif size < 253:
-            self.write(chr(size))
-        elif size < 2**16:
-            self.write("\xfd")
-            self._write_num("<H", size)
-        elif size < 2**32:
-            self.write("\xfe")
-            self._write_num("<I", size)
-        elif size < 2**64:
-            self.write("\xff")
-            self._write_num("<Q", size)
-
-    def _read_num(self, format):
-        (i,) = struct.unpack_from(format, self.input, self.read_cursor)
-        self.read_cursor += struct.calcsize(format)
-        return i
-
-    def _write_num(self, format, num):
-        s = struct.pack(format, num)
-        self.write(s)
-
-    def read_var_int(self):
-        n = 0
-        while True:
-            cur_byte = self.read_bytes(1)[0]
-            n = (n << 7) | (cur_byte & 0x7F)
-            if cur_byte & 0x80:
-                n += 1
-            else:
-                return n
diff --git a/counterparty-core/counterpartycore/lib/blocks.py b/counterparty-core/counterpartycore/lib/blocks.py
index b976967a2e..46ebd34efe 100644
--- a/counterparty-core/counterpartycore/lib/blocks.py
+++ b/counterparty-core/counterpartycore/lib/blocks.py
@@ -1304,8 +1304,12 @@ def parse_new_block(db, decoded_block, tx_index=None):
                     break
             current_block_hash = backend.bitcoind.getblockhash(previous_block_index + 1)
             raw_current_block = backend.bitcoind.getblock(current_block_hash)
-            decoded_block = deserialize.deserialize_block(raw_current_block, use_txid=True)
-
+            decoded_block = deserialize.deserialize_block(
+                raw_current_block,
+                use_txid=True,
+                parse_vouts=True,
+                block_index=previous_block_index + 1,
+            )
             logger.warning("Blockchain reorganization detected at block %s.", previous_block_index)
             # rollback to the previous block
             rollback(db, block_index=previous_block_index + 1)
diff --git a/counterparty-core/counterpartycore/lib/composer.py b/counterparty-core/counterpartycore/lib/composer.py
index e4314781ba..821823cd8a 100644
--- a/counterparty-core/counterpartycore/lib/composer.py
+++ b/counterparty-core/counterpartycore/lib/composer.py
@@ -837,7 +837,7 @@ def check_transaction_sanity(tx_info, composed_tx, construct_params):
 
     # check if source address matches the first input address
     first_utxo_txid = decoded_tx["vin"][0]["hash"]
-    first_utxo_txid = util.inverse_hash(binascii.hexlify(first_utxo_txid).decode("utf-8"))
+    # first_utxo_txid = util.inverse_hash(binascii.hexlify(first_utxo_txid).decode("utf-8"))
     first_utxo = f"{first_utxo_txid}:{decoded_tx['vin'][0]['n']}"
 
     if util.is_utxo_format(source):
diff --git a/counterparty-core/counterpartycore/lib/deserialize.py b/counterparty-core/counterpartycore/lib/deserialize.py
index c24eda7588..b4d03f9162 100644
--- a/counterparty-core/counterpartycore/lib/deserialize.py
+++ b/counterparty-core/counterpartycore/lib/deserialize.py
@@ -1,129 +1,36 @@
-from counterpartycore.lib.bc_data_stream import BCDataStream
-from counterpartycore.lib.util import (
-    b2h,
-    double_hash,
-    ib2h,
-)
-
-
-def read_tx_in(vds):
-    tx_in = {}
-    tx_in["hash"] = vds.read_bytes(32)
-    tx_in["n"] = vds.read_uint32()
-    script_sig_size = vds.read_compact_size()
-    tx_in["script_sig"] = vds.read_bytes(script_sig_size)
-    tx_in["sequence"] = vds.read_uint32()
-    tx_in["coinbase"] = False
-    if (
-        tx_in["hash"]
-        == b"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
-    ):
-        tx_in["coinbase"] = True
-    return tx_in
-
-
-def read_tx_out(vds):
-    tx_out = {}
-    tx_out["value"] = vds.read_int64()
-    script = vds.read_bytes(vds.read_compact_size())
-    tx_out["script_pub_key"] = script
-    return tx_out
-
-
-def read_transaction(vds, use_txid=True):
-    transaction = {}
-    start_pos = vds.read_cursor
-    transaction["version"] = vds.read_int32()
-
-    flag = vds.read_bytes(2)
-    if flag == b"\x00\x01":
-        transaction["segwit"] = True
-    else:
-        transaction["segwit"] = False
-        vds.read_cursor = vds.read_cursor - 2
-
-    transaction["coinbase"] = False
-    transaction["vin"] = []
-    for _i in range(vds.read_compact_size()):  # noqa: B007
-        vin = read_tx_in(vds)
-        transaction["vin"].append(vin)
-        transaction["coinbase"] = transaction["coinbase"] or vin["coinbase"]
-
-    transaction["vout"] = []
-    for i in range(vds.read_compact_size()):  # noqa: B007
-        transaction["vout"].append(read_tx_out(vds))
-
-    transaction["vtxinwit"] = []
-    if transaction["segwit"]:
-        offset_before_tx_witnesses = vds.read_cursor - start_pos
-        for vin in transaction["vin"]:  # noqa: B007
-            witnesses_count = vds.read_compact_size()
-            if witnesses_count == 0:
-                transaction["vtxinwit"].append([])
-            else:
-                vin_witnesses = []
-                for i in range(witnesses_count):  # noqa: B007
-                    witness_length = vds.read_compact_size()
-                    witness = vds.read_bytes(witness_length)
-                    vin_witnesses.append(witness)
-                transaction["vtxinwit"].append(vin_witnesses)
-
-    transaction["lock_time"] = vds.read_uint32()
-    data = vds.input[start_pos : vds.read_cursor]
-
-    transaction["tx_hash"] = ib2h(double_hash(data))
-    transaction["tx_id"] = transaction["tx_hash"]
-    if transaction["segwit"]:
-        hash_data = data[:4] + data[6:offset_before_tx_witnesses] + data[-4:]
-        transaction["tx_id"] = ib2h(double_hash(hash_data))
-        if use_txid:
-            transaction["tx_hash"] = transaction["tx_id"]
-
-    transaction["__data__"] = b2h(data)
-
-    return transaction
-
-
-def read_block_header(vds):
-    block_header = {}
-    block_header["magic_bytes"] = vds.read_int32()
-    # if block_header['magic_bytes'] != 118034699:
-    #   raise Exception('Not a block')
-    block_header["block_size"] = vds.read_int32()
-    header_start = vds.read_cursor
-    block_header["version"] = vds.read_int32()
-    block_header["hash_prev"] = ib2h(vds.read_bytes(32))
-    block_header["hash_merkle_root"] = ib2h(vds.read_bytes(32))
-    block_header["block_time"] = vds.read_uint32()
-    block_header["bits"] = vds.read_uint32()
-    block_header["nonce"] = vds.read_uint32()
-    header_end = vds.read_cursor
-    header = vds.input[header_start:header_end]
-    block_header["block_hash"] = ib2h(double_hash(header))
-    # block_header['__header__'] = b2h(header)
-    return block_header
-
-
-def read_block(vds, only_header=False, use_txid=True):
-    block = read_block_header(vds)
-    if only_header:
-        return block
-    block["transaction_count"] = vds.read_compact_size()
-    block["transactions"] = []
-    for _i in range(block["transaction_count"]):  # noqa: B007
-        block["transactions"].append(read_transaction(vds, use_txid=use_txid))
-    return block
-
-
-def deserialize_tx(tx_hex, use_txid):
-    ds = BCDataStream()
-    ds.map_hex(tx_hex)
-    tx = read_transaction(ds, use_txid=use_txid)
-    return tx
-
-
-def deserialize_block(block_hex, use_txid, only_header=False):
-    block_hex = ("00" * 8) + block_hex  # fake magic bytes and block size
-    ds = BCDataStream()
-    ds.map_hex(block_hex)
-    return read_block(ds, only_header=only_header, use_txid=use_txid)
+from counterparty_rs import indexer
+
+from counterpartycore.lib import config, util
+
+
+def deserialize_tx(tx_hex, use_txid, parse_vouts=False, block_index=None):
+    deserializer = indexer.Deserializer(
+        {
+            "rpc_address": "",
+            "rpc_user": "",
+            "rpc_password": "",
+            "network": config.NETWORK_NAME,
+            "db_dir": "",
+            "log_file": "",
+        }
+    )
+    return deserializer.parse_transaction(
+        tx_hex, block_index or util.CURRENT_BLOCK_INDEX, parse_vouts, use_txid
+    )
+
+
+def deserialize_block(block_hex, use_txid, parse_vouts=False, block_index=None):
+    # block_hex = ("00" * 8) + block_hex  # fake magic bytes and block size
+    deserializer = indexer.Deserializer(
+        {
+            "rpc_address": "",
+            "rpc_user": "",
+            "rpc_password": "",
+            "network": config.NETWORK_NAME,
+            "db_dir": "",
+            "log_file": "",
+        }
+    )
+    return deserializer.parse_block(
+        block_hex, block_index or util.CURRENT_BLOCK_INDEX, parse_vouts, use_txid
+    )
diff --git a/counterparty-core/counterpartycore/lib/follow.py b/counterparty-core/counterpartycore/lib/follow.py
index eff82d4f11..988b88c957 100644
--- a/counterparty-core/counterpartycore/lib/follow.py
+++ b/counterparty-core/counterpartycore/lib/follow.py
@@ -123,7 +123,12 @@ def check_software_version_if_needed(self):
 
     def receive_rawblock(self, body):
         # parse blocks as they come in
-        decoded_block = deserialize.deserialize_block(body.hex(), use_txid=True)
+        decoded_block = deserialize.deserialize_block(
+            body.hex(),
+            use_txid=True,
+            parse_vouts=True,
+            block_index=util.CURRENT_BLOCK_INDEX + 1,
+        )
         # check if already parsed by block.catch_up()
         existing_block = ledger.get_block_by_hash(self.db, decoded_block["block_hash"])
         if existing_block is None:
diff --git a/counterparty-core/counterpartycore/lib/gettxinfo.py b/counterparty-core/counterpartycore/lib/gettxinfo.py
index 8d1efc8596..a82c3746e1 100644
--- a/counterparty-core/counterpartycore/lib/gettxinfo.py
+++ b/counterparty-core/counterpartycore/lib/gettxinfo.py
@@ -492,7 +492,7 @@ def get_tx_info_new(db, decoded_tx, block_index, p2sh_is_segwit=False, composing
         raise DecodeError("coinbase transaction")
 
     # Get destinations and data outputs.
-    if "parsed_vouts" in decoded_tx:
+    if "parsed_vouts" in decoded_tx and str(decoded_tx["parsed_vouts"]) != "Not Parsed":
         if isinstance(decoded_tx["parsed_vouts"], Exception):
             raise DecodeError(str(decoded_tx["parsed_vouts"]))
         elif decoded_tx["parsed_vouts"] == "DecodeError":
diff --git a/counterparty-core/counterpartycore/lib/mempool.py b/counterparty-core/counterpartycore/lib/mempool.py
index deed57813e..42e5f013f4 100644
--- a/counterparty-core/counterpartycore/lib/mempool.py
+++ b/counterparty-core/counterpartycore/lib/mempool.py
@@ -45,7 +45,7 @@ def parse_mempool_transactions(db, raw_tx_list, timestamps=None):
             # list_tx
             decoded_tx_count = 0
             for raw_tx in raw_tx_list:
-                decoded_tx = deserialize.deserialize_tx(raw_tx, use_txid=True)
+                decoded_tx = deserialize.deserialize_tx(raw_tx, use_txid=True, parse_vouts=True)
                 existing_tx = ledger.get_transaction(db, decoded_tx["tx_hash"])
                 not_supported_txs.append(decoded_tx["tx_hash"])
                 if existing_tx:
diff --git a/counterparty-core/counterpartycore/test/conftest.py b/counterparty-core/counterpartycore/test/conftest.py
index 3037396fdd..a0e60fc861 100644
--- a/counterparty-core/counterpartycore/test/conftest.py
+++ b/counterparty-core/counterpartycore/test/conftest.py
@@ -224,6 +224,7 @@ def rawtransactions_db(request):
 def server_db(request, cp_server, api_server):
     """Enable database access for unit test vectors."""
     config.CACHE_DIR = os.path.dirname(request.module.FIXTURE_DB)
+    config.NETWORK_NAME = "testnet"
 
     db = database.get_connection(read_only=False)
     cursor = db.cursor()
@@ -248,6 +249,7 @@ def api_server(request, cp_server):
     config.RPC_PORT = TEST_RPC_PORT = TEST_RPC_PORT + 1
     server.configure_rpc(config.RPC_PASSWORD)
     config.CACHE_DIR = os.path.dirname(request.module.FIXTURE_DB)
+    config.NETWORK_NAME = "testnet"
 
     print("api_server", config.DATABASE, config.STATE_DATABASE)
 
@@ -340,6 +342,7 @@ def api_server_v2(request, cp_server):
 
     config.STATE_DATABASE = config.STATE_DATABASE.replace(".testnet.db", ".db")
     config.CACHE_DIR = os.path.dirname(request.module.FIXTURE_DB)
+    config.NETWORK_NAME = "testnet"
 
     if os.path.exists(config.STATE_DATABASE):
         os.unlink(config.STATE_DATABASE)
@@ -397,6 +400,8 @@ def cp_server(request):
     if hasattr(config, "PREFIX"):
         config.PREFIX = b"TESTXXXX"
 
+    config.NETWORK_NAME = "testnet"
+
     request.addfinalizer(lambda: util_test.remove_database_files(dbfile))
 
     return db
diff --git a/counterparty-core/counterpartycore/test/deserialize_test.py b/counterparty-core/counterpartycore/test/deserialize_test.py
index 963d6ad6fa..224fe0d290 100644
--- a/counterparty-core/counterpartycore/test/deserialize_test.py
+++ b/counterparty-core/counterpartycore/test/deserialize_test.py
@@ -2,9 +2,8 @@
 import time
 
 import bitcoin as bitcoinlib
-from counterparty_rs import indexer
 
-from counterpartycore.lib import util
+from counterpartycore.lib import config, deserialize, util
 from counterpartycore.lib.util import inverse_hash
 
 
@@ -13,17 +12,8 @@ def deserialize_bitcoinlib(tx_hex):
 
 
 def deserialize_rust(tx_hex, use_txid=False):
-    deserializer = indexer.Deserializer(
-        {
-            "rpc_address": "",
-            "rpc_user": "",
-            "rpc_password": "",
-            "network": "mainnet",
-            "db_dir": "",
-            "log_file": "",
-        }
-    )
-    return deserializer.parse_transaction(tx_hex, 900000, False, use_txid)
+    config.NETWORK_NAME = "mainnet"
+    return deserialize.deserialize_tx(tx_hex, use_txid, parse_vouts=False, block_index=900000)
 
 
 def test_deserialize():
diff --git a/counterparty-core/counterpartycore/test/fixtures/contract_vectors/gettxinfo.py b/counterparty-core/counterpartycore/test/fixtures/contract_vectors/gettxinfo.py
index aa9cbf65a3..afee008923 100644
--- a/counterparty-core/counterpartycore/test/fixtures/contract_vectors/gettxinfo.py
+++ b/counterparty-core/counterpartycore/test/fixtures/contract_vectors/gettxinfo.py
@@ -1,10 +1,12 @@
 import binascii
 
-from counterpartycore.lib import deserialize, exceptions
+from counterpartycore.lib import config, deserialize, exceptions
 from counterpartycore.lib.gettxinfo import SighashFlagError
 
 from ..params import DEFAULT_PARAMS as DP
 
+config.NETWORK_NAME = "testnet"
+
 GETTXINFO_VECTOR = {
     "gettxinfo": {
         "get_tx_info": [
@@ -14,6 +16,8 @@
                     deserialize.deserialize_tx(
                         "0100000001ebe3111881a8733ace02271dcf606b7450c41a48c1cb21fd73f4ba787b353ce4000000001976a9148d6ae8a3b381663118b4e1eff4cfc7d0954dd6ec88acffffffff0636150000000000001976a9144838d8b3588c4c7ba7c1d06f866e9b3739c6303788ac36150000000000001976a9147da51ea175f108a1c63588683dc4c43a7146c46788ac36150000000000001976a9147da51ea175f108a1c6358868173e34e8ca75a06788ac36150000000000001976a9147da51ea175f108a1c637729895c4c468ca75a06788ac36150000000000001976a9147fa51ea175f108a1c63588682ed4c468ca7fa06788ace24ff505000000001976a9148d6ae8a3b381663118b4e1eff4cfc7d0954dd6ec88ac00000000",
                         use_txid=True,
+                        parse_vouts=False,
+                        block_index=DP["default_block_index"],
                     ),
                     DP["default_block_index"],
                     True,
@@ -39,6 +43,8 @@
                     deserialize.deserialize_tx(
                         "0100000001ebe3111881a8733ace02271dcf606b7450c41a48c1cb21fd73f4ba787b353ce4000000001976a9148d6ae8a3b381663118b4e1eff4cfc7d0954dd6ec88acffffffff0336150000000000001976a9144838d8b3588c4c7ba7c1d06f866e9b3739c6303788ac781e000000000000695121035ca51ea175f108a1c63588683dc4c43a7146c46799f864a300263c0813f5fe352102309a14a1a30202f2e76f46acdb2917752371ca42b97460f7928ade8ecb02ea17210319f6e07b0b8d756156394b9dcf3b011fe9ac19f2700bd6b69a6a1783dbb8b97753ae4286f505000000001976a9148d6ae8a3b381663118b4e1eff4cfc7d0954dd6ec88ac00000000",
                         use_txid=True,
+                        parse_vouts=False,
+                        block_index=DP["default_block_index"],
                     ),
                     DP["default_block_index"],
                     True,
@@ -64,6 +70,8 @@
                     deserialize.deserialize_tx(
                         "0100000001ebe3111881a8733ace02271dcf606b7450c41a48c1cb21fd73f4ba787b353ce4000000001976a9148d6ae8a3b381663118b4e1eff4cfc7d0954dd6ec88acffffffff03361500000000000017a9144264cfd7eb65f8cbbdba98bd9815d5461fad8d7e87781e000000000000695121035ca51ea175f108a1c63588683dc4c43a7146c46799f864a300263c0813f5fe352102309a14a1a30202f2e76f46acdb2917752371ca42b97460f7928ade8ecb02ea17210319f6e07b0b8d756156394b9dcf3b011fe9ac19f2700bd6b69a6a1783dbb8b97753ae4286f505000000001976a9148d6ae8a3b381663118b4e1eff4cfc7d0954dd6ec88ac00000000",
                         use_txid=True,
+                        parse_vouts=False,
+                        block_index=DP["default_block_index"],
                     ),
                     DP["default_block_index"],
                     True,
@@ -91,6 +99,8 @@
                     deserialize.deserialize_tx(
                         "0100000002ebe3111881a8733ace02271dcf606b7450c41a48c1cb21fd73f4ba787b353ce4000000001976a9148d6ae8a3b381663118b4e1eff4cfc7d0954dd6ec88acffffffff5ef833190e74ad47d8ae693f841a8b1b500ded7e23ee66b29898b72ec4914fdc0100000000ffffffff03361500000000000017a9144264cfd7eb65f8cbbdba98bd9815d5461fad8d7e87781e000000000000695121035ca51ea175f108a1c63588683dc4c43a7146c46799f864a300263c0813f5fe352102309a14a1a30202f2e76f46acdb2917752371ca42b97460f7928ade8ecb02ea17210319f6e07b0b8d756156394b9dcf3b011fe9ac19f2700bd6b69a6a1783dbb8b97753aed2fe7c11000000001976a9148d6ae8a3b381663118b4e1eff4cfc7d0954dd6ec88ac00000000",
                         use_txid=True,
+                        parse_vouts=False,
+                        block_index=DP["default_block_index"],
                     ),
                     DP["default_block_index"],
                     True,
@@ -116,6 +126,8 @@
                     deserialize.deserialize_tx(
                         "0100000002ebe3111881a8733ace02271dcf606b7450c41a48c1cb21fd73f4ba787b353ce4000000001976a9148d6ae8a3b381663118b4e1eff4cfc7d0954dd6ec88acffffffff5ef833190e74ad47d8ae693f841a8b1b500ded7e23ee66b29898b72ec4914fdc0100000000ffffffff03361500000000000017a9144264cfd7eb65f8cbbdba98bd9815d5461fad8d7e87781e000000000000695121035ca51ea175f108a1c63588683dc4c43a7146c46799f864a300263c0813f5fe352102309a14a1a30202f2e76f46acdb2917752371ca42b97460f7928ade8ecb02ea17210319f6e07b0b8d756156394b9dcf3b011fe9ac19f2700bd6b69a6a1783dbb8b97753aed2fe7c11000000001976a9148d6ae8a3b381663118b4e1eff4cfc7d0954dd6ec88ac00000000",
                         use_txid=True,
+                        parse_vouts=False,
+                        block_index=DP["default_block_index"],
                     ),
                     DP["default_block_index"],
                     True,
@@ -143,6 +155,8 @@
                     deserialize.deserialize_tx(
                         "0100000001ebe3111881a8733ace02271dcf606b7450c41a48c1cb21fd73f4ba787b353ce4000000001976a9148d6ae8a3b381663118b4e1eff4cfc7d0954dd6ec88acffffffff0636150000000000001976a9144838d8b3588c4c7ba7c1d06f866e9b3739c6303788ac36150000000000001976a9147da51ea175f108a1c63588683dc4c43a7146c46788ac36150000000000001976a9147da51ea175f108a1c6358868173e34e8ca75a06788ac36150000000000001976a9147da51ea175f108a1c637729895c4c468ca75a06788ac36150000000000001976a9147fa51ea175f108a1c63588682ed4c468ca7fa06788ace24ff505000000001976a9148d6ae8a3b381663118b4e1eff4cfc7d0954dd6ec88ac00000000",
                         use_txid=True,
+                        parse_vouts=False,
+                        block_index=DP["default_block_index"],
                     ),
                     DP["default_block_index"],
                 ),
@@ -173,6 +187,8 @@
                     deserialize.deserialize_tx(
                         "0100000001ebe3111881a8733ace02271dcf606b7450c41a48c1cb21fd73f4ba787b353ce4000000001976a9148d6ae8a3b381663118b4e1eff4cfc7d0954dd6ec88acffffffff0636150000000000001976a9144838d8b3588c4c7ba7c1d06f866e9b3739c6303788ac36150000000000001976a9147da51ea175f108a1c63588683dc4c43a7146c46788ac36150000000000001976a9147da51ea175f108a1c6358868173e34e8ca75a06788ac36150000000000001976a9147da51ea175f108a1c637729895c4c468ca75a06788ac36150000000000001976a9147fa51ea175f108a1c63588682ed4c468ca7fa06788ace24ff505000000001976a9148d6ae8a3b381663118b4e1eff4cfc7d0954dd6ec88ac00000000",
                         use_txid=True,
+                        parse_vouts=False,
+                        block_index=DP["default_block_index"],
                     ),
                     DP["default_block_index"],
                     False,
@@ -193,6 +209,8 @@
                     deserialize.deserialize_tx(
                         "0100000001ebe3111881a8733ace02271dcf606b7450c41a48c1cb21fd73f4ba787b353ce4000000001976a9148d6ae8a3b381663118b4e1eff4cfc7d0954dd6ec88acffffffff0336150000000000001976a9144838d8b3588c4c7ba7c1d06f866e9b3739c6303788ac781e000000000000695121035ca51ea175f108a1c63588683dc4c43a7146c46799f864a300263c0813f5fe352102309a14a1a30202f2e76f46acdb2917752371ca42b97460f7928ade8ecb02ea17210319f6e07b0b8d756156394b9dcf3b011fe9ac19f2700bd6b69a6a1783dbb8b97753ae4286f505000000001976a9148d6ae8a3b381663118b4e1eff4cfc7d0954dd6ec88ac00000000",
                         use_txid=True,
+                        parse_vouts=False,
+                        block_index=DP["default_block_index"],
                     ),
                     DP["default_block_index"],
                     False,
@@ -213,6 +231,8 @@
                     deserialize.deserialize_tx(
                         "0100000001ebe3111881a8733ace02271dcf606b7450c41a48c1cb21fd73f4ba787b353ce4000000001976a9148d6ae8a3b381663118b4e1eff4cfc7d0954dd6ec88acffffffff03361500000000000017a9144264cfd7eb65f8cbbdba98bd9815d5461fad8d7e87781e000000000000695121035ca51ea175f108a1c63588683dc4c43a7146c46799f864a300263c0813f5fe352102309a14a1a30202f2e76f46acdb2917752371ca42b97460f7928ade8ecb02ea17210319f6e07b0b8d756156394b9dcf3b011fe9ac19f2700bd6b69a6a1783dbb8b97753ae4286f505000000001976a9148d6ae8a3b381663118b4e1eff4cfc7d0954dd6ec88ac00000000",
                         use_txid=True,
+                        parse_vouts=False,
+                        block_index=DP["default_block_index"],
                     ),
                     DP["default_block_index"],
                     False,
@@ -234,6 +254,8 @@
                     deserialize.deserialize_tx(
                         "0100000001ebe3111881a8733ace02271dcf606b7450c41a48c1cb21fd73f4ba787b353ce4000000001976a9148d6ae8a3b381663118b4e1eff4cfc7d0954dd6ec88acffffffff0636150000000000001976a9144838d8b3588c4c7ba7c1d06f866e9b3739c6303788ac36150000000000001976a9147da51ea175f108a1c63588683dc4c43a7146c46788ac36150000000000001976a9147da51ea175f108a1c6358868173e34e8ca75a06788ac36150000000000001976a9147da51ea175f108a1c637729895c4c468ca75a06788ac36150000000000001976a9147fa51ea175f108a1c63588682ed4c468ca7fa06788ace24ff505000000001976a9148d6ae8a3b381663118b4e1eff4cfc7d0954dd6ec88ac00000000",
                         use_txid=True,
+                        parse_vouts=False,
+                        block_index=DP["default_block_index"],
                     ),
                     DP["default_block_index"],
                     None,
@@ -254,6 +276,8 @@
                     deserialize.deserialize_tx(
                         "0100000001ebe3111881a8733ace02271dcf606b7450c41a48c1cb21fd73f4ba787b353ce4000000001976a9148d6ae8a3b381663118b4e1eff4cfc7d0954dd6ec88acffffffff0336150000000000001976a9144838d8b3588c4c7ba7c1d06f866e9b3739c6303788ac781e000000000000695121035ca51ea175f108a1c63588683dc4c43a7146c46799f864a300263c0813f5fe352102309a14a1a30202f2e76f46acdb2917752371ca42b97460f7928ade8ecb02ea17210319f6e07b0b8d756156394b9dcf3b011fe9ac19f2700bd6b69a6a1783dbb8b97753ae4286f505000000001976a9148d6ae8a3b381663118b4e1eff4cfc7d0954dd6ec88ac00000000",
                         use_txid=True,
+                        parse_vouts=False,
+                        block_index=DP["default_block_index"],
                     ),
                     DP["default_block_index"],
                     None,
@@ -274,6 +298,8 @@
                     deserialize.deserialize_tx(
                         "0100000001ebe3111881a8733ace02271dcf606b7450c41a48c1cb21fd73f4ba787b353ce4000000001976a9148d6ae8a3b381663118b4e1eff4cfc7d0954dd6ec88acffffffff03361500000000000017a9144264cfd7eb65f8cbbdba98bd9815d5461fad8d7e87781e000000000000695121035ca51ea175f108a1c63588683dc4c43a7146c46799f864a300263c0813f5fe352102309a14a1a30202f2e76f46acdb2917752371ca42b97460f7928ade8ecb02ea17210319f6e07b0b8d756156394b9dcf3b011fe9ac19f2700bd6b69a6a1783dbb8b97753ae4286f505000000001976a9148d6ae8a3b381663118b4e1eff4cfc7d0954dd6ec88ac00000000",
                         use_txid=True,
+                        parse_vouts=False,
+                        block_index=DP["default_block_index"],
                     ),
                     DP["default_block_index"],
                     None,
@@ -293,6 +319,8 @@
                     deserialize.deserialize_tx(
                         "0100000001aee668de98ef5f37d4962b620b0ec3deed8bbd4c2fb8ddedaf36c2e8ca5e51a7060000001976a914f3a6b6e4a093e5a5b9da76977a5270fd4d62553e88acffffffff04781e000000000000695121027c6a5e4412be80b5ccd5aa0ea685a21e7a577a5e390d138288841d06514b47992103b00007171817fb044e8a5464e3e274210dd64cf68cca9ea9c3e06df384aae6b22103d928d7d5bbe6f435da935ed382a0061c4a22bdc9b60a2ce6deb7d0f134d22eef53ae781e000000000000695121037c6a5e4412be80b5cc13bde2d9b04fd2cd1fc7ff664c0d3b6d8133163857b08f2103bb6fba40bee91bb02b54835b32f14b9e04016bfa34411ec64f09e3a9586efd5d2103d928d7d5bbe6f435da935ed382a0061c4a22bdc9b60a2ce6deb7d0f134d22eef53ae781e00000000000069512102696a5e4412be80b5ccd6aa0ac9a95e43ca49a21d40f762fadc1aab1c25909fb02102176c68252c6b855d7967aee372f14b772c963b2aa0411ec64f09e3a951eefd3e2103d928d7d5bbe6f435da935ed382a0061c4a22bdc9b60a2ce6deb7d0f134d22eef53aea8d37700000000001976a914f3a6b6e4a093e5a5b9da76977a5270fd4d62553e88ac00000000",
                         use_txid=True,
+                        parse_vouts=False,
+                        block_index=DP["default_block_index"],
                     ),
                     DP["default_block_index"],
                     None,
diff --git a/counterparty-core/counterpartycore/test/util_test.py b/counterparty-core/counterpartycore/test/util_test.py
index ab72fb2b4b..223b0083fc 100644
--- a/counterparty-core/counterpartycore/test/util_test.py
+++ b/counterparty-core/counterpartycore/test/util_test.py
@@ -207,7 +207,7 @@ def insert_raw_transaction(raw_transaction, db):
     tx = None
     tx_index = block_index - config.BURN_START + 1
     try:
-        deserialized_tx = deserialize.deserialize_tx(raw_transaction, True)
+        deserialized_tx = deserialize.deserialize_tx(raw_transaction, True, False, block_index)
         source, destination, btc_amount, fee, data, extra = gettxinfo._get_tx_info(
             db, deserialized_tx, block_index, composing=True
         )
@@ -257,7 +257,9 @@ def insert_unconfirmed_raw_transaction(raw_transaction, db):
     tx_index = tx_index[0]["tx_index"] if len(tx_index) else 0
     tx_index = tx_index + 1
 
-    deserialized_tx = deserialize.deserialize_tx(raw_transaction, True)
+    deserialized_tx = deserialize.deserialize_tx(
+        raw_transaction, True, False, config.MEMPOOL_BLOCK_INDEX
+    )
     source, destination, btc_amount, fee, data, extra = gettxinfo._get_tx_info(
         db, deserialized_tx, util.CURRENT_BLOCK_INDEX, composing=True
     )
@@ -367,7 +369,6 @@ def prefill_rawtransactions_db(db):
         wallet_unspent = json.load(listunspent_test_file)
         for output in wallet_unspent:
             txid = output["txid"]
-            tx = deserialize.deserialize_tx(output["txhex"], True)  # noqa: F841
             cursor.execute(
                 "INSERT INTO raw_transactions VALUES (?, ?, ?)",
                 (txid, output["txhex"], output["confirmations"]),
diff --git a/counterparty-rs/src/indexer/bitcoin_client.rs b/counterparty-rs/src/indexer/bitcoin_client.rs
index 77d5ef67c9..cba5681fdc 100644
--- a/counterparty-rs/src/indexer/bitcoin_client.rs
+++ b/counterparty-rs/src/indexer/bitcoin_client.rs
@@ -374,6 +374,7 @@ fn parse_vout(
     }
 }
 
+
 fn create_transaction(
     tx: &bitcoin::blockdata::transaction::Transaction,
     config: &Config,