Fix bug: transaction in mempool without witness

Author: giacomocaironi

btclib_node/interpreter.py

@@ -2,6 +2,7 @@
 from itertools import chain
 from pathlib import Path
 from typing import Tuple
+from copy import deepcopy
 
 from btclib.script.engine import verify_input, verify_transaction
 
@@ -12,6 +13,10 @@ def get_flags(config, index) -> Tuple[str]:
 
 def f(prevouts, tx, i, flags):
     try:
+        # no need to deepcopy the values as 
+        # they are not reused
+        # TODO: are we really sure this is safe?
+        # To check and fix upstream
         verify_input(prevouts, tx, i, flags)
     except Exception as e:
         err_dir = Path("errors", tx.id.hex(), str(i))
@@ -48,5 +53,8 @@ def check_transactions(transaction_data, index, node):
 
 
 def check_transaction(prevouts, tx, index, node):
+    # TODO: we need to deepcopy the transaction because
+    # verify_transaction modifies it. To fix upstream
+    tx = deepcopy(tx)
     flags = get_flags(node.config, index)
     verify_transaction(prevouts, tx, flags)

btclib_node/main.py

@@ -111,7 +111,7 @@ def update_chain(node):
                 node.mempool.add_tx(tx)
         for rev_block, block in zip(generated_rev_patches, to_add):
             for tx in block.transactions:
-                node.mempool.remove_tx(tx.id)
+                node.mempool.remove_tx(tx)
 
     node.logger.debug("Finished main\n")
 

btclib_node/mempool.py

@@ -34,17 +34,22 @@ def get_tx(self, txid, wtxid=False):
             txid = self.txid_index.get(txid)
         return self.transactions.get(txid)
 
+    # Don't need lock because handled in same thread
     def add_tx(self, tx):
-        if not self.is_full() and not tx.hash in self.transactions:
-            self.transactions[tx.hash] = tx
-            self.txid_index[tx.id] = tx.hash
+        if self.is_full():
+            return
+        wtxid, txid = tx.hash, tx.id
+        if txid not in self.txid_index:
+            self.transactions[wtxid] = tx
+            self.txid_index[tx.id] = wtxid
             self.size += 1
             self.bytesize += tx.vsize
 
-    def remove_tx(self, tx_id):
-        if tx_id in self.transactions:
-            tx = self.transactions.pop(tx_id)
-            self.txid_index.pop(tx.id)
+    def remove_tx(self, tx):
+        txid = tx.id
+        if txid in self.txid_index:
+            wtxid = self.txid_index.pop(tx.id)
+            tx = self.transactions.pop(wtxid)
             self.size -= 1
             self.bytesize -= tx.vsize
 

btclib_node/p2p/manager.py

@@ -127,3 +127,7 @@ def broadcast_raw_transaction(self, tx):
     def ping_all(self):
         for conn in self.connections.copy().values():
             conn.send_ping()
+
+    def stop_all(self):
+        for conn in self.connections.copy().values():
+            conn.stop()

btclib_node/rpc/callbacks.py

@@ -15,7 +15,6 @@ def get_block_hash(node, conn, params):
 
 
 def get_block_header(node, conn, params):
-
     block_index = node.chainstate.block_index
     header_index = block_index.header_index
 
@@ -81,6 +80,22 @@ def get_mempool_info(node, conn, _):
     return out
 
 
+def get_raw_mempool(node, conn, params):
+    verbose = params[0] if params else False
+    if verbose:
+        return {
+            tx.id.hex(): {
+                "size": tx.size,
+                "vsize": tx.vsize,
+                "weigth": tx.weight,
+                "wtxid": tx.hash.hex(),
+            }
+            for tx in node.mempool.transactions.values()
+        }
+    else:
+        return {"txids": [txid.hex() for txid in node.mempool.txid_index]}
+
+
 def test_mempool_accept(node, conn, params):
     rawtxs = params[0]
     out = []
@@ -138,6 +153,7 @@ def stop(node, conn, _):
     "getpeerinfo": get_peer_info,
     "getconnectioncount": get_connection_count,
     "getmempoolinfo": get_mempool_info,
+    "getrawmempool": get_raw_mempool,
     "testmempoolaccept": test_mempool_accept,
     "sendrawtransaction": send_raw_transaction,
     "ping": ping,

tests/unit/mempool.py

@@ -16,8 +16,9 @@ def test_workflow():
     assert mempool.size == 1
     assert mempool.bytesize == tx.vsize
     assert mempool.get_tx(tx.id) == tx
+    assert mempool.get_tx(tx.hash, wtxid=True) == tx
 
-    mempool.remove_tx(tx.id)
+    mempool.remove_tx(tx)
     assert mempool.size == 0
     assert mempool.bytesize == 0