feat: add convex pool, fix price feeds and dola config

Gearbox-protocol · Dec 6, 2024 · d727ceb · d727ceb
1 parent dc274fe
commit d727ceb
Show file tree

Hide file tree

Showing 12 changed files with 319 additions and 190 deletions.
diff --git a/contracts/AdapterData.sol b/contracts/AdapterData.sol
@@ -698,6 +698,13 @@ contract AdapterData {
                 stakedToken: TOKEN_stkcvxGHOcrvUSD
             })
         );
+        convexBasePoolAdapters.push(
+            ConvexBasePoolAdapter({
+                targetContract: Contracts.CONVEX_LLAMA_THENA_POOL,
+                adapterType: AdapterType.CONVEX_V1_BASE_REWARD_POOL,
+                stakedToken: TOKEN_stkcvxllamathena
+            })
+        );
         convexBasePoolAdapters.push(
             ConvexBasePoolAdapter({
                 targetContract: Contracts.AURA_B_RETH_STABLE_POOL,

diff --git a/contracts/ContractType.sol b/contracts/ContractType.sol
@@ -91,6 +91,7 @@ enum Contracts {
     CONVEX_CRVUSD_FRAX_POOL,
     CONVEX_TRI_CRV_POOL,
     CONVEX_GHO_CRVUSD_POOL,
+    CONVEX_LLAMA_THENA_POOL,
     CONVEX_BOOSTER_ARB,
     CONVEX_CRVUSD_USDT_POOL_ARB,
     AURA_BOOSTER,

diff --git a/contracts/PriceFeedDataLive.sol b/contracts/PriceFeedDataLive.sol
@@ -3306,79 +3306,31 @@ contract PriceFeedDataLive {
         );
 
         // ------------------------ FRAXsDAI ------------------------
-        curvePriceFeedsByNetwork[1].push(
-            CurvePriceFeedData({
-                lpToken: TOKEN_FRAXsDAI,
-                assets: TokensLib.arrayOf(TOKEN_FRAX, TOKEN_sDAI),
-                pool: Contracts.CURVE_FRAX_SDAI_POOL,
-                trusted: false,
-                reserve: false
-            })
+        zeroPriceFeedsByNetwork[1].push(
+            SingeTokenPriceFeedData({token: TOKEN_FRAXsDAI, trusted: false, reserve: false})
         );
-        curvePriceFeedsByNetwork[42161].push(
-            CurvePriceFeedData({
-                lpToken: TOKEN_FRAXsDAI,
-                assets: TokensLib.arrayOf(TOKEN_FRAX, TOKEN_sDAI),
-                pool: Contracts.CURVE_FRAX_SDAI_POOL,
-                trusted: false,
-                reserve: false
-            })
+        zeroPriceFeedsByNetwork[42161].push(
+            SingeTokenPriceFeedData({token: TOKEN_FRAXsDAI, trusted: false, reserve: false})
         );
-        curvePriceFeedsByNetwork[10].push(
-            CurvePriceFeedData({
-                lpToken: TOKEN_FRAXsDAI,
-                assets: TokensLib.arrayOf(TOKEN_FRAX, TOKEN_sDAI),
-                pool: Contracts.CURVE_FRAX_SDAI_POOL,
-                trusted: false,
-                reserve: false
-            })
+        zeroPriceFeedsByNetwork[10].push(
+            SingeTokenPriceFeedData({token: TOKEN_FRAXsDAI, trusted: false, reserve: false})
         );
-        curvePriceFeedsByNetwork[8453].push(
-            CurvePriceFeedData({
-                lpToken: TOKEN_FRAXsDAI,
-                assets: TokensLib.arrayOf(TOKEN_FRAX, TOKEN_sDAI),
-                pool: Contracts.CURVE_FRAX_SDAI_POOL,
-                trusted: false,
-                reserve: false
-            })
+        zeroPriceFeedsByNetwork[8453].push(
+            SingeTokenPriceFeedData({token: TOKEN_FRAXsDAI, trusted: false, reserve: false})
         );
 
         // ------------------------ DOLAsUSDe ------------------------
-        curvePriceFeedsByNetwork[1].push(
-            CurvePriceFeedData({
-                lpToken: TOKEN_DOLAsUSDe,
-                assets: TokensLib.arrayOf(TOKEN_DOLA, TOKEN_sUSDe),
-                pool: Contracts.CURVE_DOLA_SUSDE_POOL,
-                trusted: false,
-                reserve: false
-            })
+        zeroPriceFeedsByNetwork[1].push(
+            SingeTokenPriceFeedData({token: TOKEN_DOLAsUSDe, trusted: false, reserve: false})
         );
-        curvePriceFeedsByNetwork[42161].push(
-            CurvePriceFeedData({
-                lpToken: TOKEN_DOLAsUSDe,
-                assets: TokensLib.arrayOf(TOKEN_DOLA, TOKEN_sUSDe),
-                pool: Contracts.CURVE_DOLA_SUSDE_POOL,
-                trusted: false,
-                reserve: false
-            })
+        zeroPriceFeedsByNetwork[42161].push(
+            SingeTokenPriceFeedData({token: TOKEN_DOLAsUSDe, trusted: false, reserve: false})
         );
-        curvePriceFeedsByNetwork[10].push(
-            CurvePriceFeedData({
-                lpToken: TOKEN_DOLAsUSDe,
-                assets: TokensLib.arrayOf(TOKEN_DOLA, TOKEN_sUSDe),
-                pool: Contracts.CURVE_DOLA_SUSDE_POOL,
-                trusted: false,
-                reserve: false
-            })
+        zeroPriceFeedsByNetwork[10].push(
+            SingeTokenPriceFeedData({token: TOKEN_DOLAsUSDe, trusted: false, reserve: false})
         );
-        curvePriceFeedsByNetwork[8453].push(
-            CurvePriceFeedData({
-                lpToken: TOKEN_DOLAsUSDe,
-                assets: TokensLib.arrayOf(TOKEN_DOLA, TOKEN_sUSDe),
-                pool: Contracts.CURVE_DOLA_SUSDE_POOL,
-                trusted: false,
-                reserve: false
-            })
+        zeroPriceFeedsByNetwork[8453].push(
+            SingeTokenPriceFeedData({token: TOKEN_DOLAsUSDe, trusted: false, reserve: false})
         );
 
         // ------------------------ crvCRVETH ------------------------
@@ -5067,6 +5019,40 @@ contract PriceFeedDataLive {
             })
         );
 
+        // ------------------------ cvxllamathena ------------------------
+        theSamePriceFeedsByNetwork[1].push(
+            TheSamePriceFeedData({
+                token: TOKEN_cvxllamathena,
+                tokenHasSamePriceFeed: TOKEN_scrvUsUSDe,
+                trusted: false,
+                reserve: false
+            })
+        );
+        theSamePriceFeedsByNetwork[42161].push(
+            TheSamePriceFeedData({
+                token: TOKEN_cvxllamathena,
+                tokenHasSamePriceFeed: TOKEN_scrvUsUSDe,
+                trusted: false,
+                reserve: false
+            })
+        );
+        theSamePriceFeedsByNetwork[10].push(
+            TheSamePriceFeedData({
+                token: TOKEN_cvxllamathena,
+                tokenHasSamePriceFeed: TOKEN_scrvUsUSDe,
+                trusted: false,
+                reserve: false
+            })
+        );
+        theSamePriceFeedsByNetwork[8453].push(
+            TheSamePriceFeedData({
+                token: TOKEN_cvxllamathena,
+                tokenHasSamePriceFeed: TOKEN_scrvUsUSDe,
+                trusted: false,
+                reserve: false
+            })
+        );
+
         // ------------------------ stkcvx3Crv ------------------------
         theSamePriceFeedsByNetwork[1].push(
             TheSamePriceFeedData({
@@ -5675,6 +5661,40 @@ contract PriceFeedDataLive {
             })
         );
 
+        // ------------------------ stkcvxllamathena ------------------------
+        theSamePriceFeedsByNetwork[1].push(
+            TheSamePriceFeedData({
+                token: TOKEN_stkcvxllamathena,
+                tokenHasSamePriceFeed: TOKEN_scrvUsUSDe,
+                trusted: false,
+                reserve: false
+            })
+        );
+        theSamePriceFeedsByNetwork[42161].push(
+            TheSamePriceFeedData({
+                token: TOKEN_stkcvxllamathena,
+                tokenHasSamePriceFeed: TOKEN_scrvUsUSDe,
+                trusted: false,
+                reserve: false
+            })
+        );
+        theSamePriceFeedsByNetwork[10].push(
+            TheSamePriceFeedData({
+                token: TOKEN_stkcvxllamathena,
+                tokenHasSamePriceFeed: TOKEN_scrvUsUSDe,
+                trusted: false,
+                reserve: false
+            })
+        );
+        theSamePriceFeedsByNetwork[8453].push(
+            TheSamePriceFeedData({
+                token: TOKEN_stkcvxllamathena,
+                tokenHasSamePriceFeed: TOKEN_scrvUsUSDe,
+                trusted: false,
+                reserve: false
+            })
+        );
+
         // ------------------------ cvxcrvUSDT ------------------------
         theSamePriceFeedsByNetwork[1].push(
             TheSamePriceFeedData({

diff --git a/contracts/SupportedContracts.sol b/contracts/SupportedContracts.sol
@@ -547,6 +547,13 @@ contract SupportedContracts is Test, ISupportedContracts {
                 name: "CONVEX_GHO_CRVUSD_POOL"
             })
         );
+        contractDataByNetwork[1].push(
+            ContractData({
+                id: Contracts.CONVEX_LLAMA_THENA_POOL,
+                addr: 0x11fD8801a051b296E337a3e1168839fb346D5940,
+                name: "CONVEX_LLAMA_THENA_POOL"
+            })
+        );
 
         contractDataByNetwork[1].push(
             ContractData({