bitcoinwatcher 1.0.1__py3-none-any.whl → 1.1.0__py3-none-any.whl

bitcoin/address_listener/address_listener.py

@@ -1,35 +1,13 @@
-import dataclasses
 import os
 from abc import ABC, abstractmethod
-from enum import Enum
 
 from bitcoinlib.transactions import Transaction
 from ordipool.ordipool.mempoolio import Mempool
 
+from bitcoin.models.address_tx_data import AddressTxData
 from bitcoin.tx_listener.abstract_tx_listener import AbstractTxListener
 from bitcoin.utils.constants import default_host
-
-
-class AddressTxType(Enum):
-    INPUT = "input"
-    OUTPUT = "output"
-
-
-@dataclasses.dataclass
-class AddressTxData:
-    tx_id: str
-    address: str
-    type: AddressTxType
-    # figure out the way to get amount in vin
-    _amount: int = 0
-
-    def get_amount(self):
-        return self._amount
-
-    def amount_in_btc(self):
-        if self.type == AddressTxType.INPUT:
-            return "Amount is not supported for input type, yet"
-        return self._amount / 100000000
+from bitcoin.utils.tx_address_data_extractor import DefaultTxAddressDataExtractor, MempoolTxAddressDataExtractor
 
 
 class AbstractAddressListener(AbstractTxListener, ABC):
@@ -37,6 +15,8 @@ class AbstractAddressListener(AbstractTxListener, ABC):
     host = os.environ.get("RPC_HOST", default_host)
     base_url = f"http://{host}:3006/api"
     mempool = Mempool(base_url=base_url)
+    default_tx_extractor = DefaultTxAddressDataExtractor()
+    mempool_tx_extractor = MempoolTxAddressDataExtractor(mempool)
 
     def __init__(self, addresses_to_listen: {str}):
         self.addresses_to_listen = addresses_to_listen
@@ -55,27 +35,17 @@ class AbstractAddressListener(AbstractTxListener, ABC):
         # get all address in the inputs and outputs along with the amount
         if tx.coinbase:
             return
-        outputs = tx.outputs
-        tx_id = tx.txid
-        tx = self.mempool.get_transaction(tx_id)
-        address_tx_data = []
-        # getting inputs data separately from mempool
-        # as current library doesn't provide rich data like previous outputs and its value
-        for input in tx.vins:
-            address = input.prev_out.address
-            amount = input.prev_out.value
-            address_tx_data.append(AddressTxData(address=address,
-                                                 type=AddressTxType.INPUT,
-                                                 _amount=amount,
-                                                 tx_id=tx_id))
-        for output in outputs:
-            amount = output.value
-            address_tx_data.append(AddressTxData(address=output.address,
-                                                 _amount=amount,
-                                                 type=AddressTxType.OUTPUT,
-                                                 tx_id=tx_id))
-
+        address_tx_data = self.default_tx_extractor.extract(tx)
         # filter the address we are interested in
         addresses_for_events = self.filter_address_tx_data(address_tx_data)
+        if len(addresses_for_events) == 0:
+            return
+        # get the address tx data from mempool for full details if any address matches
+        try:
+            address_tx_data = self.mempool_tx_extractor.extract(tx)
+        except Exception as e:
+            print(f"Error in getting mempool tx data, taking defaults: {e}")
+            address_tx_data = address_tx_data
+
         for address in addresses_for_events:
             self.consume(subscribed_address=address, address_tx_data=address_tx_data)

bitcoin/address_listener/simple_address_listener.py

@@ -1,4 +1,5 @@
-from bitcoin.address_listener.address_listener import AbstractAddressListener, AddressTxData, AddressTxType
+from bitcoin.address_listener.address_listener import AbstractAddressListener, AddressTxData
+from bitcoin.models.address_tx_data import AddressTxType
 from bitcoin.tx_listener.zmq_listener import ZMQTXListener
 
 
@@ -11,6 +12,7 @@ class SimpleAddressListener(AbstractAddressListener):
                                 address_tx_data))
         total_amount_in_input = sum(map(lambda x: x.amount_in_btc(), all_input))
         # scale ito 4 decimal places
+        print("Transaction status: ", address_tx_data[0].tx_status)
         total_amount_in_output = round(total_amount_in_output, self.DECIMAL_SCALE)
         print(f"Address {subscribed_address} received {total_amount_in_output} BTC in tx {address_tx_data[0].tx_id}")
         print(f"Address {subscribed_address} spent {total_amount_in_input} BTC in tx {address_tx_data[0].tx_id}")

bitcoin/models/address_tx_data.py

@@ -0,0 +1,36 @@
+import dataclasses
+from enum import Enum
+
+
+class AddressTxType(Enum):
+    INPUT = "input"
+    OUTPUT = "output"
+
+
+class AddressTxSource(Enum):
+    MEMPOOL = "mempool"
+    DEFAULT = "default"
+
+
+class TransactionStatus(Enum):
+    UNCONFIRMED = "unconfirmed"
+    CONFIRMED = "confirmed"
+
+
+@dataclasses.dataclass
+class AddressTxData:
+    tx_id: str
+    address: str
+    type: AddressTxType
+    # figure out the way to get amount in vin
+    _amount: int = 0
+    tx_status: str = "unconfirmed"
+
+
+    def get_amount(self):
+        return self._amount
+
+    def amount_in_btc(self):
+        if self.type == AddressTxType.INPUT:
+            return "Amount is not supported for input type, yet"
+        return self._amount / 100000000

bitcoin/tests/test_address_listener.py

@@ -1,10 +1,12 @@
 from unittest import TestCase
 
-from bitcoin.address_listener.address_listener import AbstractAddressListener, AddressTxData, AddressTxType
+from bitcoin.address_listener.address_listener import AbstractAddressListener, AddressTxData
+from bitcoin.models.address_tx_data import AddressTxType
 
 
 class DummyAddressListener(AbstractAddressListener):
-    def consume(self, address_tx_data):
+
+    def consume(self, subscribed_address, address_tx_data: [AddressTxData]):
         pass
 
     def __init__(self, address_to_listen: [str]):

bitcoin/utils/benchmark.py

@@ -0,0 +1,33 @@
+# benchmark between mempool and bitcoinrcp get transaction info
+import os
+import time
+import requests
+from ordipool.ordipool.mempoolio import Mempool
+
+from bitcoin.utils.bitcoin_rpc import BitcoinRPC
+from bitcoin.utils.constants import default_host
+
+host = os.environ.get("RPC_HOST", default_host)
+base_url = f"http://{host}:3006/api"
+
+mempool = Mempool(base_url)
+bitcoinrpc = BitcoinRPC()
+
+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()
+    for i in range(times):
+        bitcoinrpc.get_transaction(txid)
+    end = time.time()
+    print(f"bitcoinrpc took: {end - start}")
+

bitcoin/utils/bitcoin_rpc.py

@@ -0,0 +1,31 @@
+import os
+
+from bitcoinrpc.authproxy import AuthServiceProxy, JSONRPCException
+
+from bitcoin.utils.constants import default_host
+
+
+class BitcoinRPC:
+    rpc_user = os.environ.get("RPC_USER")
+    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:
+        return self.rpc_connection.getrawtransaction(txid, True)
+
+
+if __name__ == '__main__':
+    rpc = BitcoinRPC()
+    txid = 'a6293e898b056fbea0329d071b1b237e4449ff464cdbc7a9ed8a770b97aafd4c'
+    try:
+        transaction = rpc.get_transaction(txid)
+        print(transaction)
+    except JSONRPCException as e:
+        print(f"An error occurred: {e}")

bitcoin/utils/tx_address_data_extractor.py

@@ -0,0 +1,70 @@
+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
+
+
+class AbstractTxAddressDataExtractor(ABC):
+    @abstractmethod
+    def extract(self, tx: Transaction) -> [AddressTxData]:
+        pass
+
+
+class MempoolTxAddressDataExtractor(AbstractTxAddressDataExtractor):
+    mempool: Mempool
+
+    def __init__(self, mempool: Mempool):
+        self.mempool = mempool
+
+    def extract(self, tx: Transaction) -> [AddressTxData]:
+        outputs = tx.outputs
+        tx_id = tx.txid
+        tx = self.mempool.get_transaction(tx_id)
+        tx_status = TransactionStatus.CONFIRMED if tx.confirmed else TransactionStatus.UNCONFIRMED
+        address_tx_data = []
+        # getting inputs data separately from mempool
+        # as current library doesn't provide rich data like previous outputs and its value
+        for vin in tx.vins:
+            address = vin.prev_out.address
+            amount = vin.prev_out.value
+            address_tx_data.append(AddressTxData(tx_status=tx_status.value,
+                                                 address=address,
+                                                 type=AddressTxType.INPUT,
+                                                 _amount=amount,
+                                                 tx_id=tx_id))
+        for output in outputs:
+            amount = output.value
+            address_tx_data.append(AddressTxData(tx_status=tx_status.value,
+                                                 address=output.address,
+                                                 _amount=amount,
+                                                 type=AddressTxType.OUTPUT,
+                                                 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-1.0.1.dist-info → bitcoinwatcher-1.1.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: bitcoinwatcher
-Version: 1.0.1
+Version: 1.1.0
 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
@@ -227,6 +227,7 @@ Requires-Dist: six ==1.16.0
 Requires-Dist: urllib3 ==2.2.1
 Requires-Dist: bitcoinlib ==0.6.14
 Requires-Dist: ordipool ==1.2.0
+Requires-Dist: python-bitcoinrpc ==1.0
 
 # bitcoinwatcher
 

bitcoinwatcher-1.1.0.dist-info/RECORD

@@ -0,0 +1,23 @@
+bitcoin/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+bitcoin/address_listener/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+bitcoin/address_listener/address_listener.py,sha256=sK0hrhPrYg8z6AC8MqNbF3UoaqvbhdhVcoyMLj8x4MQ,2223
+bitcoin/address_listener/simple_address_listener.py,sha256=iSMPBUzl9d4s8_ee2LAXz83zBiGfs1KhwSH_7FvxwKY,1609
+bitcoin/models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+bitcoin/models/address_tx_data.py,sha256=sxMfn2ujrYZ0XI8Cnd99e6Fo849932Rme6qd1zaC4Ys,724
+bitcoin/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+bitcoin/tests/test_address_listener.py,sha256=oqVfJ_lQNHgRxCnDteUpkaUyHff5Wa8J2oYJnwQ-QaE,3113
+bitcoin/tx_listener/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+bitcoin/tx_listener/abstract_tx_listener.py,sha256=rGp9na-aOSl_aPaIqf44RTZaFF3SvrxIhZBujTnWqao,189
+bitcoin/tx_listener/zmq_listener.py,sha256=_edaee2PYj9T1jxLenv68ekZRTM8-LUN3DloDLNQ5Bc,999
+bitcoin/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+bitcoin/utils/benchmark.py,sha256=ZCfhIe4_meUNpQ7NEioZj3_uudCisg7J8d_LTMoRFto,875
+bitcoin/utils/bitcoin_rpc.py,sha256=Uq3eZnLaGOgltybEWeBRubnUhTHyB8gVI_L_SnrZ-ug,1012
+bitcoin/utils/bitcoin_utils.py,sha256=ehzfwiuln_lPia6urtUSVE3zXC1zyZEKiNM36e7N00k,428
+bitcoin/utils/constants.py,sha256=irZLlArgica2VckyckEYxH5D5KjvdF52dtBMWswqw8k,52
+bitcoin/utils/inscription_utils.py,sha256=8QbOJ1o1n1bMFsPREGLzwFjnGzfuARgJCPr6ORhP44o,193
+bitcoin/utils/tx_address_data_extractor.py,sha256=UTb1FG7FgO7YFCaZ2uA_3AVvyvYzd_Zs7odmiDQIGVs,3041
+bitcoinwatcher-1.1.0.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+bitcoinwatcher-1.1.0.dist-info/METADATA,sha256=sQ6P1aVI0i1UnxYqAfQkxJItL4JJeOHPkOZol0pu2D8,14940
+bitcoinwatcher-1.1.0.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+bitcoinwatcher-1.1.0.dist-info/top_level.txt,sha256=YdUgzLdCiMlrwaKyDqHA1acEd23QFko5bv7D6nBANJ0,8
+bitcoinwatcher-1.1.0.dist-info/RECORD,,

bitcoinwatcher-1.0.1.dist-info/RECORD

@@ -1,18 +0,0 @@
-bitcoin/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-bitcoin/address_listener/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-bitcoin/address_listener/address_listener.py,sha256=WKDG8gtB9_2K-v0nYhkKDkaqxPz2uE2uVtwWRNzg7H8,3000
-bitcoin/address_listener/simple_address_listener.py,sha256=2qR012t3rHTNHkit6TvkYP9Co4IVySKG8YyzmxKc0cU,1499
-bitcoin/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-bitcoin/tests/test_address_listener.py,sha256=_8ic7ldHaeICfYTepAkqcWFzZPhEKzbIkAfrAZ1ZdCs,3033
-bitcoin/tx_listener/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-bitcoin/tx_listener/abstract_tx_listener.py,sha256=rGp9na-aOSl_aPaIqf44RTZaFF3SvrxIhZBujTnWqao,189
-bitcoin/tx_listener/zmq_listener.py,sha256=_edaee2PYj9T1jxLenv68ekZRTM8-LUN3DloDLNQ5Bc,999
-bitcoin/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-bitcoin/utils/bitcoin_utils.py,sha256=ehzfwiuln_lPia6urtUSVE3zXC1zyZEKiNM36e7N00k,428
-bitcoin/utils/constants.py,sha256=irZLlArgica2VckyckEYxH5D5KjvdF52dtBMWswqw8k,52
-bitcoin/utils/inscription_utils.py,sha256=8QbOJ1o1n1bMFsPREGLzwFjnGzfuARgJCPr6ORhP44o,193
-bitcoinwatcher-1.0.1.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-bitcoinwatcher-1.0.1.dist-info/METADATA,sha256=qpqrssZZ60vtfPxx3vziTyZ5krWFVQz1Y86PYs8JmH4,14901
-bitcoinwatcher-1.0.1.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-bitcoinwatcher-1.0.1.dist-info/top_level.txt,sha256=YdUgzLdCiMlrwaKyDqHA1acEd23QFko5bv7D6nBANJ0,8
-bitcoinwatcher-1.0.1.dist-info/RECORD,,