Merge tag 'v23.09-hotfix7' into develop

v23.09-hotfix7
graphsense · Nov 14, 2023 · f5b2030 · f5b2030
2 parents c676742 + f8b6371
commit f5b2030
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/gsrest/db/cassandra.py b/gsrest/db/cassandra.py
@@ -210,7 +210,7 @@ def build_select_address_txs_statement(network: str, table_prefix: str,
              "AND is_outgoing = %(is_outgoing)s ")
 
     # conditional where clause, loop independent
-    query += wc(f"{table_prefix}_id_secondary_group in %(s_d_group)s",
+    query += wc(f"{table_prefix}_id_secondary_group = %(s_d_group)s",
                 eth_like)
 
     query += wc(f"{tx_id_col} >= %(tx_id_lower_bound)s", with_lower_bound)
@@ -1900,17 +1900,21 @@ async def list_address_txs_ordered(
                 with_upper_bound=has_upper_bound,
                 fetch_size=fs_junk)
 
+            if not is_eth_like(network) and item_id_secondary_group is None:
+                item_id_secondary_group = [0]
+
             # prepare parameters for the query junks one for each direction
             # and asset tuple
             params_junks = [{
                 "id": item_id,
                 "g_id": item_id_group,
                 "tx_id_lower_bound": tx_id_lower_bound,
                 "tx_id_upper_bound": page,
-                "s_d_group": item_id_secondary_group,
+                "s_d_group": s_d_group,
                 "currency": asset,
                 "is_outgoing": is_outgoing
-            } for is_outgoing, asset in product(directions, include_assets)]
+            } for is_outgoing, asset, s_d_group in product(directions, include_assets,
+                                                item_id_secondary_group)]
 
             # run one query per direction and asset
             aws = [