bitcoinwatcher 2.6__tar.gz → 2.7__tar.gz

{bitcoinwatcher-2.6 → bitcoinwatcher-2.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: bitcoinwatcher
-Version: 2.6
+Version: 2.7
 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
@@ -229,6 +229,7 @@ Requires-Dist: ordipool==1.2.0
 Requires-Dist: pyzmq==25.1.2
 Requires-Dist: python-bitcoinrpc==1.0
 Requires-Dist: pytz~=2024.2
+Requires-Dist: colorlog~=6.9.0
 
 # bitcoinwatcher
 

{bitcoinwatcher-2.6 → bitcoinwatcher-2.7}/bitcoin/address_listener/address_listener.py

@@ -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)
@@ -47,7 +48,7 @@ class AbstractAddressListener(AbstractTxListener, ABC):
             logger.info(f"Extracting rpc tx data")
             address_tx_data = self.rpc_tx_extractor.extract(tx)
         except Exception as e:
-            logger.error(f"Error in getting rpc tx data, taking defaults",e, exc_info=True)
+            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:

{bitcoinwatcher-2.6 → bitcoinwatcher-2.7}/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()

{bitcoinwatcher-2.6 → bitcoinwatcher-2.7}/bitcoin/tx_extractors/bitcoin_rpc.py

@@ -7,7 +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
+from bitcoin.utils.context_aware_logging import logger, ctx_tx_status
 
 
 class BitcoinRPCAddressDataExtractor(AbstractTxAddressDataExtractor):
@@ -33,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 = []
@@ -40,7 +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)
-        logger.info("Transaction is_confirmed: ", is_confirmed)
+        ctx_tx_status.set(is_confirmed)
+        logger.info("Transaction is_confirmed: %s", is_confirmed)
         for input in inputs:
             address = input.address
             amount = 0

{bitcoinwatcher-2.6 → bitcoinwatcher-2.7}/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

{bitcoinwatcher-2.6 → bitcoinwatcher-2.7}/bitcoin/tx_listener/zmq_listener.py

@@ -30,7 +30,7 @@ class ZMQTXListener:
                 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()

{bitcoinwatcher-2.6 → bitcoinwatcher-2.7}/bitcoin/utils/context_aware_logging.py

@@ -1,6 +1,7 @@
 import logging
 from contextvars import ContextVar
 from datetime import datetime
+import colorlog
 
 import pytz
 
@@ -8,9 +9,9 @@ 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)
+class TimezoneFormatter(colorlog.ColoredFormatter):
+    def __init__(self, fmt=None, datefmt=None, tz=None, log_colors=None):
+        super().__init__(fmt, datefmt, log_colors=log_colors)
         self.tz = tz
 
     def formatTime(self, record, datefmt=None):
@@ -19,19 +20,29 @@ class TimezoneFormatter(logging.Formatter):
             s = dt.strftime(datefmt)
         else:
             s = dt.isoformat()
-        return s
-
+        return f"\033[94m{s}\033[0m"  # Adding blue color to the date
 
 formatter = TimezoneFormatter(
-    ' %(asctime)s %(name)s txid=%(tx_id)s [%(module)s:%(lineno)d] %(message)s',
+    ' %(asctime)s %(log_color)s%(levelname)s txid=%(tx_id)s tx_status=%(tx_status)s [%(module)s:%(lineno)d] %(message)s',
     datefmt='%Y-%m-%d %H:%M:%S',
-    tz=pytz.timezone('Asia/Kolkata')
+    tz=pytz.timezone('Asia/Kolkata'),
+    log_colors={
+        'DEBUG': 'cyan',
+        'INFO': 'green',
+        'WARNING': 'yellow',
+        'ERROR': 'red',
+        'CRITICAL': 'bold_red',
+    }
 )
 
 
 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):
@@ -48,6 +59,7 @@ ch = logging.StreamHandler()
 f = TXContextFilter()
 ch.setFormatter(formatter)
 ch.addFilter(f)
+ch.addFilter(ExcludeModuleFilter())
 root.addHandler(ch)
 
 def get_logger(name):

{bitcoinwatcher-2.6 → bitcoinwatcher-2.7}/bitcoinwatcher.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: bitcoinwatcher
-Version: 2.6
+Version: 2.7
 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
@@ -229,6 +229,7 @@ Requires-Dist: ordipool==1.2.0
 Requires-Dist: pyzmq==25.1.2
 Requires-Dist: python-bitcoinrpc==1.0
 Requires-Dist: pytz~=2024.2
+Requires-Dist: colorlog~=6.9.0
 
 # bitcoinwatcher
 

{bitcoinwatcher-2.6 → bitcoinwatcher-2.7}/bitcoinwatcher.egg-info/requires.txt

@@ -10,3 +10,4 @@ ordipool==1.2.0
 pyzmq==25.1.2
 python-bitcoinrpc==1.0
 pytz~=2024.2
+colorlog~=6.9.0

{bitcoinwatcher-2.6 → bitcoinwatcher-2.7}/pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "bitcoinwatcher"
-version = "2.6"
+version = "2.7"
 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"}]
@@ -34,7 +34,8 @@ dependencies = [
     "ordipool==1.2.0",
     "pyzmq==25.1.2",
     "python-bitcoinrpc==1.0",
-    "pytz~=2024.2"
+    "pytz~=2024.2",
+    "colorlog~=6.9.0"
 ]
 requires-python = ">=3.10"
 [project.urls]