bitcoinwatcher 2.11b1__tar.gz → 2.12__tar.gz

{bitcoinwatcher-2.11b1 → bitcoinwatcher-2.12}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: bitcoinwatcher
-Version: 2.11b1
+Version: 2.12
 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
@@ -224,12 +224,13 @@ 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: bitcoinlib==0.7.4
 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
+Dynamic: license-file
 
 # bitcoinwatcher
 

{bitcoinwatcher-2.11b1 → bitcoinwatcher-2.12}/bitcoin/address_listener/address_listener.py

@@ -10,6 +10,7 @@ from bitcoin.tx_extractors.default import DefaultTxAddressDataExtractor
 from bitcoin.tx_listener.abstract_tx_listener import AbstractTxListener
 from bitcoin.utils.constants import default_host
 from bitcoin.utils.context_aware_logging import logger
+from bitcoin.utils.bitcoin_utils import has_satflow_op_return
 
 
 class AbstractAddressListener(AbstractTxListener, ABC):
@@ -48,7 +49,8 @@ class AbstractAddressListener(AbstractTxListener, ABC):
             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:
+
+        if len(addresses_for_events) == 0 and not has_satflow_op_return(tx):
             return
 
         for address in addresses_for_events:

{bitcoinwatcher-2.11b1 → bitcoinwatcher-2.12}/bitcoin/tests/test_bitcoin_utils.py

@@ -3,7 +3,7 @@ from unittest import TestCase
 from bitcoinlib.transactions import Transaction
 
 from bitcoin.tests.data.transactions import batch_airdrop_tx_hex, tx_hex, non_reveal_tx_hex, tx_hex_2
-from bitcoin.utils.bitcoin_utils import is_reveal_tx, count_reveal_inputs
+from bitcoin.utils.bitcoin_utils import is_reveal_tx, count_reveal_inputs, has_satflow_op_return
 
 
 class Test(TestCase):
@@ -34,3 +34,12 @@ class Test(TestCase):
     def test_count_reveal_in_airdrop_tx(self):
         tx = Transaction.parse_hex(batch_airdrop_tx_hex, strict=False)
         self.assertEqual(count_reveal_inputs(tx), 1420)
+
+    def test_has_satflow_op_return_true(self):
+        satflow_tx_hex = "02000000000102121a4369bd06b9123b43f41a072c3832979927e1244dbf27b85b87e4348db6090100000000ffffffffdbe5c4bff3c32c18694c85eafa74c2626c99595156571bc333b58ec9e7e437030000000000ffffffff0398230000000000002200206925778b2282777c97222e5a6b7ce092c521c755f2fd912dd20449a53d741a983cb7590000000000160014dfafb9f5e2e1b8afde774a725aedbb5f127015bb0000000000000000096a07534154464c4f5701419cc0b1bcedab6113b7793c420b0eda8efb706be4a8202d4d9f129ae539880c7027e2abd67a8510771cfa90cffd5a9c76577b1f5388ca869714e629197acdf08d8101400a443de48021e733eb29237abfdd89016a1a171074c399b5a43e5c3349854e3ac1950fe9e27ef7280881f11f67dcc855bb34b2e44e48811d4c0dd4f6e89051ac00000000"
+        tx = Transaction.parse_hex(satflow_tx_hex, strict=False)
+        self.assertTrue(has_satflow_op_return(tx))
+
+    def test_has_satflow_op_return_false(self):
+        tx = Transaction.parse_hex(tx_hex, strict=False)
+        self.assertFalse(has_satflow_op_return(tx))

{bitcoinwatcher-2.11b1 → bitcoinwatcher-2.12}/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.11b1 → bitcoinwatcher-2.12}/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.11b1 → bitcoinwatcher-2.12}/bitcoin/utils/bitcoin_utils.py

@@ -16,3 +16,15 @@ def is_reveal_tx(tx: Transaction) -> bool:
     count_of_inscriptions = count_reveal_inputs(tx)
     return count_of_inscriptions > 0
     # check if any of the witness contains ord, convert witness to hex
+
+
+def has_satflow_op_return(tx: Transaction) -> bool:
+    for output in tx.outputs:
+        if output.script_type == 'nulldata' and output.lock_script:
+            try:
+                script_data = output.lock_script.hex()
+                if b'SATFLOW'.hex() in script_data:
+                    return True
+            except:
+                pass
+    return False

bitcoinwatcher-2.12/bitcoin/utils/constants.py

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

{bitcoinwatcher-2.11b1 → bitcoinwatcher-2.12}/bitcoinwatcher.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: bitcoinwatcher
-Version: 2.11b1
+Version: 2.12
 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
@@ -224,12 +224,13 @@ 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: bitcoinlib==0.7.4
 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
+Dynamic: license-file
 
 # bitcoinwatcher
 

{bitcoinwatcher-2.11b1 → bitcoinwatcher-2.12}/bitcoinwatcher.egg-info/requires.txt

@@ -5,7 +5,7 @@ idna==3.7
 pyzmq==25.1.2
 requests==2.31.0
 urllib3==2.2.1
-bitcoinlib==0.7.0
+bitcoinlib==0.7.4
 ordipool==1.2.0
 pyzmq==25.1.2
 python-bitcoinrpc==1.0

{bitcoinwatcher-2.11b1 → bitcoinwatcher-2.12}/pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "bitcoinwatcher"
-version = "2.11b1"
+version = "2.12"
 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"}]
@@ -30,7 +30,7 @@ dependencies = [
     "pyzmq==25.1.2",
     "requests==2.31.0",
     "urllib3==2.2.1",
-    "bitcoinlib==0.7.0",
+    "bitcoinlib==0.7.4",
     "ordipool==1.2.0",
     "pyzmq==25.1.2",
     "python-bitcoinrpc==1.0",

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

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