Add ETH bridge conversion test cases and add aiohttp

Author: Tommel71

Makefile

@@ -12,7 +12,7 @@ NUM_THREADS ?= 1
 # Migration test settings
 OLD_SERVER_PORT ?= 9001
 NEW_SERVER_PORT ?= 9000  # Note: adev uses OLD_SERVER_PORT+1 for aux/livereload server
-MIGRATION_BASE_REF ?= master
+MIGRATION_BASE_REF ?= develop
 WORKTREE_DIR ?= ../.graphsense-rest-old
 
 test: install-dev

pyproject.toml

@@ -20,6 +20,7 @@ dependencies = [
     "python-dateutil>=2.9.0",
     "redis>=7.1.0",
     "uvicorn[standard]>=0.32.0",
+    "aiohttp>=3.8.0"
 ]
 
 [project.urls]
@@ -94,6 +95,10 @@ exclude = [
 extend-select = ["T201"]
 
 
+[tool.uv.sources]
+graphsense-lib = { path="../graphsense-lib"}
+
+
 [dependency-groups]
 dev = [
     "gunicorn>=23.0.0",

tests/test_fastapi_migration.py

@@ -37,6 +37,14 @@
 
 HEADERS = {"Content-Type": "application/json", "Accept": "application/json"}
 
+# Headers that simulate authenticated access with private tags permission
+# The X-Consumer-Groups header is typically set by an API gateway
+AUTHENTICATED_HEADERS = {
+    "Content-Type": "application/json",
+    "Accept": "application/json",
+    "X-Consumer-Groups": "tags-private",  # Grants access to private tags
+}
+
 # Test data constants
 BTC_ADDRESS = "1Archive1n2C579dMsAu3iC6tWzuQJz8dN"
 BTC_ADDRESS_PRIVATE_TAGS = "3D4gm7eGSXiEkWS5V3hN9kDVo2eDGBK4eA"  # Address with potentially private tags
@@ -74,10 +82,18 @@ def normalize_endpoint_to_pattern(uri: str) -> str:
     return pattern
 
 
-def get_response(base_url: str, endpoint: str, auth: str = "test") -> tuple[dict, int, float]:
-    """Get response from an endpoint, returning (data, status_code, elapsed_time)."""
+def get_response(base_url: str, endpoint: str, auth: str = "test", authenticated: bool = True) -> tuple[dict, int, float]:
+    """Get response from an endpoint, returning (data, status_code, elapsed_time).
+
+    Args:
+        base_url: The server base URL
+        endpoint: The API endpoint to call
+        auth: Authorization header value
+        authenticated: If True, include X-Consumer-Groups for private tags access
+    """
     url = urljoin(base_url + "/", endpoint.lstrip("/"))
-    headers = {**HEADERS, "Authorization": auth}
+    base_headers = AUTHENTICATED_HEADERS if authenticated else HEADERS
+    headers = {**base_headers, "Authorization": auth}
 
     start = time.time()
     response = requests.get(url, headers=headers, timeout=30)
@@ -91,10 +107,19 @@ def get_response(base_url: str, endpoint: str, auth: str = "test") -> tuple[dict
     return data, response.status_code, elapsed
 
 
-def post_response(base_url: str, endpoint: str, body: dict, auth: str = "test") -> tuple[dict, int, float]:
-    """POST request to an endpoint, returning (data, status_code, elapsed_time)."""
+def post_response(base_url: str, endpoint: str, body: dict, auth: str = "test", authenticated: bool = True) -> tuple[dict, int, float]:
+    """POST request to an endpoint, returning (data, status_code, elapsed_time).
+
+    Args:
+        base_url: The server base URL
+        endpoint: The API endpoint to call
+        body: The JSON body to send
+        auth: Authorization header value
+        authenticated: If True, include X-Consumer-Groups for private tags access
+    """
     url = urljoin(base_url + "/", endpoint.lstrip("/"))
-    headers = {**HEADERS, "Authorization": auth}
+    base_headers = AUTHENTICATED_HEADERS if authenticated else HEADERS
+    headers = {**base_headers, "Authorization": auth}
 
     start = time.time()
     response = requests.post(url, headers=headers, json=body, timeout=60)

tests/test_regression.py

@@ -20,6 +20,13 @@
     "Accept": "application/json"
 }
 
+# Headers to simulate authenticated access (what API gateway provides)
+authenticated_headers = {
+    "Content-Type": "application/json",
+    "Accept": "application/json",
+    "X-Consumer-Groups": "tags-private"  # Simulate gateway adding this on auth
+}
+
 
 def get_data_from_current_endpoint(endpoint: str, key: str) -> tuple[Dict[str, Any], float]:
     """Get data from the current endpoint with API key authentication."""
@@ -39,12 +46,20 @@ def get_data_from_current_endpoint(endpoint: str, key: str) -> tuple[Dict[str, A
         raise
 
 
-def get_data_from_new_endpoint(endpoint: str) -> tuple[Dict[str, Any], float]:
-    """Get data from the new endpoint without authentication."""
+def get_data_from_new_endpoint(endpoint: str, authenticated: bool = True) -> tuple[Dict[str, Any], float]:
+    """Get data from the new endpoint.
+
+    Args:
+        endpoint: The API endpoint to call
+        authenticated: If True, include headers that simulate API gateway auth.
+                      If False, call without auth headers (for anonymous user tests).
+    """
     now = time.time()
     url = urljoin(new_endpoint, endpoint)
     try:
-        response = requests.get(url, headers=headers)
+        # Use authenticated_headers to simulate what the API gateway provides
+        request_headers = authenticated_headers if authenticated else headers
+        response = requests.get(url, headers=request_headers)
         response.raise_for_status()
         elapsed = time.time() - now
         return response.json(), elapsed
@@ -150,11 +165,14 @@ def test_conversions():
     # thor BTC OP RETURN
     call_7_2 = "eth/txs/9ADD0876DC5478BC9658C10033AC59B8C504A5122266DBBBDE289BEEF2DF3D97/conversions" # bridge eth -> btc with log, now supported via OP RETURN
     call_7 = "eth/txs/0xC0915244DC52B5EFC4F602A7C68874D689AB6F8B71D151D39244617030DB89E0/conversions" # bridge eth -> btc without log, direct memo, now supported
+    call_8 = "eth/txs/e2948634dce13d0998dbd65a0f56ffa8d4f070088cce57cc09cc366981073f9f_I321/conversions" # bridge BTC -> ETH , ETH receiving to_asset_transfer subtx
+    call_8_1 = "eth/txs/e2948634dce13d0998dbd65a0f56ffa8d4f070088cce57cc09cc366981073f9f/conversions" # bridge BTC -> ETH , ETH receiving tx (general, not subtx)
     #call_7_3 = "btc/txs/0B7B76EF969D20D3015CA92726F4BA0E2070D6920DDCAC2E61ABB07C72FD1878/conversions"
 
     calls = [
         call_1, call_2, call_3_send, call_3_receive, call_3_refund, call_4_eth_to_token,
         call_4_eth_to_btc_thorchain, call_5, call_6, call_7_2, call_7, #, call_7_2
+        call_8, call_8_1,
     ]
     for call in calls:
         logger.info(f"Testing call: {call}")
@@ -218,7 +236,7 @@ def test_obfuscation():
     call = "btc/addresses/3D4gm7eGSXiEkWS5V3hN9kDVo2eDGBK4eA/tag_summary"
 
     # Get data without auth header (anonymous user)
-    data, _ = get_data_from_new_endpoint(call)
+    data, _ = get_data_from_new_endpoint(call, authenticated=False)
 
     # Anonymous users should still get tags (not zero)
     assert data.get("tag_count", 0) > 0, \