Add fixes.

backend/moonstream/actions.py

@@ -287,14 +287,13 @@ def parse_search_query_to_sqlalchemy_filters(q: str, allowed_addresses: List[str
 
 def get_address_labels(
     db_session: Session, start: int, limit: int, addresses: Optional[List[str]] = None
-) -> List[EthereumAddress]:
+) -> data.AddressListLabelsResponse:
     """
     Attach labels to addresses.
     """
     query = db_session.query(EthereumAddress)
     if addresses is not None:
-        addresses_list = addresses.split(",")
-        query = query.filter(EthereumAddress.address.in_(addresses_list))
+        query = query.filter(EthereumAddress.address.in_(addresses))
 
     addresses_obj = query.order_by(EthereumAddress.id).slice(start, start + limit).all()
 

backend/moonstream/routes/txinfo.py

@@ -6,7 +6,7 @@ transactions, etc.) with side information and return objects that are better sui
 end users.
 """
 import logging
-from typing import Dict, Optional
+from typing import Dict, List, Optional
 
 from fastapi import FastAPI, Depends, HTTPException, Query
 from fastapi.middleware.cors import CORSMiddleware
@@ -92,8 +92,8 @@ async def txinfo_ethereum_blockchain_handler(
 )
 async def addresses_labels_handler(
     addresses: Optional[str] = Query(None),
-    start: Optional[int] = Query(0),
-    limit: Optional[int] = Query(100),
+    start: int = Query(0),
+    limit: int = Query(100),
     db_session: Session = Depends(yield_db_session),
 ) -> data.AddressListLabelsResponse:
     """
@@ -105,11 +105,15 @@ async def addresses_labels_handler(
             status_code=406, detail="The limit cannot exceed 100 addresses"
         )
     try:
-        addresses = actions.get_address_labels(
-            db_session=db_session, start=start, limit=limit, addresses=addresses
+        addresses_list: Optional[List[str]] = None
+        if addresses is not None:
+            addresses_list = addresses.split(",")
+
+        address_labels = actions.get_address_labels(
+            db_session=db_session, start=start, limit=limit, addresses=addresses_list
         )
     except Exception as err:
         logger.error(f"Unable to get info about Ethereum addresses {err}")
         raise HTTPException(status_code=500)
 
-    return addresses
+    return address_labels

backend/moonstream/settings.py

@@ -12,13 +12,16 @@ MOONSTREAM_APPLICATION_ID = os.environ.get("MOONSTREAM_APPLICATION_ID", "")
 if MOONSTREAM_APPLICATION_ID == "":
     raise ValueError("MOONSTREAM_APPLICATION_ID environment variable must be set")
 
-MOONSTREAM_DATA_JOURNAL_ID = os.environ.get("MOONSTREAM_DATA_JOURNAL_ID")
+MOONSTREAM_DATA_JOURNAL_ID = os.environ.get(
+    "MOONSTREAM_DATA_JOURNAL_ID",
+)
 if MOONSTREAM_DATA_JOURNAL_ID is None:
     raise ValueError("MOONSTREAM_DATA_JOURNAL_ID environment variable must be set")
 
-MOONSTREAM_ADMIN_ACCESS_TOKEN = os.environ.get("MOONSTREAM_ADMIN_ACCESS_TOKEN")
-if MOONSTREAM_ADMIN_ACCESS_TOKEN is None:
+RAW_MOONSTREAM_ADMIN_ACCESS_TOKEN = os.environ.get("MOONSTREAM_ADMIN_ACCESS_TOKEN")
+if RAW_MOONSTREAM_ADMIN_ACCESS_TOKEN is None:
     raise ValueError("MOONSTREAM_ADMIN_ACCESS_TOKEN environment variable must be set")
+MOONSTREAM_ADMIN_ACCESS_TOKEN = RAW_MOONSTREAM_ADMIN_ACCESS_TOKEN
 
 # Origin
 RAW_ORIGINS = os.environ.get("MOONSTREAM_CORS_ALLOWED_ORIGINS")