@gearbox-protocol/sdk 0.0.50 → 0.0.53

package/lib/core/tradeTypes.d.ts

@@ -10,9 +10,12 @@ export declare enum TradeType {
     YearnDeposit = 6,
     YearnWithdraw = 7,
     LidoStake = 8,
-    ConvexDeposit = 9,
+    ConvexDepositLP = 9,
     ConvexStake = 10,
-    ConvexDepositAndStake = 11
+    ConvexDepositLPAndStake = 11,
+    ConvexWithdrawLP = 12,
+    ConvexWithdraw = 13,
+    ConvexWithdrawAndUnwrap = 14
 }
 export declare type TradeAction = {
     type: TradeType.UniswapV2Swap;
@@ -45,15 +48,27 @@ export declare type TradeAction = {
     contract: "LIDO_STETH_GATEWAY";
     tokenOut: NormalToken;
 } | {
-    type: TradeType.ConvexDeposit;
-    contract: ConvexPoolContract;
+    type: TradeType.ConvexDepositLP;
+    contract: "CONVEX_BOOSTER";
     tokenOut: ConvexLPToken;
 } | {
     type: TradeType.ConvexStake;
     contract: ConvexPoolContract;
     tokenOut: ConvexStakedPhantomToken;
 } | {
-    type: TradeType.ConvexDepositAndStake;
-    contract: ConvexPoolContract;
+    type: TradeType.ConvexDepositLPAndStake;
+    contract: "CONVEX_BOOSTER";
     tokenOut: ConvexStakedPhantomToken;
+} | {
+    type: TradeType.ConvexWithdrawLP;
+    contract: "CONVEX_BOOSTER";
+    tokenOut: CurveLPToken;
+} | {
+    type: TradeType.ConvexWithdraw;
+    contract: ConvexPoolContract;
+    tokenOut: ConvexLPToken;
+} | {
+    type: TradeType.ConvexWithdrawAndUnwrap;
+    contract: ConvexPoolContract;
+    tokenOut: CurveLPToken;
 };

package/lib/core/tradeTypes.js

@@ -12,7 +12,10 @@ var TradeType;
     TradeType[TradeType["YearnDeposit"] = 6] = "YearnDeposit";
     TradeType[TradeType["YearnWithdraw"] = 7] = "YearnWithdraw";
     TradeType[TradeType["LidoStake"] = 8] = "LidoStake";
-    TradeType[TradeType["ConvexDeposit"] = 9] = "ConvexDeposit";
+    TradeType[TradeType["ConvexDepositLP"] = 9] = "ConvexDepositLP";
     TradeType[TradeType["ConvexStake"] = 10] = "ConvexStake";
-    TradeType[TradeType["ConvexDepositAndStake"] = 11] = "ConvexDepositAndStake";
+    TradeType[TradeType["ConvexDepositLPAndStake"] = 11] = "ConvexDepositLPAndStake";
+    TradeType[TradeType["ConvexWithdrawLP"] = 12] = "ConvexWithdrawLP";
+    TradeType[TradeType["ConvexWithdraw"] = 13] = "ConvexWithdraw";
+    TradeType[TradeType["ConvexWithdrawAndUnwrap"] = 14] = "ConvexWithdrawAndUnwrap";
 })(TradeType = exports.TradeType || (exports.TradeType = {}));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gearbox-protocol/sdk",
-  "version": "0.0.50",
+  "version": "0.0.53",
   "description": "Gearbox SDK",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",

package/src/core/contracts.ts

@@ -7,37 +7,33 @@
 import { AdapterInterface } from "./adapters";
 import { NetworkType } from "./constants";
 import { Protocols } from "./protocols";
-import {
-  ConvexStakedPhantomToken,
-  CurveLPToken,
-  NormalToken,
-  tokenDataByNetwork
-} from "./token";
+import { CurveLPToken, NormalToken, ConvexStakedPhantomToken, tokenDataByNetwork } from "./token";
+
 
 export type UniswapV2Contract = "UNISWAP_V2_ROUTER" | "SUSHISWAP_ROUTER";
 
 export type CurvePoolContract =
-  | "CURVE_3POOL"
+  | "CURVE_3CRV_POOL"
   | "CURVE_STETH_GATEWAY"
-  | "CURVE_FRAX"
-  | "CURVE_LUSD"
-  | "CURVE_GUSD"
-  | "CURVE_SUSD";
+  | "CURVE_FRAX_POOL"
+  | "CURVE_LUSD_POOL"
+  | "CURVE_GUSD_POOL"
+  | "CURVE_SUSD_POOL";
 
 export type YearnVaultContract =
-  | "YEARN_DAI"
-  | "YEARN_USDC"
-  | "YEARN_WETH"
-  | "YEARN_WBTC"
-  | "YEARN_CURVE_FRAX"
-  | "YEARN_CURVE_STETH";
+  | "YEARN_DAI_VAULT"
+  | "YEARN_USDC_VAULT"
+  | "YEARN_WETH_VAULT"
+  | "YEARN_WBTC_VAULT"
+  | "YEARN_CURVE_FRAX_VAULT"
+  | "YEARN_CURVE_STETH_VAULT";
 
 export type ConvexPoolContract =
-  | "CONVEX_3CRV"
-  | "CONVEX_GUSD"
-  | "CONVEX_SUSD"
-  | "CONVEX_STECRV"
-  | "CONVEX_FRAX3CRV";
+  | "CONVEX_3CRV_POOL"
+  | "CONVEX_GUSD_POOL"
+  | "CONVEX_SUSD_POOL"
+  | "CONVEX_STECRV_POOL"
+  | "CONVEX_FRAX3CRV_POOL";
 
 export type SupportedContract =
   | UniswapV2Contract
@@ -59,32 +55,32 @@ export const contractsByNetwork: Record<
     SUSHISWAP_ROUTER: "0xd9e1cE17f2641f24aE83637ab66a2cca9C378B9F",
 
     // CURVE
-    CURVE_3POOL: "0xbEbc44782C7dB0a1A60Cb6fe97d0b483032FF1C7", // SEPARATE TOKEN
-    CURVE_STETH_GATEWAY: "", // SEPARATE TOKEN
-    CURVE_FRAX: tokenDataByNetwork.Mainnet.FRAX3CRV,
-    CURVE_LUSD: tokenDataByNetwork.Mainnet.LUSD3CRV,
-    CURVE_SUSD: "0xA5407eAE9Ba41422680e2e00537571bcC53efBfD", // SEPARATE TOKEN
-    CURVE_GUSD: "0x4f062658EaAF2C1ccf8C8e36D6824CDf41167956", // SEPARATE TOKEN
+    CURVE_3CRV_POOL: "0xbEbc44782C7dB0a1A60Cb6fe97d0b483032FF1C7", // SEPARATE TOKEN
+    CURVE_STETH_GATEWAY: "0xB949Ef5b39164537ee97BF17b968e465368C97AD", // SEPARATE TOKEN
+    CURVE_FRAX_POOL: tokenDataByNetwork.Mainnet.FRAX3CRV,
+    CURVE_LUSD_POOL: tokenDataByNetwork.Mainnet.LUSD3CRV,
+    CURVE_SUSD_POOL: "0xA5407eAE9Ba41422680e2e00537571bcC53efBfD", // SEPARATE TOKEN
+    CURVE_GUSD_POOL: "0x4f062658EaAF2C1ccf8C8e36D6824CDf41167956", // SEPARATE TOKEN
 
     // YEARN
-    YEARN_DAI: tokenDataByNetwork.Mainnet.yvDAI,
-    YEARN_USDC: tokenDataByNetwork.Mainnet.yvUSDC,
-    YEARN_WETH: tokenDataByNetwork.Mainnet.yvWETH,
-    YEARN_WBTC: tokenDataByNetwork.Mainnet.yvWBTC,
-    YEARN_CURVE_FRAX: tokenDataByNetwork.Mainnet.yvCurve_FRAX,
-    YEARN_CURVE_STETH: tokenDataByNetwork.Mainnet.yvCurve_stETH,
+    YEARN_DAI_VAULT: tokenDataByNetwork.Mainnet.yvDAI,
+    YEARN_USDC_VAULT: tokenDataByNetwork.Mainnet.yvUSDC,
+    YEARN_WETH_VAULT: tokenDataByNetwork.Mainnet.yvWETH,
+    YEARN_WBTC_VAULT: tokenDataByNetwork.Mainnet.yvWBTC,
+    YEARN_CURVE_FRAX_VAULT: tokenDataByNetwork.Mainnet.yvCURVE_FRAX_POOL,
+    YEARN_CURVE_STETH_VAULT: tokenDataByNetwork.Mainnet.yvCurve_stETH,
 
     // CONVEX
     CONVEX_BOOSTER: "0xF403C135812408BFbE8713b5A23a04b3D48AAE31",
-    CONVEX_3CRV: "0x689440f2Ff927E1f24c72F1087E1FAF471eCe1c8",
-    CONVEX_GUSD: "0x7A7bBf95C44b144979360C3300B54A7D34b44985",
-    CONVEX_SUSD: "0x22eE18aca7F3Ee920D01F25dA85840D12d98E8Ca",
-    CONVEX_STECRV: "0x0A760466E1B4621579a82a39CB56Dda2F4E70f03",
-    CONVEX_FRAX3CRV: "0xB900EF131301B307dB5eFcbed9DBb50A3e209B2e",
+    CONVEX_3CRV_POOL: "0x689440f2Ff927E1f24c72F1087E1FAF471eCe1c8",
+    CONVEX_GUSD_POOL: "0x7A7bBf95C44b144979360C3300B54A7D34b44985",
+    CONVEX_SUSD_POOL: "0x22eE18aca7F3Ee920D01F25dA85840D12d98E8Ca",
+    CONVEX_STECRV_POOL: "0x0A760466E1B4621579a82a39CB56Dda2F4E70f03",
+    CONVEX_FRAX3CRV_POOL: "0xB900EF131301B307dB5eFcbed9DBb50A3e209B2e",
     CONVEX_CLAIM_ZAP: "0x92Cf9E5e4D1Dfbf7dA0d2BB3e884a68416a65070",
 
     // LIDO
-    LIDO_STETH_GATEWAY: ""
+    LIDO_STETH_GATEWAY: "0x55045Eaae19d92680E02231e4Ce7bBEB4814ca64"
   },
   Kovan: {
     UNISWAP_V2_ROUTER: "0x7a250d5630B4cF539739dF2C5dAcb4c659F2488D",
@@ -92,28 +88,28 @@ export const contractsByNetwork: Record<
     SUSHISWAP_ROUTER: "0x1b02dA8Cb0d097eB8D57A175b88c7D8b47997506",
 
     // CURVE
-    CURVE_3POOL: "0x769C784D1e958672bDef04cf12Fd5399b3db0f27",
+    CURVE_3CRV_POOL: "0x769C784D1e958672bDef04cf12Fd5399b3db0f27",
     CURVE_STETH_GATEWAY: "",
-    CURVE_FRAX: "",
-    CURVE_LUSD: tokenDataByNetwork.Kovan.LUSD3CRV,
-    CURVE_SUSD: "0x032f1cE00865F3499C0052ceBA5F2348842416DB", // SEPARATE TOKEN
-    CURVE_GUSD: "",
+    CURVE_FRAX_POOL: "",
+    CURVE_LUSD_POOL: tokenDataByNetwork.Kovan.LUSD3CRV,
+    CURVE_SUSD_POOL: "0x032f1cE00865F3499C0052ceBA5F2348842416DB", // SEPARATE TOKEN
+    CURVE_GUSD_POOL: "",
 
     // YEARN
-    YEARN_DAI: tokenDataByNetwork.Kovan.yvDAI,
-    YEARN_USDC: tokenDataByNetwork.Kovan.yvUSDC,
-    YEARN_WETH: tokenDataByNetwork.Kovan.yvWETH,
-    YEARN_WBTC: tokenDataByNetwork.Kovan.yvWBTC,
-    YEARN_CURVE_FRAX: tokenDataByNetwork.Kovan.yvCurve_FRAX,
-    YEARN_CURVE_STETH: tokenDataByNetwork.Kovan.yvCurve_stETH,
+    YEARN_DAI_VAULT: tokenDataByNetwork.Kovan.yvDAI,
+    YEARN_USDC_VAULT: tokenDataByNetwork.Kovan.yvUSDC,
+    YEARN_WETH_VAULT: tokenDataByNetwork.Kovan.yvWETH,
+    YEARN_WBTC_VAULT: tokenDataByNetwork.Kovan.yvWBTC,
+    YEARN_CURVE_FRAX_VAULT: tokenDataByNetwork.Kovan.yvCURVE_FRAX_POOL,
+    YEARN_CURVE_STETH_VAULT: tokenDataByNetwork.Kovan.yvCurve_stETH,
 
     // CONVEX
     CONVEX_BOOSTER: "0x78A9261965F048b9FF055699569be4400EEC7005",
-    CONVEX_3CRV: "0x90D9E8ecc406cd7363C08fAdb4ac0f3994b4cA71",
-    CONVEX_GUSD: "",
-    CONVEX_SUSD: "",
-    CONVEX_STECRV: "0x0f64e188BFF97e09C71FF85f30509f5596D420dD",
-    CONVEX_FRAX3CRV: "",
+    CONVEX_3CRV_POOL: "0x90D9E8ecc406cd7363C08fAdb4ac0f3994b4cA71",
+    CONVEX_GUSD_POOL: "",
+    CONVEX_SUSD_POOL: "",
+    CONVEX_STECRV_POOL: "0x0f64e188BFF97e09C71FF85f30509f5596D420dD",
+    CONVEX_FRAX3CRV_POOL: "",
     CONVEX_CLAIM_ZAP: "",
 
     // LIDO
@@ -186,7 +182,7 @@ export const contractParams: Record<SupportedContract, ContractParams> = {
     protocol: Protocols.Sushiswap,
     type: AdapterInterface.UNISWAP_V2_ROUTER
   },
-  CURVE_3POOL: {
+  CURVE_3CRV_POOL: {
     protocol: Protocols.Curve,
     type: AdapterInterface.CURVE_V1_3ASSETS,
     lpToken: "3Crv",
@@ -200,52 +196,52 @@ export const contractParams: Record<SupportedContract, ContractParams> = {
       Kovan: "0xF695d3aa358D5087A0C157DBb9449d4f0d8E534a"
     }
   },
-  CURVE_FRAX: {
+  CURVE_FRAX_POOL: {
     protocol: Protocols.Curve,
     type: AdapterInterface.CURVE_V1_2ASSETS,
     lpToken: "FRAX3CRV",
     tokens: ["3Crv", "FRAX"]
   },
-  CURVE_LUSD: {
+  CURVE_LUSD_POOL: {
     protocol: Protocols.Curve,
     type: AdapterInterface.CURVE_V1_2ASSETS,
     lpToken: "LUSD3CRV",
-    tokens: ["3Crv", "FRAX"]
+    tokens: ["3Crv", "LUSD"]
   },
-  CURVE_SUSD: {
+  CURVE_SUSD_POOL: {
     protocol: Protocols.Curve,
-    type: AdapterInterface.CURVE_V1_2ASSETS,
+    type: AdapterInterface.CURVE_V1_4ASSETS,
     lpToken: "crvPlain3andSUSD",
-    tokens: ["3Crv", "FRAX"]
+    tokens: ["DAI", "USDC", "USDT", "sUSD"]
   },
-  CURVE_GUSD: {
+  CURVE_GUSD_POOL: {
     protocol: Protocols.Curve,
     type: AdapterInterface.CURVE_V1_2ASSETS,
     lpToken: "gusd3CRV",
     tokens: ["3Crv", "FRAX"]
   },
-  YEARN_DAI: {
+  YEARN_DAI_VAULT: {
     protocol: Protocols.Yearn,
     type: AdapterInterface.YEARN_V2
   },
 
-  YEARN_USDC: {
+  YEARN_USDC_VAULT: {
     protocol: Protocols.Yearn,
     type: AdapterInterface.YEARN_V2
   },
-  YEARN_WETH: {
+  YEARN_WETH_VAULT: {
     protocol: Protocols.Yearn,
     type: AdapterInterface.YEARN_V2
   },
-  YEARN_WBTC: {
+  YEARN_WBTC_VAULT: {
     protocol: Protocols.Yearn,
     type: AdapterInterface.YEARN_V2
   },
-  YEARN_CURVE_FRAX: {
+  YEARN_CURVE_FRAX_VAULT: {
     protocol: Protocols.Yearn,
     type: AdapterInterface.YEARN_V2
   },
-  YEARN_CURVE_STETH: {
+  YEARN_CURVE_STETH_VAULT: {
     protocol: Protocols.Yearn,
     type: AdapterInterface.YEARN_V2
   },
@@ -253,27 +249,27 @@ export const contractParams: Record<SupportedContract, ContractParams> = {
     protocol: Protocols.Convex,
     type: AdapterInterface.CONVEX_V1_BOOSTER
   },
-  CONVEX_3CRV: {
+  CONVEX_3CRV_POOL: {
     protocol: Protocols.Convex,
     type: AdapterInterface.CONVEX_V1_BASE_REWARD_POOL,
     stakedToken: "stkcvx3Crv"
   },
-  CONVEX_GUSD: {
+  CONVEX_GUSD_POOL: {
     protocol: Protocols.Convex,
     type: AdapterInterface.CONVEX_V1_BASE_REWARD_POOL,
     stakedToken: "stkcvxgusd3CRV"
   },
-  CONVEX_SUSD: {
+  CONVEX_SUSD_POOL: {
     protocol: Protocols.Convex,
     type: AdapterInterface.CONVEX_V1_BASE_REWARD_POOL,
     stakedToken: "stkcvxcrvPlain3andSUSD"
   },
-  CONVEX_STECRV: {
+  CONVEX_STECRV_POOL: {
     protocol: Protocols.Convex,
     type: AdapterInterface.CONVEX_V1_BASE_REWARD_POOL,
     stakedToken: "stkcvxsteCRV"
   },
-  CONVEX_FRAX3CRV: {
+  CONVEX_FRAX3CRV_POOL: {
     protocol: Protocols.Convex,
     type: AdapterInterface.CONVEX_V1_BASE_REWARD_POOL,
     stakedToken: "stkcvxFRAX3CRV"

package/src/core/contractsRegister.ts

@@ -15,10 +15,10 @@ export const deployedContracts: Record<string, string> = {
 
   // [UNISWAP_V2_ROUTER]: "Uniswap V2",
   // [UNISWAP_V3_ROUTER]: "Uniswap V3",
-  // [CURVE_3POOL_ADDRESS]: "Curve 3Pool",
+  // [CURVE_3CRV_POOL_ADDRESS]: "Curve 3Pool",
   // [SUSHISWAP_MAINNET]: "Sushiswap",
-  // [YEARN_DAI_ADDRESS]: "Yearn DAI",
-  // [YEARN_USDC_ADDRESS]: "Yearn USDC",
+  // [YEARN_DAI_VAULT_ADDRESS]: "Yearn DAI",
+  // [YEARN_USDC_VAULT_ADDRESS]: "Yearn USDC",
 
   // KOVAN
   "0xc40B71BCcb749D91923654571f715Bf1FC464E66": "DAI",
@@ -29,8 +29,8 @@ export const deployedContracts: Record<string, string> = {
   "0x600073357c29d169aAF3E543A4519749830553F1": "WETH",
   "0xdBAd1361d9A03B81Be8D3a54Ef0dc9e39a1bA5b3": "USDC",
   "0x50d1fA47b0D88BA0D108148B8481b4A762eFB99e": "DAI",
-  // [YEARN_DAI_KOVAN_MOCK]: "Yearn DAI",
-  // [YEARN_USDC_KOVAN_MOCK]: "Yearn USDC",
+  // [YEARN_DAI_VAULT_KOVAN_MOCK]: "Yearn DAI",
+  // [YEARN_USDC_VAULT_KOVAN_MOCK]: "Yearn USDC",
   // [SUSHISWAP_KOVAN]: "Sushiswap"
 };
 

package/src/core/priceFeeds.ts

@@ -390,7 +390,7 @@ export const priceFeedsByNetwork: Record<SupportedToken, TokenPriceFeedData> = {
       curveSymbol: "steCRV"
     }
   },
-  yvCurve_FRAX: {
+  yvCURVE_FRAX_POOL: {
     priceFeedUSD: {
       type: OracleType.YEARN_CURVE_LP_ORACLE,
       curveSymbol: "FRAX3CRV"