bitcoinwatcher 2.5__py3-none-any.whl → 2.6.1__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):
@@ -37,6 +37,7 @@ class AbstractAddressListener(AbstractTxListener, ABC):
         # get all address in the inputs and outputs along with the amount
         if tx.coinbase:
             return
+        logger.debug(f"Extracting default tx data")
         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)
@@ -44,9 +45,10 @@ class AbstractAddressListener(AbstractTxListener, ABC):
             return
         # get the address tx data from mempool for full details if any address matches
         try:
+            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 rpc tx data, taking defaults: {e}")
+            logger.error(f"Error in getting rpc tx data, taking defaults", exc_info=True)
             address_tx_data = address_tx_data
 
         for address in addresses_for_events:

bitcoin/address_listener/simple_address_listener.py

@@ -12,7 +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)
+        print("Transaction status: ", address_tx_data[0].is_confirmed)
         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}")
@@ -23,7 +23,7 @@ class SimpleAddressListener(AbstractAddressListener):
 
 
 if __name__ == '__main__':
-    address = ["bc1qcq2uv5nk6hec6kvag3wyevp6574qmsm9scjxc2"]
+    address = ["bc1qp8j9sx6609h7llqufurxjgrwsqwt020tqzn0gs", "bc1qcq2uv5nk6hec6kvag3wyevp6574qmsm9scjxc2"]
     address_watcher = SimpleAddressListener(address)
     zmq_listener = ZMQTXListener(address_watcher)
     zmq_listener.start()

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, ctx_tx_status
 
 
 class BitcoinRPCAddressDataExtractor(AbstractTxAddressDataExtractor):
@@ -32,6 +33,7 @@ class BitcoinRPCAddressDataExtractor(AbstractTxAddressDataExtractor):
                              type=AddressTxType.INPUT)
 
     def extract(self, tx: Transaction) -> [AddressTxData]:
+        logger.info("Extracting rpc tx data")
         outputs = tx.outputs
         tx_id = tx.txid
         address_tx_data = []
@@ -39,6 +41,8 @@ class BitcoinRPCAddressDataExtractor(AbstractTxAddressDataExtractor):
         # bulk get all the inputs from BitcoinRPC using thread pool
         inputs_data = self.fetch_all_inputs(inputs)
         is_confirmed = self.bitcoinrpc.is_confirmed(tx_id)
+        ctx_tx_status.set(is_confirmed)
+        logger.info("Transaction is_confirmed: %s", is_confirmed)
         for input in inputs:
             address = input.address
             amount = 0

bitcoin/tx_extractors/default.py

@@ -3,6 +3,7 @@ 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
+from bitcoin.utils.context_aware_logging import ctx_tx_status
 
 
 class DefaultTxAddressDataExtractor(AbstractTxAddressDataExtractor):
@@ -11,6 +12,7 @@ class DefaultTxAddressDataExtractor(AbstractTxAddressDataExtractor):
         address_tx_data = []
         inputs = tx.inputs
         is_confirmed = tx.status == "confirmed"
+        ctx_tx_status.set(is_confirmed)
         for input in inputs:
             address = input.address
             amount = 0

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,15 +21,16 @@ 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}")
+                logger.error(f"Error in parsing tx: {e}", exc_info=True)
 
     def stop(self):
         self.socket.close()

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:
@@ -27,10 +28,12 @@ class BitcoinRPC:
 
 
 if __name__ == '__main__':
+    logger = get_logger(__name__)
     rpc = BitcoinRPC()
     txid = '686d025f16d9f20353665a9d865e575e3e4d14214f6f7045149a17dd6bf0fac6'
     try:
-        transaction = rpc.is_confirmed(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}")

bitcoin/utils/context_aware_logging.py

@@ -0,0 +1,59 @@
+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 %(levelname)s txid=%(tx_id)s tx_status=%(tx_status)s [%(module)s:%(lineno)d] %(funcName)s: %(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 ExcludeModuleFilter(logging.Filter):
+    def filter(self, record):
+        return not (record.name.startswith('bitcoinlib.transactions') or record.name.startswith('bitcoinlib.scripts'))
+
+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)
+ch.addFilter(ExcludeModuleFilter())
+root.addHandler(ch)
+
+def get_logger(name):
+    return logging.getLogger(name)

{bitcoinwatcher-2.5.dist-info → bitcoinwatcher-2.6.1.dist-info}/METADATA

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: bitcoinwatcher
-Version: 2.5
+Version: 2.6.1
 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/
         
@@ -223,11 +223,12 @@ 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: 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.5.dist-info → bitcoinwatcher-2.6.1.dist-info}/RECORD

@@ -1,7 +1,7 @@
 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=Vnti0KIPJVt1vSOM0EawhFvrYeDhThhMbcBhAHaDy1Q,2342
-bitcoin/address_listener/simple_address_listener.py,sha256=WG8eTrd3AdkrIs1TAGRsXe_erAtE_Ep8hidZDksGk8g,1625
+bitcoin/address_listener/address_listener.py,sha256=_ybn0IgOLL6rrf2WKOwJsI_MjWdiFs8qiGWl-Kj6kf0,2445
+bitcoin/address_listener/simple_address_listener.py,sha256=yQTxWVthsMiYkXzWYmGMCzP0LWTUokgWFkqEf8GsUB4,1674
 bitcoin/models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 bitcoin/models/address_tx_data.py,sha256=KSSCzAjYxLEgXIELVSsnSEhgY65xi0K3HUjoamVV_LQ,750
 bitcoin/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -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=ebw_oEhgi22Oj6mtjBNLnxl_NIF_u63d05u3nHkUt_U,2847
-bitcoin/tx_extractors/default.py,sha256=Xd09vldoFIlZo2g25KQeWbPKw7Cyj6vp40AKeDn3nJM,1407
+bitcoin/tx_extractors/bitcoin_rpc.py,sha256=1ehmZ4wsyE-dkfi2yYfCX0d-YFJoZPtkgey9X6gZx9U,3069
+bitcoin/tx_extractors/default.py,sha256=KLT0EIbrp9yzFTQ-U5JRGI4ACHkvEMmycdXQGoPRU20,1509
 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=X3R-DwC2e_V_28WQZcThKuoAhT4_0QOscsrDTV_aHjU,1237
 bitcoin/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-bitcoin/utils/benchmark.py,sha256=kaTTlo6k_5uDVIt8FMeY4nH7ZxxsoWUiMsZgHfpWsMo,894
-bitcoin/utils/bitcoin_rpc.py,sha256=tsDwSeklp_oDZ3Bd7aUC2tpUQ2kUGwhnMr1NzACIK34,1132
+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=JpTYU9FiNgrTw60cFfGNDy00Icx2x5-Zod4KOJJ6pWU,1579
 bitcoin/utils/inscription_utils.py,sha256=8QbOJ1o1n1bMFsPREGLzwFjnGzfuARgJCPr6ORhP44o,193
-bitcoinwatcher-2.5.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-bitcoinwatcher-2.5.dist-info/METADATA,sha256=AGb2LvceN2_Jz-OSzmXpVrk8BALp2S2VZ8TKMhKyh-0,14927
-bitcoinwatcher-2.5.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
-bitcoinwatcher-2.5.dist-info/top_level.txt,sha256=YdUgzLdCiMlrwaKyDqHA1acEd23QFko5bv7D6nBANJ0,8
-bitcoinwatcher-2.5.dist-info/RECORD,,
+bitcoinwatcher-2.6.1.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+bitcoinwatcher-2.6.1.dist-info/METADATA,sha256=1FkBp83yL2hZa5byNPkV8gYa3KwFhOcNQOlkJns4ZUc,14991
+bitcoinwatcher-2.6.1.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+bitcoinwatcher-2.6.1.dist-info/top_level.txt,sha256=YdUgzLdCiMlrwaKyDqHA1acEd23QFko5bv7D6nBANJ0,8
+bitcoinwatcher-2.6.1.dist-info/RECORD,,

{bitcoinwatcher-2.5.dist-info → bitcoinwatcher-2.6.1.dist-info}/WHEEL

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