Merge pull request #214 from Gearbox-protocol/next

feat: next
Gearbox-protocol · Feb 14, 2025 · 4979da5 · 4979da5
2 parents d03c7aa + 18f5091
commit 4979da5
Show file tree

Hide file tree

Showing 22 changed files with 1,581 additions and 586 deletions.
diff --git a/contracts/AdapterData.sol b/contracts/AdapterData.sol
@@ -122,6 +122,9 @@ contract AdapterData {
         simpleAdapters.push(
             SimpleAdapter({targetContract: Contracts.SAVINGS_CRVUSD_VAULT, adapterType: AdapterType.ERC4626_VAULT})
         );
+        simpleAdapters.push(
+            SimpleAdapter({targetContract: Contracts.AAVE_WSTETH_VAULT, adapterType: AdapterType.ERC4626_VAULT})
+        );
         simpleAdapters.push(
             SimpleAdapter({targetContract: Contracts.CONVEX_BOOSTER, adapterType: AdapterType.CONVEX_V1_BOOSTER})
         );
@@ -209,27 +212,6 @@ contract AdapterData {
         simpleAdapters.push(
             SimpleAdapter({targetContract: Contracts.ZIRCUIT_POOL, adapterType: AdapterType.ZIRCUIT_POOL})
         );
-        simpleAdapters.push(
-            SimpleAdapter({targetContract: Contracts.MELLOW_STEAKHOUSE_VAULT, adapterType: AdapterType.MELLOW_LRT_VAULT})
-        );
-        simpleAdapters.push(
-            SimpleAdapter({targetContract: Contracts.MELLOW_RE7_LABS_VAULT, adapterType: AdapterType.MELLOW_LRT_VAULT})
-        );
-        simpleAdapters.push(
-            SimpleAdapter({targetContract: Contracts.MELLOW_AMPHOR_VAULT, adapterType: AdapterType.MELLOW_LRT_VAULT})
-        );
-        simpleAdapters.push(
-            SimpleAdapter({targetContract: Contracts.MELLOW_RESTAKING_VAULT, adapterType: AdapterType.MELLOW_LRT_VAULT})
-        );
-        simpleAdapters.push(
-            SimpleAdapter({targetContract: Contracts.MELLOW_RENZO_VAULT, adapterType: AdapterType.MELLOW_LRT_VAULT})
-        );
-        simpleAdapters.push(
-            SimpleAdapter({
-                targetContract: Contracts.MELLOW_DECENTALIZED_VALIDATOR_VAULT,
-                adapterType: AdapterType.MELLOW_LRT_VAULT
-            })
-        );
         simpleAdapters.push(
             SimpleAdapter({targetContract: Contracts.DAI_USDS, adapterType: AdapterType.DAI_USDS_EXCHANGE})
         );
@@ -522,6 +504,30 @@ contract AdapterData {
                 basePool: Contracts.NO_CONTRACT
             })
         );
+        curveAdapters.push(
+            CurveAdapter({
+                targetContract: Contracts.CURVE_tETH_wstETH_POOL,
+                adapterType: AdapterType.CURVE_STABLE_NG,
+                lpToken: TOKEN_tETHwstETH,
+                basePool: Contracts.NO_CONTRACT
+            })
+        );
+        curveAdapters.push(
+            CurveAdapter({
+                targetContract: Contracts.CURVE_tETH_weETH_POOL,
+                adapterType: AdapterType.CURVE_STABLE_NG,
+                lpToken: TOKEN_tETHweETH,
+                basePool: Contracts.NO_CONTRACT
+            })
+        );
+        curveAdapters.push(
+            CurveAdapter({
+                targetContract: Contracts.CURVE_pzETH_stETH_POOL,
+                adapterType: AdapterType.CURVE_V1_2ASSETS,
+                lpToken: TOKEN_pzETHstETH,
+                basePool: Contracts.NO_CONTRACT
+            })
+        );
         curveAdapters.push(
             CurveAdapter({
                 targetContract: Contracts.CURVE_2CRV_POOL_ARB,

diff --git a/contracts/ContractType.sol b/contracts/ContractType.sol
@@ -46,6 +46,9 @@ enum Contracts {
     CURVE_PUMPBTC_WBTC_POOL,
     CURVE_TRIBTC_POOL,
     CURVE_tBTC_WBTC_POOL,
+    CURVE_tETH_wstETH_POOL,
+    CURVE_tETH_weETH_POOL,
+    CURVE_pzETH_stETH_POOL,
     CURVE_GEAR_POOL,
     CURVE_CRVUSD_USDC_POOL,
     CURVE_CRVUSD_USDT_POOL,
@@ -75,6 +78,7 @@ enum Contracts {
     STAKED_USDE_VAULT,
     STAKED_USDS_VAULT,
     SAVINGS_CRVUSD_VAULT,
+    AAVE_WSTETH_VAULT,
     CONVEX_BOOSTER,
     CONVEX_3CRV_POOL,
     CONVEX_FRAX_USDC_POOL,
@@ -108,6 +112,7 @@ enum Contracts {
     LIDO_STETH_GATEWAY,
     LIDO_WSTETH,
     BALANCER_VAULT,
+    BALANCER_V3_ROUTER,
     UNIVERSAL_ADAPTER,
     AAVE_V2_LENDING_POOL,
     AAVE_V3_LENDING_POOL,