bitcoinwatcher 2.8__tar.gz → 2.10__tar.gz

{bitcoinwatcher-2.8 → bitcoinwatcher-2.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: bitcoinwatcher
-Version: 2.8
+Version: 2.10
 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.8 → bitcoinwatcher-2.10}/bitcoin/tx_extractors/bitcoin_rpc.py

@@ -18,11 +18,15 @@ class BitcoinRPCAddressDataExtractor(AbstractTxAddressDataExtractor):
         self.bitcoinrpc = BitcoinRPC()
 
     def fetch_all_inputs(self, inputs):
-        rpc_calls = [["getrawtransaction", input.prev_txid.hex(), True] for input in inputs]
+        unique_txids = list(set([input.prev_txid.hex() for input in inputs]))
+        rpc_calls = [["getrawtransaction", tx_id, True] for tx_id in unique_txids]
         data = self.bitcoinrpc.rpc_connection.batch_(rpc_calls)
+        tx_id_to_data = {tx_id: current_tx for tx_id, current_tx in zip(unique_txids, data)}
         list_of_vouts = []
         for input in inputs:
-            vout = data.pop(0)["vout"][input.output_n_int]
+            tx_id = input.prev_txid.hex()
+            current_tx = tx_id_to_data[tx_id]
+            vout = current_tx["vout"][input.output_n_int]
             list_of_vouts.append(vout)
         return list_of_vouts
 

{bitcoinwatcher-2.8 → bitcoinwatcher-2.10}/bitcoin/utils/context_aware_logging.py

@@ -1,6 +1,8 @@
 import logging
+import sys
 from contextvars import ContextVar
 from datetime import datetime
+import colorlog
 
 import pytz
 
@@ -8,9 +10,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,12 +21,19 @@ class TimezoneFormatter(logging.Formatter):
             s = dt.strftime(datefmt)
         else:
             s = dt.isoformat()
-        return s  # Adding blue color to the date
+        return f"\033[94m{s}\033[0m"  # Adding blue color to the date
 
 formatter = TimezoneFormatter(
-    ' %(asctime)s %(levelname)s txid= %(tx_id)s tx_status=%(tx_status)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'),
+    log_colors={
+        'DEBUG': 'cyan',
+        'INFO': 'green',
+        'WARNING': 'yellow',
+        'ERROR': 'red',
+        'CRITICAL': 'bold_red',
+    }
 )
 
 
@@ -47,7 +56,7 @@ class TXContextFilter(logging.Filter):
         record.tx_status = tx_status
         return True
 
-ch = logging.StreamHandler()
+ch = logging.StreamHandler(sys.stdout)
 f = TXContextFilter()
 ch.setFormatter(formatter)
 ch.addFilter(f)

{bitcoinwatcher-2.8 → bitcoinwatcher-2.10}/bitcoinwatcher.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: bitcoinwatcher
-Version: 2.8
+Version: 2.10
 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.8 → bitcoinwatcher-2.10}/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.8 → bitcoinwatcher-2.10}/pyproject.toml

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