bitcoinwatcher 2.4__py3-none-any.whl → 2.6__py3-none-any.whl

bitcoin/address_listener/address_listener.py

@@ -7,9 +7,9 @@ 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.context_aware_logging import logger
 
 
 class AbstractAddressListener(AbstractTxListener, ABC):
@@ -18,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 = BitcoinRPCAddressDataExtractor()
+    rpc_tx_extractor = BitcoinRPCAddressDataExtractor()
 
     def __init__(self, addresses_to_listen: {str}):
         self.addresses_to_listen = addresses_to_listen
@@ -44,9 +44,10 @@ class AbstractAddressListener(AbstractTxListener, ABC):
             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)
+            logger.info(f"Extracting rpc tx data")
+            address_tx_data = self.rpc_tx_extractor.extract(tx)
         except Exception as e:
-            print(f"Error in getting mempool tx data, taking defaults: {e}")
+            logger.error(f"Error in getting rpc tx data, taking defaults",e, exc_info=True)
             address_tx_data = address_tx_data
 
         for address in addresses_for_events:

bitcoin/models/address_tx_data.py

@@ -24,7 +24,7 @@ class AddressTxData:
     type: AddressTxType
     # figure out the way to get amount in vin
     _amount: int = 0
-    tx_status: str = "unconfirmed"
+    is_confirmed: bool = False
     is_reveal_tx: bool = False
 
     def get_amount(self):

bitcoin/tx_extractors/bitcoin_rpc.py

@@ -7,6 +7,7 @@ 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
+from bitcoin.utils.context_aware_logging import logger
 
 
 class BitcoinRPCAddressDataExtractor(AbstractTxAddressDataExtractor):
@@ -28,7 +29,7 @@ class BitcoinRPCAddressDataExtractor(AbstractTxAddressDataExtractor):
     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,
+        return AddressTxData(tx_id=tx_id, is_confirmed=tx_status, address=address, _amount=amount,
                              type=AddressTxType.INPUT)
 
     def extract(self, tx: Transaction) -> [AddressTxData]:
@@ -38,23 +39,24 @@ class BitcoinRPCAddressDataExtractor(AbstractTxAddressDataExtractor):
         inputs = tx.inputs
         # bulk get all the inputs from BitcoinRPC using thread pool
         inputs_data = self.fetch_all_inputs(inputs)
-        tx_status = tx.status
+        is_confirmed = self.bitcoinrpc.is_confirmed(tx_id)
+        logger.info("Transaction is_confirmed: ", is_confirmed)
         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)
+                input_tx_data = self.get_address_tx_from_inputdata(tx_id, is_confirmed, input_data)
                 address_tx_data.append(input_tx_data)
             else:
-                address_tx_data.append(AddressTxData(tx_status=tx_status,
+                address_tx_data.append(AddressTxData(is_confirmed=is_confirmed,
                                                      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_tx_data.append(AddressTxData(is_confirmed=is_confirmed,
                                                  address=output.address,
                                                  _amount=amount,
                                                  type=AddressTxType.OUTPUT,

bitcoin/tx_extractors/default.py

@@ -10,18 +10,18 @@ class DefaultTxAddressDataExtractor(AbstractTxAddressDataExtractor):
         outputs = tx.outputs
         address_tx_data = []
         inputs = tx.inputs
-        tx_status = tx.status
+        is_confirmed = tx.status == "confirmed"
         for input in inputs:
             address = input.address
             amount = 0
-            address_tx_data.append(AddressTxData(tx_status=tx_status,
+            address_tx_data.append(AddressTxData(is_confirmed=is_confirmed,
                                                  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_tx_data.append(AddressTxData(is_confirmed=is_confirmed,
                                                  address=output.address,
                                                  _amount=amount,
                                                  type=AddressTxType.OUTPUT,

bitcoin/tx_listener/zmq_listener.py

@@ -5,6 +5,7 @@ from bitcoinlib.transactions import Transaction
 
 from bitcoin.tx_listener.abstract_tx_listener import AbstractTxListener
 from bitcoin.utils.constants import default_host, default_port
+from bitcoin.utils.context_aware_logging import ctx_tx, logger
 
 
 class ZMQTXListener:
@@ -20,12 +21,13 @@ class ZMQTXListener:
 
     def start(self):
         connections = self.socket.connect(self.zmq_url)
-        print(f"Connected to {connections}")
+        logger.info(f"Connected to {connections}")
         self.socket.setsockopt_string(zmq.SUBSCRIBE, "rawtx")
         while True:
             topic, body, seq = self.socket.recv_multipart()
             try:
                 tx = Transaction.parse(body, strict=False)
+                ctx_tx.set(tx.txid)
                 self.tx_listener.on_tx(tx)
             except Exception as e:
                 print(f"Error in parsing tx: {e}")

bitcoin/utils/benchmark.py

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

bitcoin/utils/bitcoin_rpc.py

@@ -3,6 +3,7 @@ import os
 from bitcoinrpc.authproxy import AuthServiceProxy, JSONRPCException
 
 from bitcoin.utils.constants import default_host
+from bitcoin.utils.context_aware_logging import ctx_tx, ctx_tx_status, logger, get_logger
 
 
 class BitcoinRPC:
@@ -18,12 +19,21 @@ class BitcoinRPC:
     def get_transaction(self, txid: str) -> dict:
         return self.rpc_connection.getrawtransaction(txid, True)
 
+    def is_confirmed(self, txid: str) -> bool:
+        try:
+            self.rpc_connection.getmempoolentry(txid)
+            return False
+        except JSONRPCException as e:
+            return True
+
 
 if __name__ == '__main__':
+    logger = get_logger(__name__)
     rpc = BitcoinRPC()
-    txid = '8dc035d6816cf61074d12148777b28d28aa2f76b0f45ceafd310a85b1518aab8'
+    txid = '686d025f16d9f20353665a9d865e575e3e4d14214f6f7045149a17dd6bf0fac6'
     try:
-        transaction = rpc.get_transaction(txid)
-        print(transaction)
+        ctx_tx.set('686d025f16d9f20353665a9d865e575e3e4d14214f6f7045149a17dd6bf0fac6')
+        ctx_tx_status.set('confirmed')
+        logger.info("Transaction is confirmed")
     except JSONRPCException as e:
-        print(f"An error occurred: {e}")
+        print(f"An error occurred: {e}")

bitcoin/utils/context_aware_logging.py

@@ -0,0 +1,54 @@
+import logging
+from contextvars import ContextVar
+from datetime import datetime
+
+import pytz
+
+logger = logging.getLogger(__name__)
+root = logging.getLogger()
+root.setLevel(logging.INFO)
+
+class TimezoneFormatter(logging.Formatter):
+    def __init__(self, fmt=None, datefmt=None, tz=None):
+        super().__init__(fmt, datefmt)
+        self.tz = tz
+
+    def formatTime(self, record, datefmt=None):
+        dt = datetime.fromtimestamp(record.created, self.tz)
+        if datefmt:
+            s = dt.strftime(datefmt)
+        else:
+            s = dt.isoformat()
+        return s
+
+
+formatter = TimezoneFormatter(
+    ' %(asctime)s %(name)s txid=%(tx_id)s [%(module)s:%(lineno)d] %(message)s',
+    datefmt='%Y-%m-%d %H:%M:%S',
+    tz=pytz.timezone('Asia/Kolkata')
+)
+
+
+ctx_tx = ContextVar('tx_id', default='')
+ctx_tx_status = ContextVar('tx_status', default='')
+
+class TXContextFilter(logging.Filter):
+
+    def __init__(self):
+        super().__init__()
+
+    def filter(self, record):
+        tx_id = ctx_tx.get()
+        record.tx_id = tx_id
+        tx_status = ctx_tx_status.get()
+        record.tx_status = tx_status
+        return True
+
+ch = logging.StreamHandler()
+f = TXContextFilter()
+ch.setFormatter(formatter)
+ch.addFilter(f)
+root.addHandler(ch)
+
+def get_logger(name):
+    return logging.getLogger(name)

{bitcoinwatcher-2.4.dist-info → bitcoinwatcher-2.6.dist-info}/METADATA

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: bitcoinwatcher
-Version: 2.4
+Version: 2.6
 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
+License:                                  Apache License
                                    Version 2.0, January 2004
                                 http://www.apache.org/licenses/
         
@@ -217,17 +217,18 @@ Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: requests ~=2.31.0
-Requires-Dist: certifi ==2024.2.2
-Requires-Dist: charset-normalizer ==3.3.2
-Requires-Dist: idna ==3.7
-Requires-Dist: pyzmq ==25.1.2
-Requires-Dist: requests ==2.31.0
-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
+Requires-Dist: requests~=2.31.0
+Requires-Dist: certifi==2024.2.2
+Requires-Dist: charset-normalizer==3.3.2
+Requires-Dist: idna==3.7
+Requires-Dist: pyzmq==25.1.2
+Requires-Dist: requests==2.31.0
+Requires-Dist: urllib3==2.2.1
+Requires-Dist: bitcoinlib==0.7.0
+Requires-Dist: ordipool==1.2.0
+Requires-Dist: pyzmq==25.1.2
+Requires-Dist: python-bitcoinrpc==1.0
+Requires-Dist: pytz~=2024.2
 
 # bitcoinwatcher
 

{bitcoinwatcher-2.4.dist-info → bitcoinwatcher-2.6.dist-info}/RECORD

@@ -1,9 +1,9 @@
 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=32gDEYpYTv53nD0TKLYyrIzHpImYBzzT3XdCoGUD1fI,2354
+bitcoin/address_listener/address_listener.py,sha256=TkSB51U0WTfdbBnFFMXi5EK673USjvdQoytx2vWKKMk,2395
 bitcoin/address_listener/simple_address_listener.py,sha256=WG8eTrd3AdkrIs1TAGRsXe_erAtE_Ep8hidZDksGk8g,1625
 bitcoin/models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-bitcoin/models/address_tx_data.py,sha256=0zIleuEHern42zk1Pp7IteR5jQqVdAM1l4Gvy6YzGe0,754
+bitcoin/models/address_tx_data.py,sha256=KSSCzAjYxLEgXIELVSsnSEhgY65xi0K3HUjoamVV_LQ,750
 bitcoin/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 bitcoin/tests/test_address_listener.py,sha256=USK3BMGnRsTBmCXcbnC9WkX6kF-W_sHt7RKARv39IDg,3125
 bitcoin/tests/test_bitcoin_rpc.py,sha256=Xt9Mh71YQqE_gskgLMfPLs0J0YcCT7z5UimT42LOris,4137
@@ -12,20 +12,21 @@ bitcoin/tests/data/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuF
 bitcoin/tests/data/transactions.py,sha256=qIX9seGYguQ1lvLOCF8oe3NQhMJZP0SsBmz1iFbszhg,396279
 bitcoin/tx_extractors/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 bitcoin/tx_extractors/abstract_extractor.py,sha256=YLnuqc3jva15NpOX8xV4oB5PEXc6rXbG8Lx0cBXW66s,291
-bitcoin/tx_extractors/bitcoin_rpc.py,sha256=PFyX5DfJspj9AM3KCVJG91dYxTtb73PW10JKzHDljww,2800
-bitcoin/tx_extractors/default.py,sha256=ZW9bJjq4-gvp-jJzNTrTFRRTReb4mOO0OmpTnDenhBQ,1377
+bitcoin/tx_extractors/bitcoin_rpc.py,sha256=btxz7jr95SG8IuTg4klRT5OMvyVm5B3pO_-e50_MEiY,2966
+bitcoin/tx_extractors/default.py,sha256=Xd09vldoFIlZo2g25KQeWbPKw7Cyj6vp40AKeDn3nJM,1407
 bitcoin/tx_extractors/mempool.py,sha256=mPPY1GOvBmZWn7UVP2sUaXtfcyeTCj-LmRDl2F4WhC8,2090
 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=V4-WIt5PYJaYoipn0rYhcFfg1BBYxqqQGucKhGXTmkg,1110
+bitcoin/tx_listener/zmq_listener.py,sha256=HCLtR6s6kBH1IP8WXJA9UfnR8kczwk7Mdtexn3r1yoI,1215
 bitcoin/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-bitcoin/utils/benchmark.py,sha256=kaTTlo6k_5uDVIt8FMeY4nH7ZxxsoWUiMsZgHfpWsMo,894
-bitcoin/utils/bitcoin_rpc.py,sha256=yEHS8BPI_Y4uLFL1ygUti8OI68JW67d_c1vshjEfQbA,932
+bitcoin/utils/benchmark.py,sha256=HXZy9vU34MKrBoVjx3y982TFEOuSmOz5HWf5LcFwaZA,817
+bitcoin/utils/bitcoin_rpc.py,sha256=wyTIahgdSyiR1ryPi75n33ERuKQK630YTO9hNs_MML4,1358
 bitcoin/utils/bitcoin_utils.py,sha256=mrnRPqUa2U2EMKu7rrPV_bW1sL2CJUfbAom0Zdamydk,631
 bitcoin/utils/constants.py,sha256=irZLlArgica2VckyckEYxH5D5KjvdF52dtBMWswqw8k,52
+bitcoin/utils/context_aware_logging.py,sha256=qPBhi44Hks_LaiW516T9oGqY1WIbUQqHOR1KckG5l1s,1307
 bitcoin/utils/inscription_utils.py,sha256=8QbOJ1o1n1bMFsPREGLzwFjnGzfuARgJCPr6ORhP44o,193
-bitcoinwatcher-2.4.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-bitcoinwatcher-2.4.dist-info/METADATA,sha256=gaTSlQkwg__aqoHgdWVx2e7VCyzYtJv88VVVo_FokvU,14938
-bitcoinwatcher-2.4.dist-info/WHEEL,sha256=y4mX-SOX4fYIkonsAGA5N0Oy-8_gI4FXw5HNI1xqvWg,91
-bitcoinwatcher-2.4.dist-info/top_level.txt,sha256=YdUgzLdCiMlrwaKyDqHA1acEd23QFko5bv7D6nBANJ0,8
-bitcoinwatcher-2.4.dist-info/RECORD,,
+bitcoinwatcher-2.6.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+bitcoinwatcher-2.6.dist-info/METADATA,sha256=Oyi_L_ZKMkkhUdbDAFOcES7u6qB5Mcjbnz02iIv7FcU,14989
+bitcoinwatcher-2.6.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+bitcoinwatcher-2.6.dist-info/top_level.txt,sha256=YdUgzLdCiMlrwaKyDqHA1acEd23QFko5bv7D6nBANJ0,8
+bitcoinwatcher-2.6.dist-info/RECORD,,

{bitcoinwatcher-2.4.dist-info → bitcoinwatcher-2.6.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (70.2.0)
+Generator: setuptools (75.6.0)
 Root-Is-Purelib: true
 Tag: py3-none-any