bitcoinwatcher 2.4__tar.gz → 2.5__tar.gz

{bitcoinwatcher-2.4 → bitcoinwatcher-2.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: bitcoinwatcher
-Version: 2.4
+Version: 2.5
 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

{bitcoinwatcher-2.4 → bitcoinwatcher-2.5}/bitcoin/address_listener/address_listener.py

@@ -18,7 +18,7 @@ class AbstractAddressListener(AbstractTxListener, ABC):
     base_url = f"http://{host}:3006/api"
     mempool = Mempool(base_url=base_url)
     default_tx_extractor = DefaultTxAddressDataExtractor()
-    mempool_tx_extractor = BitcoinRPCAddressDataExtractor()
+    rpc_tx_extractor = BitcoinRPCAddressDataExtractor()
 
     def __init__(self, addresses_to_listen: {str}):
         self.addresses_to_listen = addresses_to_listen
@@ -44,9 +44,9 @@ class AbstractAddressListener(AbstractTxListener, ABC):
             return
         # get the address tx data from mempool for full details if any address matches
         try:
-            address_tx_data = self.mempool_tx_extractor.extract(tx)
+            address_tx_data = self.rpc_tx_extractor.extract(tx)
         except Exception as e:
-            print(f"Error in getting mempool tx data, taking defaults: {e}")
+            print(f"Error in getting rpc tx data, taking defaults: {e}")
             address_tx_data = address_tx_data
 
         for address in addresses_for_events:

{bitcoinwatcher-2.4 → bitcoinwatcher-2.5}/bitcoin/models/address_tx_data.py

@@ -24,7 +24,7 @@ class AddressTxData:
     type: AddressTxType
     # figure out the way to get amount in vin
     _amount: int = 0
-    tx_status: str = "unconfirmed"
+    is_confirmed: bool = False
     is_reveal_tx: bool = False
 
     def get_amount(self):

{bitcoinwatcher-2.4 → bitcoinwatcher-2.5}/bitcoin/tx_extractors/bitcoin_rpc.py

@@ -28,7 +28,7 @@ class BitcoinRPCAddressDataExtractor(AbstractTxAddressDataExtractor):
     def get_address_tx_from_inputdata(self, tx_id, tx_status, input_data):
         address = input_data["scriptPubKey"]["address"]
         amount = int(input_data.get("value", 0).real * 100000000)
-        return AddressTxData(tx_id=tx_id, tx_status=tx_status, address=address, _amount=amount,
+        return AddressTxData(tx_id=tx_id, is_confirmed=tx_status, address=address, _amount=amount,
                              type=AddressTxType.INPUT)
 
     def extract(self, tx: Transaction) -> [AddressTxData]:
@@ -38,23 +38,23 @@ class BitcoinRPCAddressDataExtractor(AbstractTxAddressDataExtractor):
         inputs = tx.inputs
         # bulk get all the inputs from BitcoinRPC using thread pool
         inputs_data = self.fetch_all_inputs(inputs)
-        tx_status = tx.status
+        is_confirmed = self.bitcoinrpc.is_confirmed(tx_id)
         for input in inputs:
             address = input.address
             amount = 0
             if len(inputs_data) > 0:
                 input_data = inputs_data.pop(0)
-                input_tx_data = self.get_address_tx_from_inputdata(tx_id, tx_status, input_data)
+                input_tx_data = self.get_address_tx_from_inputdata(tx_id, is_confirmed, input_data)
                 address_tx_data.append(input_tx_data)
             else:
-                address_tx_data.append(AddressTxData(tx_status=tx_status,
+                address_tx_data.append(AddressTxData(is_confirmed=is_confirmed,
                                                      address=address,
                                                      type=AddressTxType.INPUT,
                                                      _amount=amount,
                                                      tx_id=tx.txid))
         for output in outputs:
             amount = output.value
-            address_tx_data.append(AddressTxData(tx_status=tx_status,
+            address_tx_data.append(AddressTxData(is_confirmed=is_confirmed,
                                                  address=output.address,
                                                  _amount=amount,
                                                  type=AddressTxType.OUTPUT,

{bitcoinwatcher-2.4 → bitcoinwatcher-2.5}/bitcoin/tx_extractors/default.py

@@ -10,18 +10,18 @@ class DefaultTxAddressDataExtractor(AbstractTxAddressDataExtractor):
         outputs = tx.outputs
         address_tx_data = []
         inputs = tx.inputs
-        tx_status = tx.status
+        is_confirmed = tx.status == "confirmed"
         for input in inputs:
             address = input.address
             amount = 0
-            address_tx_data.append(AddressTxData(tx_status=tx_status,
+            address_tx_data.append(AddressTxData(is_confirmed=is_confirmed,
                                                  address=address,
                                                  type=AddressTxType.INPUT,
                                                  _amount=amount,
                                                  tx_id=tx.txid))
         for output in outputs:
             amount = output.value
-            address_tx_data.append(AddressTxData(tx_status=tx_status,
+            address_tx_data.append(AddressTxData(is_confirmed=is_confirmed,
                                                  address=output.address,
                                                  _amount=amount,
                                                  type=AddressTxType.OUTPUT,

{bitcoinwatcher-2.4 → bitcoinwatcher-2.5}/bitcoin/utils/bitcoin_rpc.py

@@ -18,12 +18,19 @@ class BitcoinRPC:
     def get_transaction(self, txid: str) -> dict:
         return self.rpc_connection.getrawtransaction(txid, True)
 
+    def is_confirmed(self, txid: str) -> bool:
+        try:
+            self.rpc_connection.getmempoolentry(txid)
+            return False
+        except JSONRPCException as e:
+            return True
+
 
 if __name__ == '__main__':
     rpc = BitcoinRPC()
-    txid = '8dc035d6816cf61074d12148777b28d28aa2f76b0f45ceafd310a85b1518aab8'
+    txid = '686d025f16d9f20353665a9d865e575e3e4d14214f6f7045149a17dd6bf0fac6'
     try:
-        transaction = rpc.get_transaction(txid)
+        transaction = rpc.is_confirmed(txid)
         print(transaction)
     except JSONRPCException as e:
-        print(f"An error occurred: {e}")
+        print(f"An error occurred: {e}")

{bitcoinwatcher-2.4 → bitcoinwatcher-2.5}/bitcoinwatcher.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: bitcoinwatcher
-Version: 2.4
+Version: 2.5
 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

{bitcoinwatcher-2.4 → bitcoinwatcher-2.5}/pyproject.toml

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