bitcoinwatcher 2.10__tar.gz → 2.11b2__tar.gz

{bitcoinwatcher-2.10 → bitcoinwatcher-2.11b2}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: bitcoinwatcher
-Version: 2.10
+Version: 2.11b2
 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
@@ -230,6 +230,7 @@ Requires-Dist: pyzmq==25.1.2
 Requires-Dist: python-bitcoinrpc==1.0
 Requires-Dist: pytz~=2024.2
 Requires-Dist: colorlog~=6.9.0
+Dynamic: license-file
 
 # bitcoinwatcher
 

{bitcoinwatcher-2.10 → bitcoinwatcher-2.11b2}/bitcoin/tx_extractors/bitcoin_rpc.py

@@ -20,7 +20,7 @@ class BitcoinRPCAddressDataExtractor(AbstractTxAddressDataExtractor):
     def fetch_all_inputs(self, 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)
+        data = self.bitcoinrpc.get_new_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:

{bitcoinwatcher-2.10 → bitcoinwatcher-2.11b2}/bitcoin/utils/bitcoin_rpc.py

@@ -13,15 +13,17 @@ class BitcoinRPC:
     rpc_port = os.environ.get("RPC_PORT", 8332)
 
     def __init__(self):
-        rpc_string = f"http://{self.rpc_user}:{self.rpc_password}@{self.rpc_host}:{self.rpc_port}"
-        self.rpc_connection = AuthServiceProxy(rpc_string)
+        self.rpc_string = f"http://{self.rpc_user}:{self.rpc_password}@{self.rpc_host}:{self.rpc_port}"
+
+    def get_new_connection(self):
+        return AuthServiceProxy(self.rpc_string)
 
     def get_transaction(self, txid: str) -> dict:
-        return self.rpc_connection.getrawtransaction(txid, True)
+        return self.get_new_connection().getrawtransaction(txid, True)
 
     def is_confirmed(self, txid: str) -> bool:
         try:
-            self.rpc_connection.getmempoolentry(txid)
+            self.get_new_connection().getmempoolentry(txid)
             return False
         except JSONRPCException as e:
             return True
@@ -30,10 +32,11 @@ class BitcoinRPC:
 if __name__ == '__main__':
     logger = get_logger(__name__)
     rpc = BitcoinRPC()
-    txid = '686d025f16d9f20353665a9d865e575e3e4d14214f6f7045149a17dd6bf0fac6'
+    txid = '775c85bb56a3fc86bf6b100a1e9ff54b6d4dcc3670fb76f98365d99a32c18e53'
     try:
         ctx_tx.set('686d025f16d9f20353665a9d865e575e3e4d14214f6f7045149a17dd6bf0fac6')
         ctx_tx_status.set('confirmed')
+        tx_data = rpc.get_transaction(txid)
         logger.info("Transaction is confirmed")
     except JSONRPCException as e:
         print(f"An error occurred: {e}")

bitcoinwatcher-2.11b2/bitcoin/utils/constants.py

@@ -0,0 +1,2 @@
+default_host = "192.168.1.105"
+default_port = 28333

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

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: bitcoinwatcher
-Version: 2.10
+Version: 2.11b2
 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
@@ -230,6 +230,7 @@ Requires-Dist: pyzmq==25.1.2
 Requires-Dist: python-bitcoinrpc==1.0
 Requires-Dist: pytz~=2024.2
 Requires-Dist: colorlog~=6.9.0
+Dynamic: license-file
 
 # bitcoinwatcher
 

{bitcoinwatcher-2.10 → bitcoinwatcher-2.11b2}/pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "bitcoinwatcher"
-version = "2.10"
+version = "2.11b2"
 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"}]

bitcoinwatcher-2.10/bitcoin/utils/constants.py

@@ -1,2 +0,0 @@
-default_host = "192.168.29.108"
-default_port = 28333

{bitcoinwatcher-2.10 → bitcoinwatcher-2.11b2}/bitcoin/address_listener/address_listener.py

@@ -39,10 +39,6 @@ class AbstractAddressListener(AbstractTxListener, ABC):
             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)
-        if len(addresses_for_events) == 0:
-            return
         # get the address tx data from mempool for full details if any address matches
         try:
             logger.info(f"Extracting rpc tx data")
@@ -50,6 +46,10 @@ class AbstractAddressListener(AbstractTxListener, ABC):
         except Exception as e:
             logger.error(f"Error in getting rpc tx data, taking defaults", exc_info=True)
             address_tx_data = address_tx_data
+        # 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
 
         for address in addresses_for_events:
             self.consume(tx_hex=tx.raw_hex(), subscribed_address=address, address_tx_data=address_tx_data)