bitcoinwatcher 2.15__tar.gz → 2.17__tar.gz

{bitcoinwatcher-2.15 → bitcoinwatcher-2.17}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bitcoinwatcher
-Version: 2.15
+Version: 2.17
 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.15 → bitcoinwatcher-2.17}/bitcoin/tx_extractors/bitcoin_rpc.py

@@ -93,8 +93,9 @@ class BitcoinRPCAddressDataExtractor(AbstractTxAddressDataExtractor):
 
         # Calculate fee manually using fetched input data
         calculated_fee = self.calculate_transaction_fee(tx, inputs_data)
-        bitcoinlib_fee = tx.fee
-
+        virtual_size = tx.vsize
+        fee_per_vbyte = math.ceil(calculated_fee / virtual_size * 100) / 100 if virtual_size > 0 else 0
+        logger.info("Transaction vsize: %d, Fee per vbyte: %.2f sats/vbyte", virtual_size, fee_per_vbyte)
         # Check for bitmap inscription
         bitmap_inscription = self.check_bitmap_patterns(tx)
         if bitmap_inscription:
@@ -122,10 +123,7 @@ class BitcoinRPCAddressDataExtractor(AbstractTxAddressDataExtractor):
         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
-            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.15 → bitcoinwatcher-2.17}/bitcoinwatcher.egg-info/PKG-INFO

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

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