bitcoinwatcher 2.14__tar.gz → 2.16__tar.gz

{bitcoinwatcher-2.14 → bitcoinwatcher-2.16}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bitcoinwatcher
-Version: 2.14
+Version: 2.16
 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.14 → bitcoinwatcher-2.16}/bitcoin/address_listener/address_listener.py

@@ -56,7 +56,6 @@ class AbstractAddressListener(AbstractTxListener, ABC):
                 self.consume(tx_hex=tx.raw_hex(), subscribed_address="SATFLOW", address_tx_data=address_tx_data)
             else:
                 logger.debug(f"No addresses to listen to for transaction {tx.txid}.")
-            return
         bitmap_tx = next((addr_data for addr_data in address_tx_data if addr_data.bitmap_details is not None), None)
         if bitmap_tx:
             logger.info(f"Transaction {tx.txid} contains bitmap inscription: {bitmap_tx.bitmap_details}")

{bitcoinwatcher-2.14 → bitcoinwatcher-2.16}/bitcoin/tx_extractors/bitcoin_rpc.py

@@ -99,8 +99,6 @@ class BitcoinRPCAddressDataExtractor(AbstractTxAddressDataExtractor):
         bitmap_inscription = self.check_bitmap_patterns(tx)
         if bitmap_inscription:
             logger.info("Bitmap inscription found: %s", bitmap_inscription)
-            logger.info("Fee comparison - Calculated: %d sats, BitcoinLib: %d sats",
-                        calculated_fee, bitcoinlib_fee)
         for input in inputs:
             address = input.address
             amount = 0
@@ -121,13 +119,12 @@ class BitcoinRPCAddressDataExtractor(AbstractTxAddressDataExtractor):
                                                  _amount=amount,
                                                  type=AddressTxType.OUTPUT,
                                                  tx_id=tx.txid))
-        if bitmap_inscription:
+        if bitmap_inscription is not None:
             bitmap_details = BitmapDetails()
             bitmap_details.fee = calculated_fee
-            witness_size = len(tx.witness_data()) // 2 if tx.witness_data else 0
-            virtual_size = (tx.size * 3 + witness_size) / 4
+            virtual_size = tx.vsize
             fee_per_vbyte = math.ceil(calculated_fee / virtual_size * 100) / 100 if virtual_size > 0 else 0
-            bitmap_details.fee_per_vbyte = round(fee_per_vbyte, 2)
+            bitmap_details.fee_per_vbyte = fee_per_vbyte
             bitmap_details.bitmap_number = int(bitmap_inscription.split(".bitmap")[0])
             address_tx_data[0].bitmap_details = bitmap_details
         return address_tx_data

{bitcoinwatcher-2.14 → bitcoinwatcher-2.16}/bitcoinwatcher.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bitcoinwatcher
-Version: 2.14
+Version: 2.16
 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.14 → bitcoinwatcher-2.16}/pyproject.toml

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