@gearbox-protocol/sdk 2.1.15 → 2.1.17

package/contracts/PriceFeedDataLive.sol

@@ -20,6 +20,12 @@ struct CurvePriceFeedData {
     Contracts pool;
 }
 
+struct CrvUsdPriceFeedData {
+    Tokens token;
+    Tokens underlying;
+    Contracts pool;
+}
+
 struct TheSamePriceFeedData {
     Tokens token;
     Tokens tokenHasSamePriceFeed;
@@ -70,7 +76,7 @@ contract PriceFeedDataLive {
     mapping(uint256 => GenericLPPriceFeedData[]) wrappedAaveV2PriceFeedsByNetwork;
     mapping(uint256 => GenericLPPriceFeedData[]) compoundV2PriceFeedsByNetwork;
     mapping(uint256 => GenericLPPriceFeedData[]) erc4626PriceFeedsByNetwork;
-    mapping(uint256 => GenericLPPriceFeedData[]) crvUSDPriceFeedsByNetwork;
+    mapping(uint256 => CrvUsdPriceFeedData[]) crvUSDPriceFeedsByNetwork;
     mapping(uint256 => RedStonePriceFeedData[]) redStonePriceFeedsByNetwork;
 
     constructor() {
@@ -765,8 +771,12 @@ contract PriceFeedDataLive {
         );
 
         // ------------------------ crvUSD ------------------------
-        crvUSDPriceFeedsByNetwork[1].push(GenericLPPriceFeedData({lpToken: Tokens.crvUSD, underlying: Tokens.USDC}));
-        crvUSDPriceFeedsByNetwork[42161].push(GenericLPPriceFeedData({lpToken: Tokens.crvUSD, underlying: Tokens.USDC}));
+        crvUSDPriceFeedsByNetwork[1].push(
+            CrvUsdPriceFeedData({token: Tokens.crvUSD, pool: Contracts.CURVE_CRVUSD_USDC_POOL, underlying: Tokens.USDC})
+        );
+        crvUSDPriceFeedsByNetwork[42161].push(
+            CrvUsdPriceFeedData({token: Tokens.crvUSD, pool: Contracts.CURVE_CRVUSD_USDC_POOL, underlying: Tokens.USDC})
+        );
 
         // ------------------------ crvUSDUSDC ------------------------
         curvePriceFeedsByNetwork[1].push(

package/lib/oracles/priceFeeds.js

@@ -496,6 +496,7 @@ exports.priceFeedsByToken = {
     },
     crvUSD: {
         type: pricefeedType_1.PriceFeedType.CURVE_USD_ORACLE,
+        pool: "CURVE_CRVUSD_USDC_POOL",
         underlying: "USDC",
     },
     crvUSDUSDC: {

package/lib/oracles/priceFeeds.spec.js

@@ -1,14 +1,11 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 const chai_1 = require("chai");
 const ethers_1 = require("ethers");
 const chains_1 = require("../core/chains");
 const types_1 = require("../types");
 const formatter_1 = require("../utils/formatter");
-const multicall_1 = __importDefault(require("../utils/multicall"));
+const multicall_1 = require("../utils/multicall");
 const priceFeeds_1 = require("./priceFeeds");
 const pricefeedType_1 = require("./pricefeedType");
 const iFeed = types_1.AggregatorV3Interface__factory.createInterface();
@@ -27,7 +24,7 @@ class PriceFeedsSuite {
             }
             return new ethers_1.ethers.providers.StaticJsonRpcProvider(url, chains_1.CHAINS[c]);
         });
-        const resps = await Promise.all(this.networkTypes.map((_, i) => (0, multicall_1.default)(this.calls[i], providers[i])));
+        const resps = await Promise.all(this.networkTypes.map((_, i) => (0, multicall_1.safeMulticall)(this.calls[i], providers[i])));
         return resps.map((_, i) => this.buildDict(this.calls[i], resps[i]));
     }
     collectCalls(c) {

package/lib/oracles/pricefeedType.d.ts

@@ -1,3 +1,4 @@
+import { CurvePoolContract } from "../contracts/contracts";
 import { NetworkType } from "../core/chains";
 import { AaveV2LPToken } from "../tokens/aave";
 import { NormalToken } from "../tokens/normal";
@@ -89,5 +90,6 @@ export type PriceFeedData = {
     feeds: Record<NetworkType, PriceFeedData>;
 } | {
     type: PriceFeedType.CURVE_USD_ORACLE;
+    pool: CurvePoolContract;
     underlying: NormalToken;
 };

package/lib/tokens/tokens.spec.js

@@ -1,13 +1,10 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 /* eslint-disable max-nested-callbacks */
 const ethers_1 = require("ethers");
 const chains_1 = require("../core/chains");
 const types_1 = require("../types");
-const multicall_1 = __importDefault(require("../utils/multicall"));
+const multicall_1 = require("../utils/multicall");
 const token_1 = require("./token");
 const erc20 = types_1.IERC20Metadata__factory.createInterface();
 const EXCEPTIONS_IN_SYMBOLS = {
@@ -67,7 +64,7 @@ class TokenSuite {
             }
         }
         else {
-            const resps = await (0, multicall_1.default)(this.calls, this.provider);
+            const resps = await (0, multicall_1.safeMulticall)(this.calls, this.provider);
             for (let i = 0; i < resps.length; i++) {
                 const call = this.calls[i];
                 const resp = resps[i];

package/lib/utils/multicall.d.ts

@@ -21,7 +21,7 @@ export declare function multicall<R extends Array<any>>(calls: Array<MCall<any>>
  * @param overrides
  * @returns
  */
-export default function safeMulticall<V = any, T extends MCall<any> = MCall<any>>(calls: T[], p: Signer | ethers.providers.Provider, overrides?: CallOverrides): Promise<Array<{
+export declare function safeMulticall<V = any, T extends MCall<any> = MCall<any>>(calls: T[], p: Signer | ethers.providers.Provider, overrides?: CallOverrides): Promise<Array<{
     error: boolean;
     value?: V;
 }>>;

package/lib/utils/multicall.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MultiCallContract = exports.multicall = void 0;
+exports.MultiCallContract = exports.safeMulticall = exports.multicall = void 0;
 const config_1 = require("../config");
 const types_1 = require("../types");
 async function multicall(calls, p, overrides) {
@@ -37,7 +37,7 @@ async function safeMulticall(calls, p, overrides) {
             : undefined,
     }));
 }
-exports.default = safeMulticall;
+exports.safeMulticall = safeMulticall;
 function unwrapArray(data) {
     if (!data) {
         return data;

package/package.json

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