Merge pull request #2379 from CounterpartyXCP/develop

v10.4.6

.github/workflows/test_compose.yml

@@ -2,7 +2,7 @@ name: Docker Compose
 
 on:
   push:
-    branches: ['develop', 'master', 'fix503']
+    branches: ['develop', 'master', 'fixutxo']
 
 jobs:
   build:

apiary.apib

@@ -1437,7 +1437,7 @@ Returns server information and the list of documented routes in JSON format.
         "result": {
             "server_ready": true,
             "network": "mainnet",
-            "version": "10.4.5",
+            "version": "10.4.6",
             "backend_height": 850214,
             "counterparty_height": 850214,
             "documentation": "https://counterpartycore.docs.apiary.io/",

counterparty-core/counterpartycore/lib/config.py

@@ -5,7 +5,7 @@
 
 
 # Semantic Version
-__version__ = "10.4.5"  # for hatch
+__version__ = "10.4.6"  # for hatch
 VERSION_STRING = __version__
 version = VERSION_STRING.split("-")[0].split(".")
 VERSION_MAJOR = int(version[0])

counterparty-core/counterpartycore/lib/gettxinfo.py

@@ -576,8 +576,7 @@ def get_utxos_info(db, decoded_tx):
         else:
             vin_hash = inverse_hash(binascii.hexlify(vin["hash"]).decode("utf-8"))
         utxo = vin_hash + ":" + str(vin["n"])
-        utxo_balances = ledger.get_utxo_balances(db, utxo)
-        if len(utxo_balances) > 0:
+        if ledger.utxo_has_balance(db, utxo):
             sources.append(utxo)
     destination = None
     # the destination is the first non-OP_RETURN vout

counterparty-core/counterpartycore/lib/ledger.py

@@ -395,6 +395,7 @@ def credit(db, address, asset, quantity, tx_index, action=None, event=None):
         credit_address = None
         utxo = address
         utxo_address = backend.bitcoind.safe_get_utxo_address(utxo)
+        UTXOBalancesCache(db).add_balance(utxo)
 
     add_to_balance(db, address, asset, quantity, tx_index, utxo_address)
 
@@ -446,6 +447,28 @@ def get_balance(db, address, asset, raise_error_if_no_balance=False, return_list
     return balances[0]["quantity"]
 
 
+class UTXOBalancesCache(metaclass=util.SingletonMeta):
+    def __init__(self, db):
+        logger.debug("Initialising utxo balances cache...")
+        sql = "SELECT utxo, asset, quantity, MAX(rowid) FROM balances WHERE utxo IS NOT NULL GROUP BY utxo, asset"
+        cursor = db.cursor()
+        cursor.execute(sql)
+        utxo_balances = cursor.fetchall()
+        self.utxos_with_balance = {}
+        for utxo_balance in utxo_balances:
+            self.utxos_with_balance[utxo_balance["utxo"]] = True
+
+    def has_balance(self, utxo):
+        return utxo in self.utxos_with_balance
+
+    def add_balance(self, utxo):
+        self.utxos_with_balance[utxo] = True
+
+
+def utxo_has_balance(db, utxo):
+    return UTXOBalancesCache(db).has_balance(utxo)
+
+
 def get_address_balances(db, address: str):
     """
     Returns the balances of an address

counterparty-core/counterpartycore/test/fixtures/contract_vectors/ledger.py

@@ -63,7 +63,7 @@
                     "timestamp": 0,
                     "event": "BLOCK_PARSED",
                     "tx_hash": None,
-                    "event_hash": "895d409a2e1c92470ac8745282bc80bc5317bc193413728450b4c097ff3d1e31",
+                    "event_hash": "72f12f8d9225bfe88c43e2561d6e34ff4bb061174f0b025fd2e8f37e204dbf2c",
                 },
             }
         ],

counterparty-core/counterpartycore/test/regtest/apidoc/blueprint-template.md

@@ -158,7 +158,7 @@ Returns server information and the list of documented routes in JSON format.
         "result": {
             "server_ready": true,
             "network": "mainnet",
-            "version": "10.4.5",
+            "version": "10.4.6",
             "backend_height": 850214,
             "counterparty_height": 850214,
             "documentation": "https://counterpartycore.docs.apiary.io/",

counterparty-core/requirements.txt

@@ -34,4 +34,4 @@ JSON-log-formatter==1.0
 yoyo-migrations==8.2.0
 gunicorn==23.0.0
 waitress==3.0.0
-counterparty-rs==10.4.5
+counterparty-rs==10.4.6

counterparty-rs/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "counterparty-rs"
-version = "10.4.5"
+version = "10.4.6"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

counterparty-wallet/requirements.txt

@@ -5,4 +5,4 @@ colorlog==6.8.0
 python-dateutil==2.8.2
 requests==2.32.0
 termcolor==2.4.0
-counterparty-core==10.4.5
+counterparty-core==10.4.6

docker-compose.yml

@@ -15,7 +15,7 @@ x-addrindexrs-common: &addrindexrs-common
   restart: unless-stopped
 
 x-counterparty-common: &counterparty-common
-  image: counterparty/counterparty:v10.4.5
+  image: counterparty/counterparty:v10.4.6
   stop_grace_period: 1m
   volumes:
     - data:/root/.bitcoin

release-notes/release-notes-v10.4.6.md

@@ -0,0 +1,26 @@
+# Release Notes - Counterparty Core v10.4.6 (2024-10-17)
+
+This is a Hotfix release to address the slowness of block parsing.
+
+# Upgrading
+
+# ChangeLog
+
+## Bugfixes
+
+
+## Codebase
+
+- Use of RAM cache to verify balances attached to a UTXO
+
+## API
+
+## CLI
+
+
+
+# Credits
+
+* Ouziel Slama
+* Warren Puffett
+* Adam Krellenstein