bitcoinwatcher 2.13__tar.gz → 2.14__tar.gz

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

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

@@ -57,6 +57,9 @@ class AbstractAddressListener(AbstractTxListener, ABC):
             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}")
+            self.consume(tx_hex=tx.raw_hex(), subscribed_address="BITMAP",address_tx_data=address_tx_data)
         for address in addresses_for_events:
             self.consume(tx_hex=tx.raw_hex(), subscribed_address=address, address_tx_data=address_tx_data)

{bitcoinwatcher-2.13 → bitcoinwatcher-2.14}/bitcoin/models/address_tx_data.py

@@ -16,6 +16,10 @@ class TransactionStatus(Enum):
     UNCONFIRMED = "unconfirmed"
     CONFIRMED = "confirmed"
 
+class BitmapDetails:
+    bitmap_number: int
+    fee: int
+    fee_per_vbyte: float
 
 @dataclasses.dataclass
 class AddressTxData:
@@ -26,6 +30,8 @@ class AddressTxData:
     _amount: int = 0
     is_confirmed: bool = False
     is_reveal_tx: bool = False
+    fee: int = 0
+    bitmap_details: BitmapDetails | None = None
 
     def get_amount(self):
         return self._amount

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

@@ -1,10 +1,11 @@
+import math
 import os
 from multiprocessing.pool import ThreadPool
 
 from bitcoinlib.transactions import Transaction
 
 from bitcoin.address_listener.address_listener import AddressTxData
-from bitcoin.models.address_tx_data import AddressTxType
+from bitcoin.models.address_tx_data import AddressTxType, BitmapDetails
 from bitcoin.utils.bitcoin_rpc import BitcoinRPC
 from bitcoin.tx_extractors.abstract_extractor import AbstractTxAddressDataExtractor
 from bitcoin.utils.context_aware_logging import logger, ctx_tx_status
@@ -36,6 +37,48 @@ class BitcoinRPCAddressDataExtractor(AbstractTxAddressDataExtractor):
         return AddressTxData(tx_id=tx_id, is_confirmed=tx_status, address=address, _amount=amount,
                              type=AddressTxType.INPUT)
 
+    @staticmethod
+    def check_bitmap_patterns(tx: Transaction) -> str:
+        """Check if transaction contains bitmap inscription patterns"""
+        patterns = [
+            "036f7264",         # ord
+            "746578742f706c61696e",  # text/plain
+            "2e6269746d6170"    # .bitmap
+        ]
+
+        raw_hex = tx.raw_hex()
+        if all(p in raw_hex for p in patterns):
+            bitmap_pattern = "e6269746d6170"
+            index = raw_hex.find(bitmap_pattern)
+            if index != -1 and index >= 13:
+                before_hex = raw_hex[index-13:index]
+                try:
+                    decoded_text = bytes.fromhex(before_hex + bitmap_pattern).decode("utf-8", errors="ignore")
+                    return decoded_text
+                except:
+                    return "[could not decode bitmap]"
+        return None
+
+    @staticmethod
+    def calculate_transaction_fee(tx: Transaction, inputs_data: list) -> int:
+        """Calculate transaction fee manually using fetched input data and outputs"""
+        # Calculate total input value from fetched RPC data
+        total_input_value = 0
+        for input_data in inputs_data:
+            value = input_data.get("value", 0)
+            total_input_value += int(value * 100000000)  # Convert to satoshis
+
+        # Calculate total output value from transaction outputs
+        total_output_value = sum(output.value for output in tx.outputs)
+
+        # Fee = inputs - outputs
+        calculated_fee = total_input_value - total_output_value
+
+        logger.info("Fee calculation - Input: %d sats, Output: %d sats, Fee: %d sats",
+                   total_input_value, total_output_value, calculated_fee)
+
+        return calculated_fee
+
     def extract(self, tx: Transaction) -> [AddressTxData]:
         logger.info("Extracting rpc tx data")
         outputs = tx.outputs
@@ -47,6 +90,17 @@ class BitcoinRPCAddressDataExtractor(AbstractTxAddressDataExtractor):
         is_confirmed = self.bitcoinrpc.is_confirmed(tx_id)
         ctx_tx_status.set(is_confirmed)
         logger.info("Transaction is_confirmed: %s", is_confirmed)
+
+        # Calculate fee manually using fetched input data
+        calculated_fee = self.calculate_transaction_fee(tx, inputs_data)
+        bitcoinlib_fee = tx.fee
+
+        # Check for bitmap inscription
+        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
@@ -67,4 +121,13 @@ class BitcoinRPCAddressDataExtractor(AbstractTxAddressDataExtractor):
                                                  _amount=amount,
                                                  type=AddressTxType.OUTPUT,
                                                  tx_id=tx.txid))
+        if bitmap_inscription:
+            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.bitmap_number = int(bitmap_inscription.split(".bitmap")[0])
+            address_tx_data[0].bitmap_details = bitmap_details
         return address_tx_data

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

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

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