@gearbox-protocol/sdk 2.1.18 → 2.1.20

package/lib/apy/curveAPY.js

@@ -23,10 +23,10 @@ const APY_DICTIONARY = {
     crvCVXETH: "crypto-4",
     crvUSDTWBTCWETH: "factory-tricrypto-1",
     LDOETH: "factory-crypto-204",
-    crvUSDUSDC: "",
-    crvUSDUSDT: "",
-    crvUSDFRAX: "",
-    crvUSDETHCRV: "",
+    crvUSDUSDC: "factory-crvusd-0",
+    crvUSDUSDT: "factory-crvusd-1",
+    crvUSDFRAX: "factory-crvusd-4",
+    crvUSDETHCRV: "factory-tricrypto-4", // 0x4eBdF703948ddCEA3B11f675B4D1Fba9d2414A14
 };
 const CRV_APY_RESPONSE_DECIMALS = 100;
 // const CRYPTO = "https://api.curve.fi/api/getPools/ethereum/crypto";
@@ -36,26 +36,24 @@ const CURVE_MAIN_URL = "https://api.curve.fi/api/getPools/ethereum/main";
 const CURVE_FACTORY_CRYPTO_URL = "https://api.curve.fi/api/getPools/ethereum/factory-crypto";
 const CURVE_CRYPTO_URL = "https://api.curve.fi/api/getPools/ethereum/crypto";
 const CURVE_FACTORY_TRICRYPTO_URL = "https://api.curve.fi/api/getPools/ethereum/factory-tricrypto";
+const CURVE_FACTORY_CRVUSD_URL = "https://api.curve.fi/api/getPools/ethereum/factory-crvusd";
 async function getCurveAPY() {
     try {
-        const [{ data: apyData }, { data: main }, { data: factoryCrypto }, { data: crypto }, { data: factoryTricrypto },] = await Promise.all([
+        const [{ data: apyData }, ...restData] = await Promise.all([
             axios_1.default.get(CURVE_APY_URL),
             axios_1.default.get(CURVE_MAIN_URL),
             axios_1.default.get(CURVE_FACTORY_CRYPTO_URL),
             axios_1.default.get(CURVE_CRYPTO_URL),
             axios_1.default.get(CURVE_FACTORY_TRICRYPTO_URL),
+            axios_1.default.get(CURVE_FACTORY_CRVUSD_URL),
         ]);
         const { apys } = apyData || {};
-        const { poolData: mainPoolData = [] } = main?.data || {};
-        const { poolData: factoryCryptoPoolData = [] } = factoryCrypto?.data || {};
-        const { poolData: cryptoPoolData = [] } = crypto?.data || {};
-        const { poolData: factoryTricryptoPoolData = [] } = factoryTricrypto?.data || {};
-        const poolDataByID = Object.fromEntries([
-            ...mainPoolData.map(p => [p.id, p]),
-            ...factoryCryptoPoolData.map(p => [p.id, p]),
-            ...cryptoPoolData.map(p => [p.id, p]),
-            ...factoryTricryptoPoolData.map(p => [p.id, p]),
-        ]);
+        const poolDataByID = Object.fromEntries(restData
+            .map(resp => {
+            const { poolData = [] } = resp?.data?.data || {};
+            return poolData.map(p => [p.id, p]);
+        })
+            .flat(1));
         const curveAPY = mappers_1.TypedObjectUtils.entries(APY_DICTIONARY).reduce((acc, [curveSymbol, poolId]) => {
             const { baseApy, crvApy } = apys[poolId] || {};
             if (baseApy === undefined)

package/lib/oracles/priceFeeds.js

@@ -786,4 +786,43 @@ exports.priceFeedsByToken = {
         type: pricefeedType_1.PriceFeedType.COMPOUND_V2_ORACLE,
         underlying: "WETH",
     },
+    MKR: {
+        type: pricefeedType_1.PriceFeedType.NETWORK_DEPENDENT,
+        feeds: {
+            Mainnet: {
+                type: pricefeedType_1.PriceFeedType.CHAINLINK_ORACLE,
+                address: "0xec1d1b3b0443256cc3860e24a46f108e699484aa",
+            },
+            Arbitrum: {
+                type: pricefeedType_1.PriceFeedType.CHAINLINK_ORACLE,
+                address: "0xde9f0894670c4efcacf370426f10c3ad2cdf147e",
+            },
+        },
+    },
+    RPL: {
+        type: pricefeedType_1.PriceFeedType.NETWORK_DEPENDENT,
+        feeds: {
+            Mainnet: {
+                type: pricefeedType_1.PriceFeedType.CHAINLINK_ORACLE,
+                address: "0x4e155ed98afe9034b7a5962f6c84c86d869daa9d",
+            },
+            Arbitrum: {
+                type: pricefeedType_1.PriceFeedType.CHAINLINK_ORACLE,
+                address: "0x4e155ed98afe9034b7a5962f6c84c86d869daa9d",
+            },
+        },
+    },
+    APE: {
+        type: pricefeedType_1.PriceFeedType.NETWORK_DEPENDENT,
+        feeds: {
+            Mainnet: {
+                type: pricefeedType_1.PriceFeedType.CHAINLINK_ORACLE,
+                address: "0xd10abbc76679a20055e167bb80a24ac851b37056",
+            },
+            Arbitrum: {
+                type: pricefeedType_1.PriceFeedType.CHAINLINK_ORACLE,
+                address: "0x221912ce795669f628c51c69b7d0873eda9c03bb",
+            },
+        },
+    },
 };

package/lib/pathfinder/pathfinder.js

@@ -11,14 +11,19 @@ const GAS_PER_BLOCK = 400e6;
 class PathFinder {
     pathFinder;
     network;
-    static connectors = ["USDC", "WETH", "DAI"];
+    static connectors = [
+        "USDC",
+        "WETH",
+        "DAI",
+        "FRAX",
+    ];
     _connectors;
     constructor(address, provider, network = "Mainnet", connectors = PathFinder.connectors) {
         this.pathFinder = types_1.IRouter__factory.connect(address, provider);
         this.network = network;
         this._connectors = connectors
             .map(c => token_1.tokenDataByNetwork[this.network][c]?.toLowerCase())
-            .filter(t => !t);
+            .filter(t => !!t);
     }
     async findAllSwaps(creditAccount, swapOperation, tokenIn, tokenOut, amount, slippage) {
         const connectors = this.getAvailableConnectors(creditAccount.balances);

package/lib/pathfinder/pathfinder.spec.js

@@ -1,7 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const chai_1 = require("chai");
+const ethers_1 = require("ethers");
 const constants_1 = require("../core/constants");
+const token_1 = require("../tokens/token");
 const pathfinder_1 = require("./pathfinder");
 describe("PathFinder test", () => {
     it("compare works correctly", () => {
@@ -20,4 +22,19 @@ describe("PathFinder test", () => {
         result = pathfinder_1.PathFinder.compare(r1, r2, constants_1.RAY * 2n);
         (0, chai_1.expect)(result).to.be.eql(r1);
     });
+    it("has all expected connectors", () => {
+        const pf = new pathfinder_1.PathFinder("", new ethers_1.providers.JsonRpcProvider(), "Mainnet");
+        const allowedTokens = {
+            [token_1.tokenDataByNetwork.Mainnet.USDC.toLowerCase()]: true,
+            [token_1.tokenDataByNetwork.Mainnet.WETH.toLowerCase()]: true,
+            [token_1.tokenDataByNetwork.Mainnet.DAI.toLowerCase()]: true,
+            [token_1.tokenDataByNetwork.Mainnet.FRAX.toLowerCase()]: true,
+        };
+        (0, chai_1.expect)(pf.getAvailableConnectors(allowedTokens)).to.be.deep.equal([
+            token_1.tokenDataByNetwork.Mainnet.USDC.toLowerCase(),
+            token_1.tokenDataByNetwork.Mainnet.WETH.toLowerCase(),
+            token_1.tokenDataByNetwork.Mainnet.DAI.toLowerCase(),
+            token_1.tokenDataByNetwork.Mainnet.FRAX.toLowerCase(),
+        ]);
+    });
 });

package/lib/tokens/decimals.js

@@ -34,6 +34,9 @@ exports.decimals = {
     ARB: 18,
     RDNT: 18,
     BAL: 18,
+    MKR: 18,
+    RPL: 18,
+    APE: 18,
     "3Crv": 18,
     crvFRAX: 18,
     OHMFRAXBP: 18,

package/lib/tokens/normal.d.ts

@@ -1,7 +1,7 @@
 import { TradeAction } from "../pathfinder/tradeTypes";
 import type { TokenBase } from "./token";
 import { TokenType } from "./tokenType";
-export type NormalToken = "1INCH" | "AAVE" | "COMP" | "CRV" | "DPI" | "FEI" | "LINK" | "SNX" | "UNI" | "USDT" | "USDC" | "DAI" | "WETH" | "WBTC" | "YFI" | "STETH" | "wstETH" | "CVX" | "FRAX" | "FXS" | "LDO" | "LUSD" | "sUSD" | "GUSD" | "LQTY" | "OHM" | "MIM" | "SPELL" | "GMX" | "ARB" | "RDNT" | "BAL" | "ARB" | "SHIB" | "crvUSD";
+export type NormalToken = "1INCH" | "AAVE" | "COMP" | "CRV" | "DPI" | "FEI" | "LINK" | "SNX" | "UNI" | "USDT" | "USDC" | "DAI" | "WETH" | "WBTC" | "YFI" | "STETH" | "wstETH" | "CVX" | "FRAX" | "FXS" | "LDO" | "LUSD" | "sUSD" | "GUSD" | "LQTY" | "OHM" | "MIM" | "SPELL" | "GMX" | "ARB" | "RDNT" | "BAL" | "ARB" | "MKR" | "RPL" | "APE" | "SHIB" | "crvUSD";
 export type NormalTokenData = {
     symbol: NormalToken;
     type: TokenType.NORMAL_TOKEN;

package/lib/tokens/normal.js

@@ -850,6 +850,63 @@ exports.normalTokens = {
             },
         ],
     },
+    MKR: {
+        name: "MKR",
+        symbol: "MKR",
+        type: tokenType_1.TokenType.NORMAL_TOKEN,
+        swapActions: [
+            {
+                type: tradeTypes_1.TradeType.UniswapV3Swap,
+                contract: "UNISWAP_V3_ROUTER",
+            },
+            {
+                type: tradeTypes_1.TradeType.UniswapV2Swap,
+                contract: "UNISWAP_V2_ROUTER",
+            },
+            {
+                type: tradeTypes_1.TradeType.UniswapV2Swap,
+                contract: "SUSHISWAP_ROUTER",
+            },
+        ],
+    },
+    RPL: {
+        name: "RPL",
+        symbol: "RPL",
+        type: tokenType_1.TokenType.NORMAL_TOKEN,
+        swapActions: [
+            {
+                type: tradeTypes_1.TradeType.UniswapV3Swap,
+                contract: "UNISWAP_V3_ROUTER",
+            },
+            {
+                type: tradeTypes_1.TradeType.UniswapV2Swap,
+                contract: "UNISWAP_V2_ROUTER",
+            },
+            {
+                type: tradeTypes_1.TradeType.UniswapV2Swap,
+                contract: "SUSHISWAP_ROUTER",
+            },
+        ],
+    },
+    APE: {
+        name: "APE",
+        symbol: "APE",
+        type: tokenType_1.TokenType.NORMAL_TOKEN,
+        swapActions: [
+            {
+                type: tradeTypes_1.TradeType.UniswapV3Swap,
+                contract: "UNISWAP_V3_ROUTER",
+            },
+            {
+                type: tradeTypes_1.TradeType.UniswapV2Swap,
+                contract: "UNISWAP_V2_ROUTER",
+            },
+            {
+                type: tradeTypes_1.TradeType.UniswapV2Swap,
+                contract: "SUSHISWAP_ROUTER",
+            },
+        ],
+    },
 };
 const isNormalToken = (t) => typeof t === "string" && !!exports.normalTokens[t];
 exports.isNormalToken = isNormalToken;

package/lib/tokens/quoted.d.ts

@@ -0,0 +1,3 @@
+import { NetworkType } from "../core/chains";
+import { SupportedToken } from "./token";
+export declare const nonQuoted: Record<NetworkType, Array<SupportedToken>>;

package/lib/tokens/quoted.js

@@ -0,0 +1,7 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.nonQuoted = void 0;
+exports.nonQuoted = {
+    Mainnet: ["WETH", "DAI", "USDC", "FRAX"],
+    Arbitrum: ["WETH", "DAI", "USDC", "WBTC"],
+};

package/lib/tokens/token.js

@@ -64,6 +64,9 @@ exports.tokenDataByNetwork = {
         sUSD: "0x57Ab1ec28D129707052df4dF418D58a2D46d5f51",
         GUSD: "0x056Fd409E1d7A124BD7017459dFEa2F387b6d5Cd",
         LQTY: "0x6DEA81C8171D0bA574754EF6F8b412F2Ed88c54D",
+        MKR: "0x9f8F72aA9304c8B593d555F12eF6589cC3A579A2",
+        RPL: "0xB4EFd85c19999D84251304bDA99E90B92300Bd93",
+        APE: "0x4d224452801ACEd8B2F0aebE155379bb5D594381",
         // CURVE LP TOKENS
         "3Crv": "0x6c3F90f043a72FA612cbac8115EE7e52BDe6E490",
         crvFRAX: "0x3175Df0976dFA876431C2E9eE6Bc45b65d3473CC",
@@ -184,6 +187,9 @@ exports.tokenDataByNetwork = {
         sUSD: "0xA970AF1a584579B618be4d69aD6F73459D112F95",
         GUSD: constants_1.NOT_DEPLOYED,
         LQTY: "0xfb9E5D956D889D91a82737B9bFCDaC1DCE3e1449",
+        MKR: constants_1.NOT_DEPLOYED,
+        RPL: constants_1.NOT_DEPLOYED,
+        APE: constants_1.NOT_DEPLOYED,
         // REDSTONE
         SHIB: constants_1.NOT_DEPLOYED,
         // YEARN TOKENS

package/lib/tokens/tokenData.js

@@ -22,20 +22,7 @@ class TokenData {
 }
 exports.TokenData = TokenData;
 exports.connectors = {
-    Mainnet: [
-        "WETH",
-        "1INCH",
-        "DAI",
-        "USDC",
-        // "USDT",
-        "WBTC",
-        // "stETH",
-        // "PAX",
-        // "TUSD",
-        // "BNT",
-        // "BAL",
-        // "sUSD",
-    ],
+    Mainnet: ["WETH", "DAI", "USDC", "FRAX"],
     Arbitrum: ["WETH", "DAI", "USDC", "WBTC"],
 };
 function getConnectors(networkType) {

package/package.json

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