bitcoinwatcher 2.1__tar.gz → 2.2__tar.gz

{bitcoinwatcher-2.1 → bitcoinwatcher-2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: bitcoinwatcher
-Version: 2.1
+Version: 2.2
 Summary: bitcoinwatcher is a Python library that implements a ZMQ subscriber and provides abstractions to build custom address watchers. This library is designed to make it easy for developers to monitor Bitcoin addresses and react to changes in their state.
 Author: twosatsmaxi
 License:                                  Apache License

{bitcoinwatcher-2.1 → bitcoinwatcher-2.2}/bitcoin/address_listener/address_listener.py

@@ -5,9 +5,11 @@ from bitcoinlib.transactions import Transaction
 from ordipool.ordipool.mempoolio import Mempool
 
 from bitcoin.models.address_tx_data import AddressTxData
+from bitcoin.tx_extractors.bitcoin_rpc import BitcoinRPCAddressDataExtractor
+from bitcoin.tx_extractors.default import DefaultTxAddressDataExtractor
+from bitcoin.tx_extractors.mempool import MempoolTxAddressDataExtractor
 from bitcoin.tx_listener.abstract_tx_listener import AbstractTxListener
 from bitcoin.utils.constants import default_host
-from bitcoin.utils.tx_address_data_extractor import DefaultTxAddressDataExtractor, MempoolTxAddressDataExtractor
 
 
 class AbstractAddressListener(AbstractTxListener, ABC):
@@ -16,7 +18,7 @@ class AbstractAddressListener(AbstractTxListener, ABC):
     base_url = f"http://{host}:3006/api"
     mempool = Mempool(base_url=base_url)
     default_tx_extractor = DefaultTxAddressDataExtractor()
-    mempool_tx_extractor = MempoolTxAddressDataExtractor(mempool)
+    mempool_tx_extractor = BitcoinRPCAddressDataExtractor()
 
     def __init__(self, addresses_to_listen: {str}):
         self.addresses_to_listen = addresses_to_listen

bitcoinwatcher-2.2/bitcoin/tests/test_bitcoin_rpc.py

@@ -0,0 +1,33 @@
+from unittest import TestCase, skip
+
+from bitcoinlib.transactions import Transaction
+
+from bitcoin.tx_extractors.bitcoin_rpc import BitcoinRPCAddressDataExtractor
+
+
+class TestBitcoinRPCAddressDataExtractor(TestCase):
+    @skip("This test is being ignored.")
+    def test_extract(self):
+        hex = "02000000000101f2a69b3ac92464aa2783b27b4e680339aaf568a2f2dfb57b35514ead52a68c200000000000fdffffff0188a6a30000000000160014e19cffc3dac9b6db7dbcbfb33b0dbdbe3bb1282b02473044022079d28834e1b49fe68d49abc61ed9e42cb3975e90e20224c9b81eba7836c9d1d302205e42205de0380a16aae83a9d73f8950e7cbbc051d345d1a2d281680831b2a0aa0121025165993582dc7d93ac11fd5bb3eabd721acdddf94c94f58008f157c3b7bbaa6400000000"
+        tx = Transaction.parse_hex(hex, strict=False)
+        tx_id = tx.txid
+        print(tx_id)
+        for intput in tx.inputs:
+            prev_tx = intput.prev_txid;
+            prev_tx_id_hex = prev_tx.hex();
+            print(prev_tx_id_hex);
+            print(intput.output_n_int);
+        bitcoin_rpc_address_data_extractor = BitcoinRPCAddressDataExtractor()
+        address_tx_data = bitcoin_rpc_address_data_extractor.extract(tx)
+        self.assertEqual(len(address_tx_data), 2)
+
+    @skip("This test is being ignored.")
+    def test_extract_marketplace_tx(self):
+        hex = "0200000000010615f726f9506e458b6a9a3871bbbc7162ce7a360ee2adb0b4e153cdd4792329eb0f000000171600140d2d83b034e88a7d69bfff06a23745ed402d8ec2ffffffff943175fe63f613886b4cae9dc62e781da91bb00c29b327a38e152c84f261502705000000171600140d2d83b034e88a7d69bfff06a23745ed402d8ec2ffffffff15f726f9506e458b6a9a3871bbbc7162ce7a360ee2adb0b4e153cdd4792329eb10000000171600140d2d83b034e88a7d69bfff06a23745ed402d8ec2ffffffff837fe5d79eed2be634092c72f6602ecc9e57699f1d66eb33375b0152284efee90100000000ffffffff094a2725d5e5857aaf7f210b58fa35bea92a4070d007c880c1ae79bde4e713780600000000ffffffff0123fddb864eab59349587b02ae169eeb5b46fe3025f1e564268616527b0578708000000171600140d2d83b034e88a7d69bfff06a23745ed402d8ec2ffffffff0a080700000000000017a9141e281d4ef25d46790dc2d8cd5954a1cb568dd5cb872202000000000000225120f182ae8cd3e98896ddc19585dff7356c888a8b71f6b5a15f68a57f54c85448ab2202000000000000225120f182ae8cd3e98896ddc19585dff7356c888a8b71f6b5a15f68a57f54c85448ab1239010000000000225120b2a8278e2bac9a1318ce327a4b5c302e2b6a6b306c15dafdebc5a9e8cd82da8212390100000000002251205176221bf37b5c1ae2ba8a907af749e710a87633849f2b9f3234e6862f3021f4a00f000000000000160014c015c65276d5f38d599d445c4cb03aa7aa0dc365580200000000000017a9141e281d4ef25d46790dc2d8cd5954a1cb568dd5cb87580200000000000017a9141e281d4ef25d46790dc2d8cd5954a1cb568dd5cb87580200000000000017a9141e281d4ef25d46790dc2d8cd5954a1cb568dd5cb878d6700000000000017a9141e281d4ef25d46790dc2d8cd5954a1cb568dd5cb8702483045022100ad8ee8d9431bbdca0e21af30fa6d9a29f162e868ea4411cc10c18b99a7959d12022014d49a39f19e35800b1bbfaa6e825789b1fab16bafbee6655f273bd88c07a21f0121028492755e1e8131ddb226c8957f11d64bd18c77d91297ade0ec11f7a74a22b88d0247304402202388e40a1d6a588d2679efc433ec696dc956aa723902f72105f60c25c6300f850220505e6b55920a9125da4af76d3c13fac91572d5da1c24c0cefe10e7fa8d46166c0121028492755e1e8131ddb226c8957f11d64bd18c77d91297ade0ec11f7a74a22b88d02483045022100fb1b18e09ceccfc1d1164d7c82be56574cf8f0af1ea2d2eda4288ece65c13aaa022020de635ae416db1ae98ad7c9ae5c794472666d3ea3b7c26c97244de1a48359120121028492755e1e8131ddb226c8957f11d64bd18c77d91297ade0ec11f7a74a22b88d014196c68e1dc21ce99a86a3652050dc0253ed12835998c57ef76bb611bf5e466f29075b66efbc304e357167d1c2931b46a05d99fd41752b775386d668ddd530cafd830141547edc099b1e1fb79fe343193864ab43694d89468421b4a69e595f3346faaa3e2c5d1c0a5c39754cc43ddb9b7eee7b59b4ffb06c584abe67947980117a35a2328302483045022100d8b5cf136dfaf3b58a6300da6f682b6623b997cc848179a272fec8c3de57efc502203defeb5d711112938a98a25238399fe3bd704a1d6b4c84846a5b5e7a9bd1fdee0121028492755e1e8131ddb226c8957f11d64bd18c77d91297ade0ec11f7a74a22b88d00000000"
+        tx = Transaction.parse_hex(hex, strict=False)
+        tx_id = tx.txid;
+        print(tx_id);
+        bitcoinrpc_address_data_extractor = BitcoinRPCAddressDataExtractor()
+        address_tx_data = bitcoinrpc_address_data_extractor.extract(tx)
+        self.assertEqual(len(address_tx_data), 16)
+

bitcoinwatcher-2.2/bitcoin/tx_extractors/abstract_extractor.py

@@ -0,0 +1,11 @@
+from abc import ABC, abstractmethod
+
+from bitcoinlib.transactions import Transaction
+
+from bitcoin.address_listener.address_listener import AddressTxData
+
+
+class AbstractTxAddressDataExtractor(ABC):
+    @abstractmethod
+    def extract(self, tx: Transaction) -> [AddressTxData]:
+        pass

bitcoinwatcher-2.2/bitcoin/tx_extractors/bitcoin_rpc.py

@@ -0,0 +1,62 @@
+import os
+from multiprocessing.pool import ThreadPool
+
+from bitcoinlib.transactions import Transaction
+
+from bitcoin.address_listener.address_listener import AddressTxData
+from bitcoin.models.address_tx_data import AddressTxType
+from bitcoin.utils.bitcoin_rpc import BitcoinRPC
+from bitcoin.tx_extractors.abstract_extractor import AbstractTxAddressDataExtractor
+
+
+class BitcoinRPCAddressDataExtractor(AbstractTxAddressDataExtractor):
+    bitcoinrpc: BitcoinRPC
+    thread_pool = ThreadPool(processes=os.environ.get("THREAD_POOL_SIZE", 5))
+
+    def __init__(self):
+        self.bitcoinrpc = BitcoinRPC()
+
+    def fetch_all_inputs(self, inputs):
+        rpc_calls = [["getrawtransaction", input.prev_txid.hex(), True] for input in inputs]
+        data = self.bitcoinrpc.rpc_connection.batch_(rpc_calls)
+        list_of_vouts = []
+        for input in inputs:
+            vout = data.pop(0)["vout"][input.output_n_int]
+            list_of_vouts.append(vout)
+        return list_of_vouts
+
+    def get_address_tx_from_inputdata(self, tx_id, tx_status, input_data):
+        address = input_data["scriptPubKey"]["address"]
+        amount = int(input_data.get("value", 0).real * 100000000)
+        return AddressTxData(tx_id=tx_id, tx_status=tx_status, address=address, _amount=amount,
+                             type=AddressTxType.INPUT)
+
+    def extract(self, tx: Transaction) -> [AddressTxData]:
+        outputs = tx.outputs
+        tx_id = tx.txid
+        address_tx_data = []
+        inputs = tx.inputs
+        # bulk get all the inputs from BitcoinRPC using thread pool
+        inputs_data = self.fetch_all_inputs(inputs)
+        tx_status = tx.status
+        for input in inputs:
+            address = input.address
+            amount = 0
+            if len(inputs_data) > 0:
+                input_data = inputs_data.pop(0)
+                input_tx_data = self.get_address_tx_from_inputdata(tx_id, tx_status, input_data)
+                address_tx_data.append(input_tx_data)
+            else:
+                address_tx_data.append(AddressTxData(tx_status=tx_status,
+                                                     address=address,
+                                                     type=AddressTxType.INPUT,
+                                                     _amount=amount,
+                                                     tx_id=tx.txid))
+        for output in outputs:
+            amount = output.value
+            address_tx_data.append(AddressTxData(tx_status=tx_status,
+                                                 address=output.address,
+                                                 _amount=amount,
+                                                 type=AddressTxType.OUTPUT,
+                                                 tx_id=tx.txid))
+        return address_tx_data

bitcoinwatcher-2.2/bitcoin/tx_extractors/default.py

@@ -0,0 +1,29 @@
+from bitcoinlib.transactions import Transaction
+
+from bitcoin.address_listener.address_listener import AddressTxData
+from bitcoin.models.address_tx_data import AddressTxType
+from bitcoin.tx_extractors.abstract_extractor import AbstractTxAddressDataExtractor
+
+
+class DefaultTxAddressDataExtractor(AbstractTxAddressDataExtractor):
+    def extract(self, tx: Transaction) -> [AddressTxData]:
+        outputs = tx.outputs
+        address_tx_data = []
+        inputs = tx.inputs
+        tx_status = tx.status
+        for input in inputs:
+            address = input.address
+            amount = 0
+            address_tx_data.append(AddressTxData(tx_status=tx_status,
+                                                 address=address,
+                                                 type=AddressTxType.INPUT,
+                                                 _amount=amount,
+                                                 tx_id=tx.txid))
+        for output in outputs:
+            amount = output.value
+            address_tx_data.append(AddressTxData(tx_status=tx_status,
+                                                 address=output.address,
+                                                 _amount=amount,
+                                                 type=AddressTxType.OUTPUT,
+                                                 tx_id=tx.txid))
+        return address_tx_data

bitcoinwatcher-2.1/bitcoin/utils/tx_address_data_extractor.py → bitcoinwatcher-2.2/bitcoin/tx_extractors/mempool.py

@@ -1,18 +1,10 @@
-from abc import ABC, abstractmethod
-
-
 from bitcoinlib.transactions import Transaction
 from ordipool.ordipool.mempoolio import Mempool
 
 from bitcoin.address_listener.address_listener import AddressTxData
 from bitcoin.models.address_tx_data import AddressTxType, TransactionStatus
-from bitcoin.utils.bitcoin_utils import is_reveal_tx, count_reveal_inputs
-
-
-class AbstractTxAddressDataExtractor(ABC):
-    @abstractmethod
-    def extract(self, tx: Transaction) -> [AddressTxData]:
-        pass
+from bitcoin.utils.bitcoin_utils import is_reveal_tx
+from bitcoin.tx_extractors.abstract_extractor import AbstractTxAddressDataExtractor
 
 
 class MempoolTxAddressDataExtractor(AbstractTxAddressDataExtractor):
@@ -50,27 +42,3 @@ class MempoolTxAddressDataExtractor(AbstractTxAddressDataExtractor):
                                                  tx_id=tx_id))
 
         return address_tx_data
-
-
-class DefaultTxAddressDataExtractor(AbstractTxAddressDataExtractor):
-    def extract(self, tx: Transaction) -> [AddressTxData]:
-        outputs = tx.outputs
-        address_tx_data = []
-        inputs = tx.inputs
-        tx_status = tx.status
-        for input in inputs:
-            address = input.address
-            amount = 0
-            address_tx_data.append(AddressTxData(tx_status=tx_status,
-                                                 address=address,
-                                                 type=AddressTxType.INPUT,
-                                                 _amount=amount,
-                                                 tx_id=tx.txid))
-        for output in outputs:
-            amount = output.value
-            address_tx_data.append(AddressTxData(tx_status=tx_status,
-                                                 address=output.address,
-                                                 _amount=amount,
-                                                 type=AddressTxType.OUTPUT,
-                                                 tx_id=tx.txid))
-        return address_tx_data

{bitcoinwatcher-2.1 → bitcoinwatcher-2.2}/bitcoin/utils/benchmark.py

@@ -17,17 +17,17 @@ if __name__ == '__main__':
 
     txid = 'a6293e898b056fbea0329d071b1b237e4449ff464cdbc7a9ed8a770b97aafd4c'
     times = 1000
-    start = time.time()
-    print("mempool starting")
-    for i in range(times):
-        print(i)
-        mempool.get_transaction(txid)
-    end = time.time()
-    print(f"mempool took: {end - start}")
+    # start = time.time()
+    # print("mempool starting")
+    # for i in range(times):
+    #     print(i)
+    #     mempool.get_transaction(txid)
+    # end = time.time()
+    # print(f"mempool took: {end - start}")
 
     start = time.time()
     for i in range(times):
-        bitcoinrpc.get_transaction(txid)
+        tx = bitcoinrpc.get_transaction(txid)
     end = time.time()
     print(f"bitcoinrpc took: {end - start}")
 

{bitcoinwatcher-2.1 → bitcoinwatcher-2.2}/bitcoin/utils/bitcoin_rpc.py

@@ -10,11 +10,9 @@ class BitcoinRPC:
     rpc_password = os.environ.get("RPC_PASSWORD")
     rpc_host = os.environ.get("RPC_HOST", default_host)
     rpc_port = os.environ.get("RPC_PORT", 8332)
-    rpc_connection: AuthServiceProxy
 
     def __init__(self):
         rpc_string = f"http://{self.rpc_user}:{self.rpc_password}@{self.rpc_host}:{self.rpc_port}"
-        print("rpc_string: ", rpc_string)
         self.rpc_connection = AuthServiceProxy(rpc_string)
 
     def get_transaction(self, txid: str) -> dict:
@@ -23,9 +21,9 @@ class BitcoinRPC:
 
 if __name__ == '__main__':
     rpc = BitcoinRPC()
-    txid = 'a6293e898b056fbea0329d071b1b237e4449ff464cdbc7a9ed8a770b97aafd4c'
+    txid = '8dc035d6816cf61074d12148777b28d28aa2f76b0f45ceafd310a85b1518aab8'
     try:
         transaction = rpc.get_transaction(txid)
         print(transaction)
     except JSONRPCException as e:
-        print(f"An error occurred: {e}")
+        print(f"An error occurred: {e}")

{bitcoinwatcher-2.1 → bitcoinwatcher-2.2}/bitcoinwatcher.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: bitcoinwatcher
-Version: 2.1
+Version: 2.2
 Summary: bitcoinwatcher is a Python library that implements a ZMQ subscriber and provides abstractions to build custom address watchers. This library is designed to make it easy for developers to monitor Bitcoin addresses and react to changes in their state.
 Author: twosatsmaxi
 License:                                  Apache License

{bitcoinwatcher-2.1 → bitcoinwatcher-2.2}/bitcoinwatcher.egg-info/SOURCES.txt

@@ -9,9 +9,15 @@ bitcoin/models/__init__.py
 bitcoin/models/address_tx_data.py
 bitcoin/tests/__init__.py
 bitcoin/tests/test_address_listener.py
+bitcoin/tests/test_bitcoin_rpc.py
 bitcoin/tests/test_bitcoin_utils.py
 bitcoin/tests/data/__init__.py
 bitcoin/tests/data/transactions.py
+bitcoin/tx_extractors/__init__.py
+bitcoin/tx_extractors/abstract_extractor.py
+bitcoin/tx_extractors/bitcoin_rpc.py
+bitcoin/tx_extractors/default.py
+bitcoin/tx_extractors/mempool.py
 bitcoin/tx_listener/__init__.py
 bitcoin/tx_listener/abstract_tx_listener.py
 bitcoin/tx_listener/zmq_listener.py
@@ -21,7 +27,6 @@ bitcoin/utils/bitcoin_rpc.py
 bitcoin/utils/bitcoin_utils.py
 bitcoin/utils/constants.py
 bitcoin/utils/inscription_utils.py
-bitcoin/utils/tx_address_data_extractor.py
 bitcoinwatcher.egg-info/PKG-INFO
 bitcoinwatcher.egg-info/SOURCES.txt
 bitcoinwatcher.egg-info/dependency_links.txt

{bitcoinwatcher-2.1 → bitcoinwatcher-2.2}/pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "bitcoinwatcher"
-version = "2.1"
+version = "2.2"
 description = "bitcoinwatcher is a Python library that implements a ZMQ subscriber and provides abstractions to build custom address watchers. This library is designed to make it easy for developers to monitor Bitcoin addresses and react to changes in their state."
 readme = "README.md"
 authors = [{name = "twosatsmaxi"}]