feat: support multiple chain for Compound

Author: HenryQW

openagent/core/constants/chain_ids.py

@@ -0,0 +1,11 @@
+# list obtained from: https://github.com/DefiLlama/chainlist/blob/main/constants/chainIds.js
+# more chains can be added from: https://chainid.network/chains_mini.json
+CHAIN_ID_TO_NETWORK = {
+    1: "ethereum",
+    10: "optimism",
+    137: "polygon",
+    5000: "mantle",
+    8453: "base",
+    42161: "arbitrum",
+    534352: "scroll",
+}

openagent/tools/arbitrum/compound_market_analysis.py

@@ -1,25 +1,26 @@
+import asyncio
 from dataclasses import dataclass
 from textwrap import dedent
-from typing import Optional
+from typing import Optional, List
 
-import httpx
 from langchain.chat_models import init_chat_model
 from langchain.prompts import PromptTemplate
 from langchain_core.output_parsers import StrOutputParser
 from loguru import logger
 from pydantic import BaseModel, Field
 from openagent.agent.config import ModelConfig
+from openagent.core.constants.chain_ids import CHAIN_ID_TO_NETWORK
 from openagent.core.tool import Tool
 from openagent.core.utils.fetch_json import fetch_json
 
 
 @dataclass
 class CompoundMarketData:
     address: str
-    collateralAssets: list[str]
     borrowAPR: float
-    supplyAPR: float
     borrowAPRChange24h: float
+    chain_id: int
+    supplyAPR: float
     supplyAPRChange24h: float
 
 
@@ -28,18 +29,23 @@ class CompoundMarketConfig(BaseModel):
         default=None,
         description="Model configuration for this tool. If not provided, will use agent's core model",
     )
+    chain_ids: List[int] = Field(
+        default_factory=[],
+        description="List of chain IDs to fetch Compound market data from",
+    )
 
 
-class ArbitrumCompoundMarketTool(Tool[CompoundMarketConfig]):
-    def __init__(self, core_model=None):
+class CompoundMarketTool(Tool[CompoundMarketConfig]):
+    def __init__(self, core_model=None, chain_ids: List[int] = []):
         super().__init__()
+        self.chain_ids = chain_ids
         self.core_model = core_model
         self.tool_model = None
         self.tool_prompt = None
 
     @property
     def name(self) -> str:
-        return "arbitrum_compound_market_analysis"
+        return "compound_market_analysis"
 
     @property
     def description(self):
@@ -66,7 +72,6 @@ async def setup(self, config: CompoundMarketConfig) -> None:
 
             ### Data Structure
             - Market object with:
-              - `collateralAssets`: List of supported collateral assets
               - `borrowAPR`: Current borrow APR
               - `supplyAPR`: Current supply APR
               - `borrowAPRChange24h`: 24h borrow APR change
@@ -90,16 +95,16 @@ async def __call__(self) -> str:
             raise RuntimeError("Model not initialized")
 
         try:
-            # Fetch Compound arbitrum-network market data
-            arbitrum_market_list = await self._fetch_compound_arbitrum_market_data()
+            # Fetch Compound market data
+            market_list = await self._fetch_compound_market_data(self.chain_ids)
 
             # Analyze market data
             chain = self.tool_prompt | self.tool_model | StrOutputParser()
 
             # Run analysis chain
             response = await chain.ainvoke(
                 {
-                    "data": arbitrum_market_list,
+                    "data": market_list,
                 }
             )
 
@@ -112,50 +117,70 @@ async def __call__(self) -> str:
             return f"Error in {self.name} tool: {e}"
 
     @staticmethod
-    async def _fetch_compound_arbitrum_market_data() -> list[CompoundMarketData]:
+    async def _fetch_compound_market_data(
+        chain_ids: List[int],
+    ) -> list[CompoundMarketData]:
         results = await fetch_json(
             url="https://v3-api.compound.finance/market/all-networks/all-contracts/summary"
         )
 
-        # Filter for Arbitrum markets (chain_id 42161)
-        arbitrum_markets = [market for market in results if market["chain_id"] == 42161]
+        # Filter for chain_ids
+        markets = [market for market in results if market["chain_id"] in chain_ids]
 
-        market_data = []
+        if not markets:
+            logger.warning("No markets found for the given chain_ids")
+            return []
 
-        for market in arbitrum_markets:
-            # Fetch historical data for each address
-            historical_data = await fetch_json(
-                f"https://v3-api.compound.finance/market/arbitrum-mainnet/{market['comet']['address']}/historical/summary"
-            )
+        async def fetch_historical_data(address: str, chain_id: int) -> dict:
+            """Fetches historical data for a specific market market_address."""
 
-            # Sort historical data by timestamp in descending order (newest first)
-            sorted_data = sorted(
-                historical_data, key=lambda x: x["timestamp"], reverse=True
+            network = CHAIN_ID_TO_NETWORK.get(chain_id)
+            network_path = f"{network}-" if network != "ethereum" else ""
+
+            return await fetch_json(
+                f"https://v3-api.compound.finance/market/{network_path}mainnet/{address}/historical/summary"
             )
 
-            if len(sorted_data) < 2:
-                logger.warning(
-                    f"Insufficient historical data for {market['comet']['address']}"
-                )
+        historical_data_list = await asyncio.gather(
+            *[
+                fetch_historical_data(market["comet"]["address"], market["chain_id"])
+                for market in markets
+            ]
+        )
+
+        market_data = []
+
+        for market, historical_data in zip(markets, historical_data_list):
+            market_address = market["comet"]["address"]
+
+            if len(historical_data) < 2:
+                logger.warning(f"Insufficient historical data for {market_address}")
                 continue
 
-            # Convert string APRs to float
+            # Sort historical data by timestamp (descending)
+            sorted_data = sorted(
+                historical_data, key=lambda x: x["timestamp"], reverse=True
+            )[:2]
+
+            # Convert APR values from string to float
+            # purposely not using get() so it throws an error if the key is missing
+            # which indicates a data structure change with the API response
             current_borrow_apr = float(sorted_data[0]["borrow_apr"])
             current_supply_apr = float(sorted_data[0]["supply_apr"])
             yesterday_borrow_apr = float(sorted_data[1]["borrow_apr"])
             yesterday_supply_apr = float(sorted_data[1]["supply_apr"])
 
-            # Calculate 24h changes
+            # Calculate 24h APR changes
             borrow_apr_change_24h = current_borrow_apr - yesterday_borrow_apr
             supply_apr_change_24h = current_supply_apr - yesterday_supply_apr
 
             market_data.append(
                 CompoundMarketData(
-                    address=market["comet"]["address"],
-                    collateralAssets=market["collateral_asset_symbols"],
+                    address=market_address,
                     borrowAPR=current_borrow_apr,
-                    supplyAPR=current_supply_apr,
                     borrowAPRChange24h=borrow_apr_change_24h,
+                    chain_id=market["chain_id"],
+                    supplyAPR=current_supply_apr,
                     supplyAPRChange24h=supply_apr_change_24h,
                 )
             )