Fix verbose=true with asset_longname

CounterpartyXCP · Dec 25, 2024 · a67d401 · a67d401
1 parent 3d7e570
commit a67d401
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 9 deletions.
diff --git a/counterparty-core/counterpartycore/lib/ledger.py b/counterparty-core/counterpartycore/lib/ledger.py
@@ -865,14 +865,27 @@ def get_asset_issuances_quantity(db, asset):
 
 
 def get_assets_last_issuance(state_db, asset_list):
+    assets_info = []
     cursor = state_db.cursor()
     fields = ["asset", "asset_longname", "description", "issuer", "divisible", "locked"]
-    query = f"""
-        SELECT {", ".join(fields)} FROM assets_info
-        WHERE asset IN ({",".join(["?"] * len(asset_list))})
-    """  # nosec B608  # noqa: S608
-    cursor.execute(query, asset_list)
-    assets_info = cursor.fetchall()
+
+    asset_name_list = [asset for asset in asset_list if asset and "." not in asset]
+    if len(asset_name_list) > 0:
+        query = f"""
+            SELECT {", ".join(fields)} FROM assets_info
+            WHERE asset IN ({",".join(["?"] * len(asset_name_list))})
+        """  # nosec B608  # noqa: S608
+        cursor.execute(query, asset_name_list)
+        assets_info += cursor.fetchall()
+
+    asset_longname_list = [asset for asset in asset_list if asset and "." in asset]
+    if len(asset_longname_list) > 0:
+        query = f"""
+            SELECT {", ".join(fields)} FROM assets_info
+            WHERE asset_longname IN ({",".join(["?"] * len(asset_longname_list))})
+        """  # nosec B608  # noqa: S608
+        cursor.execute(query, asset_longname_list)
+        assets_info += cursor.fetchall()
 
     result = {
         "BTC": {
@@ -891,9 +904,14 @@ def get_assets_last_issuance(state_db, asset_list):
         },
     }
     for asset_info in assets_info:
-        asset = asset_info["asset"]
-        del asset_info["asset"]
-        result[asset] = asset_info
+        if asset_info["asset_longname"] in asset_list:
+            result[asset_info["asset_longname"]] = asset_info
+            result[asset_info["asset"]] = asset_info
+        else:
+            asset = asset_info["asset"]
+            del asset_info["asset"]
+            result[asset] = asset_info
+
     return result
 
 

diff --git a/counterparty-core/counterpartycore/test/fixtures/api_v2_fixtures.json b/counterparty-core/counterpartycore/test/fixtures/api_v2_fixtures.json
@@ -6534,6 +6534,7 @@
                         "fee_required": 900000,
                         "status": "open",
                         "give_asset_info": {
+                            "asset": "XCP",
                             "asset_longname": null,
                             "description": "The Counterparty protocol native currency",
                             "issuer": null,

diff --git a/release-notes/release-notes-v10.9.0.md b/release-notes/release-notes-v10.9.0.md
@@ -13,6 +13,7 @@
 - Catch errors correctly when composing MPMA send
 - Fix query to fill `issuances.asset_events` field
 - Fix `assets_info.supply` field
+- Fix `verbose=True` when `give_asset` or `get_asset` contain an `asset_longname`
 
 ## Codebase