Merge pull request #2406 from CounterpartyXCP/develop

v10.4.8
CounterpartyXCP · Oct 17, 2024 · 34d4436 · 34d4436
2 parents 8890f8a + a571d1a
commit 34d4436
Show file tree

Hide file tree

Showing 11 changed files with 53 additions and 12 deletions.
diff --git a/apiary.apib b/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.7",
+            "version": "10.4.8",
             "backend_height": 850214,
             "counterparty_height": 850214,
             "documentation": "https://counterpartycore.docs.apiary.io/",

diff --git a/counterparty-core/counterpartycore/lib/api/api_watcher.py b/counterparty-core/counterpartycore/lib/api/api_watcher.py
@@ -402,6 +402,12 @@ def update_assets_info(api_db, event):
             "SELECT * FROM assets_info WHERE asset = :asset",
             {"asset": event_bindings["asset"]},
         )
+        if existing_asset is None and "asset_longname" in event_bindings:
+            existing_asset = fetch_one(
+                api_db,
+                "SELECT * FROM assets_info WHERE asset_longname = :asset_longname",
+                {"asset_longname": event_bindings["asset_longname"]},
+            )
         if existing_asset is not None and not event_bindings["confirmed"]:
             return
         set_data = []
@@ -630,9 +636,9 @@ def update_fairminters(api_db, event):
 def rollback_fairminters(api_db, event):
     if event["event"] != "NEW_FAIRMINT":
         return
-    if event["status"] != "valid":
-        return
     event_bindings = json.loads(event["bindings"])
+    if event_bindings["status"] != "valid":
+        return
     cursor = api_db.cursor()
     sql = """
         UPDATE fairminters SET

diff --git a/counterparty-core/counterpartycore/lib/backend/bitcoind.py b/counterparty-core/counterpartycore/lib/backend/bitcoind.py
@@ -18,7 +18,7 @@
 TRANSACTIONS_CACHE_MAX_SIZE = 10000
 
 
-def rpc_call(payload):
+def rpc_call(payload, retry=0):
     """Calls to bitcoin core and returns the response"""
     url = config.BACKEND_URL
     response = None
@@ -89,10 +89,15 @@ def rpc_call(payload):
     if response_json["error"]["code"] in [-28, -8, -2]:
         # “Verifying blocks...” or “Block height out of range” or “The network does not appear to fully agree!“
         logger.debug(f"Backend not ready. Sleeping for ten seconds. ({response_json['error']})")
+        logger.debug(f"Payload: {payload}")
+        if retry >= 10:
+            raise exceptions.BitcoindRPCError(
+                f"Backend not ready after {retry} retries. ({response_json['error']})"
+            )
         # If Bitcoin Core takes more than `sys.getrecursionlimit() * 10 = 9970`
         # seconds to start, this’ll hit the maximum recursion depth limit.
         time.sleep(10)
-        return rpc_call(payload)
+        return rpc_call(payload, retry=retry + 1)
     raise exceptions.BitcoindRPCError(response_json["error"]["message"])
 
 

diff --git a/counterparty-core/counterpartycore/lib/config.py b/counterparty-core/counterpartycore/lib/config.py
@@ -5,7 +5,7 @@
 
 
 # Semantic Version
-__version__ = "10.4.7"  # for hatch
+__version__ = "10.4.8"  # for hatch
 VERSION_STRING = __version__
 version = VERSION_STRING.split("-")[0].split(".")
 VERSION_MAJOR = int(version[0])

diff --git a/counterparty-core/counterpartycore/test/regtest/apidoc/blueprint-template.md b/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.7",
+            "version": "10.4.8",
             "backend_height": 850214,
             "counterparty_height": 850214,
             "documentation": "https://counterpartycore.docs.apiary.io/",

diff --git a/counterparty-core/requirements.txt b/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.7
+counterparty-rs==10.4.8
diff --git a/counterparty-rs/Cargo.lock b/counterparty-rs/Cargo.lock
diff --git a/counterparty-rs/Cargo.toml b/counterparty-rs/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "counterparty-rs"
-version = "10.4.7"
+version = "10.4.8"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

diff --git a/counterparty-wallet/requirements.txt b/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.7
+counterparty-core==10.4.8
diff --git a/docker-compose.yml b/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.7
+  image: counterparty/counterparty:v10.4.8
   stop_grace_period: 1m
   volumes:
     - data:/root/.bitcoin

diff --git a/release-notes/release-notes-v10.4.8.md b/release-notes/release-notes-v10.4.8.md
@@ -0,0 +1,30 @@
+# Release Notes - Counterparty Core v10.4.8 (2024-10-17)
+
+This is a hotfix release to fix a number of additional issues that arose with the recent protocol changes.
+
+# Upgrading
+
+This is not a protocol change, and no database reparsing is necessary.
+
+
+# ChangeLog
+
+## Bugfixes
+
+- Fix fair minting rollback
+- Fix API server crash due to missing sanity check
+- Retry maximum 10 times on Bitcoin Core RPC call error
+
+## Codebase
+
+## API
+
+## CLI
+
+
+
+# Credits
+
+* Ouziel Slama
+* Warren Puffett
+* Adam Krellenstein