bitcoinwatcher 2.16__py3-none-any.whl → 2.17__py3-none-any.whl

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,8 +123,6 @@ class BitcoinRPCAddressDataExtractor(AbstractTxAddressDataExtractor):
         if bitmap_inscription is not None:
             bitmap_details = BitmapDetails()
             bitmap_details.fee = calculated_fee
-            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 = fee_per_vbyte
             bitmap_details.bitmap_number = int(bitmap_inscription.split(".bitmap")[0])
             address_tx_data[0].bitmap_details = bitmap_details

{bitcoinwatcher-2.16.dist-info → bitcoinwatcher-2.17.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bitcoinwatcher
-Version: 2.16
+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.16.dist-info → bitcoinwatcher-2.17.dist-info}/RECORD

@@ -12,7 +12,7 @@ bitcoin/tests/data/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuF
 bitcoin/tests/data/transactions.py,sha256=qIX9seGYguQ1lvLOCF8oe3NQhMJZP0SsBmz1iFbszhg,396279
 bitcoin/tx_extractors/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 bitcoin/tx_extractors/abstract_extractor.py,sha256=YLnuqc3jva15NpOX8xV4oB5PEXc6rXbG8Lx0cBXW66s,291
-bitcoin/tx_extractors/bitcoin_rpc.py,sha256=fj3V8PfEv8AOxSpVPaaaCSaWYBG5QiFnJBAEvGgIwcM,5923
+bitcoin/tx_extractors/bitcoin_rpc.py,sha256=ktDovWPwGlsGV7JoUUNslkvb_pa4T2Ho5bxSUIL2H_c,5988
 bitcoin/tx_extractors/default.py,sha256=KLT0EIbrp9yzFTQ-U5JRGI4ACHkvEMmycdXQGoPRU20,1509
 bitcoin/tx_extractors/mempool.py,sha256=mPPY1GOvBmZWn7UVP2sUaXtfcyeTCj-LmRDl2F4WhC8,2090
 bitcoin/tx_listener/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -25,8 +25,8 @@ bitcoin/utils/bitcoin_utils.py,sha256=hoYzduIO5vsBPW4imp-pNqsxmErtJMCaPURc6N_OKx
 bitcoin/utils/constants.py,sha256=bolLU7V3pFt6dQQ__CK5ESC8bkg0jO_Akn4iubaUum0,51
 bitcoin/utils/context_aware_logging.py,sha256=p3PuFnHjJcgEH8O9ng7UrXvW3SVDWGaeYgxysDuqRyI,1874
 bitcoin/utils/inscription_utils.py,sha256=8QbOJ1o1n1bMFsPREGLzwFjnGzfuARgJCPr6ORhP44o,193
-bitcoinwatcher-2.16.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-bitcoinwatcher-2.16.dist-info/METADATA,sha256=4j2L_uRs-0HCooklqJ3IXi2wOAy_o7JKta84_F1rPJw,15043
-bitcoinwatcher-2.16.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-bitcoinwatcher-2.16.dist-info/top_level.txt,sha256=YdUgzLdCiMlrwaKyDqHA1acEd23QFko5bv7D6nBANJ0,8
-bitcoinwatcher-2.16.dist-info/RECORD,,
+bitcoinwatcher-2.17.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+bitcoinwatcher-2.17.dist-info/METADATA,sha256=spGAuJwe_qmCQ92fC43jevmebctNkb11sF4gjy5qg00,15043
+bitcoinwatcher-2.17.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+bitcoinwatcher-2.17.dist-info/top_level.txt,sha256=YdUgzLdCiMlrwaKyDqHA1acEd23QFko5bv7D6nBANJ0,8
+bitcoinwatcher-2.17.dist-info/RECORD,,