bitcoinwatcher 0.2.0__tar.gz → 1.0.1__tar.gz

{bitcoinwatcher-0.2.0 → bitcoinwatcher-1.0.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: bitcoinwatcher
-Version: 0.2.0
+Version: 1.0.1
 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
@@ -226,6 +226,7 @@ Requires-Dist: requests==2.31.0
 Requires-Dist: six==1.16.0
 Requires-Dist: urllib3==2.2.1
 Requires-Dist: bitcoinlib==0.6.14
+Requires-Dist: ordipool==1.2.0
 
 # bitcoinwatcher
 

{bitcoinwatcher-0.2.0 → bitcoinwatcher-1.0.1}/bitcoin/address_listener/address_listener.py

@@ -1,10 +1,13 @@
 import dataclasses
+import os
 from abc import ABC, abstractmethod
 from enum import Enum
 
 from bitcoinlib.transactions import Transaction
+from ordipool.ordipool.mempoolio import Mempool
 
 from bitcoin.tx_listener.abstract_tx_listener import AbstractTxListener
+from bitcoin.utils.constants import default_host
 
 
 class AddressTxType(Enum):
@@ -21,8 +24,6 @@ class AddressTxData:
     _amount: int = 0
 
     def get_amount(self):
-        if self.type == AddressTxType.INPUT:
-            return "Amount is not supported for input type, yet"
         return self._amount
 
     def amount_in_btc(self):
@@ -33,6 +34,9 @@ class AddressTxData:
 
 class AbstractAddressListener(AbstractTxListener, ABC):
     DECIMAL_SCALE = 5
+    host = os.environ.get("RPC_HOST", default_host)
+    base_url = f"http://{host}:3006/api"
+    mempool = Mempool(base_url=base_url)
 
     def __init__(self, addresses_to_listen: {str}):
         self.addresses_to_listen = addresses_to_listen
@@ -49,14 +53,20 @@ class AbstractAddressListener(AbstractTxListener, ABC):
 
     def on_tx(self, tx: Transaction):
         # get all address in the inputs and outputs along with the amount
-        inputs = tx.inputs
+        if tx.coinbase:
+            return
         outputs = tx.outputs
         tx_id = tx.txid
+        tx = self.mempool.get_transaction(tx_id)
         address_tx_data = []
-        for input in inputs:
-            address = input.address
+        # getting inputs data separately from mempool
+        # as current library doesn't provide rich data like previous outputs and its value
+        for input in tx.vins:
+            address = input.prev_out.address
+            amount = input.prev_out.value
             address_tx_data.append(AddressTxData(address=address,
                                                  type=AddressTxType.INPUT,
+                                                 _amount=amount,
                                                  tx_id=tx_id))
         for output in outputs:
             amount = output.value

{bitcoinwatcher-0.2.0 → bitcoinwatcher-1.0.1}/bitcoin/address_listener/simple_address_listener.py

@@ -7,9 +7,13 @@ class SimpleAddressListener(AbstractAddressListener):
         all_output = list(filter(lambda x: x.type == AddressTxType.OUTPUT and x.address == subscribed_address,
                                  address_tx_data))
         total_amount_in_output = sum(map(lambda x: x.amount_in_btc(), all_output))
+        all_input = list(filter(lambda x: x.type == AddressTxType.INPUT and x.address == subscribed_address,
+                                address_tx_data))
+        total_amount_in_input = sum(map(lambda x: x.amount_in_btc(), all_input))
         # scale ito 4 decimal places
         total_amount_in_output = round(total_amount_in_output, self.DECIMAL_SCALE)
         print(f"Address {subscribed_address} received {total_amount_in_output} BTC in tx {address_tx_data[0].tx_id}")
+        print(f"Address {subscribed_address} spent {total_amount_in_input} BTC in tx {address_tx_data[0].tx_id}")
 
     def __init__(self, addresses_to_listen: {str}):
         self.addresses = address

{bitcoinwatcher-0.2.0 → bitcoinwatcher-1.0.1}/bitcoin/tests/test_address_listener.py

@@ -26,7 +26,7 @@ class TestAbstractAddressListener(TestCase):
         address_tx_data = address_listener.filter_address_tx_data(input_tx_data)
         self.assertEqual(len(address_tx_data), 2)
         self.assertListEqual(sorted(address_tx_data), ["3P4WqXDbSL", "3P4WqXDbSL2"])
-        self.assertNotEquals(len(address_tx_data), len(input_tx_data))
+        self.assertNotEqual(len(address_tx_data), len(input_tx_data))
 
     def test_filter_address_tx_data_empty_address_in_input(self):
         address_listener = DummyAddressListener("3P4WqXDbSL")
@@ -41,4 +41,11 @@ class TestAbstractAddressListener(TestCase):
         address_tx_data = address_listener.filter_address_tx_data(output_tx_data)
         self.assertEqual(len(address_tx_data), 1)
         self.assertEqual(address_tx_data[0], "3P4WqXDbSL")
-        self.assertNotEquals(len(address_tx_data), len(output_tx_data))
+        self.assertNotEqual(len(address_tx_data), len(output_tx_data))
+
+    def test_filter_where_its_in_input(self):
+        address_listener = DummyAddressListener("3P4WqXDbSL")
+        input_tx_data = [AddressTxData(tx_id="tx id", address="3P4WqXDbSL", type=AddressTxType.INPUT, _amount=1000)]
+        output_tx_data = [AddressTxData(tx_id="tx id", address="3P4WqXDbSLD", type=AddressTxType.OUTPUT, _amount=1000)]
+        address_tx_data = address_listener.filter_address_tx_data(input_tx_data + output_tx_data)
+        self.assertEqual(len(address_tx_data), 1)

{bitcoinwatcher-0.2.0 → bitcoinwatcher-1.0.1}/bitcoin/tx_listener/zmq_listener.py

@@ -4,9 +4,7 @@ import zmq
 from bitcoinlib.transactions import Transaction
 
 from bitcoin.tx_listener.abstract_tx_listener import AbstractTxListener
-
-default_host = "192.168.29.108"
-default_port = 28333
+from bitcoin.utils.constants import default_host, default_port
 
 
 class ZMQTXListener:

bitcoinwatcher-1.0.1/bitcoin/utils/constants.py

@@ -0,0 +1,2 @@
+default_host = "192.168.29.108"
+default_port = 28333

{bitcoinwatcher-0.2.0 → bitcoinwatcher-1.0.1}/bitcoinwatcher.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: bitcoinwatcher
-Version: 0.2.0
+Version: 1.0.1
 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
@@ -226,6 +226,7 @@ Requires-Dist: requests==2.31.0
 Requires-Dist: six==1.16.0
 Requires-Dist: urllib3==2.2.1
 Requires-Dist: bitcoinlib==0.6.14
+Requires-Dist: ordipool==1.2.0
 
 # bitcoinwatcher
 

{bitcoinwatcher-0.2.0 → bitcoinwatcher-1.0.1}/bitcoinwatcher.egg-info/SOURCES.txt

@@ -12,6 +12,7 @@ bitcoin/tx_listener/abstract_tx_listener.py
 bitcoin/tx_listener/zmq_listener.py
 bitcoin/utils/__init__.py
 bitcoin/utils/bitcoin_utils.py
+bitcoin/utils/constants.py
 bitcoin/utils/inscription_utils.py
 bitcoinwatcher.egg-info/PKG-INFO
 bitcoinwatcher.egg-info/SOURCES.txt

{bitcoinwatcher-0.2.0 → bitcoinwatcher-1.0.1}/bitcoinwatcher.egg-info/requires.txt

@@ -7,3 +7,4 @@ requests==2.31.0
 six==1.16.0
 urllib3==2.2.1
 bitcoinlib==0.6.14
+ordipool==1.2.0

{bitcoinwatcher-0.2.0 → bitcoinwatcher-1.0.1}/pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "bitcoinwatcher"
-version = "0.2.0"
+version = "1.0.1"
 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"}]
@@ -31,7 +31,8 @@ dependencies = [
     "requests==2.31.0",
     "six==1.16.0",
     "urllib3==2.2.1",
-    "bitcoinlib==0.6.14"
+    "bitcoinlib==0.6.14",
+    "ordipool==1.2.0"
 ]
 requires-python = ">=3.10"
 [project.urls]