@curvefi/api 2.36.0 → 2.36.1

package/lib/constants/pools/ethereum.js

@@ -1626,7 +1626,7 @@ export var POOLS_DATA_ETHEREUM = lowerCasePoolDataAddresses({
         reference_asset: 'ETH',
         swap_address: '0xBfAb6FA95E0091ed66058ad493189D2cB29385E6',
         token_address: '0xBfAb6FA95E0091ed66058ad493189D2cB29385E6',
-        gauge_address: '0x0000000000000000000000000000000000000000',
+        gauge_address: '0x50161102a240b1456d770Dbb55c76d8dc2D160Aa',
         is_plain: true,
         underlying_coins: ['ETH', 'wBETH'],
         wrapped_coins: ['ETH', 'wBETH'],

package/lib/external-api.d.ts

@@ -1,6 +1,7 @@
 import memoize from "memoizee";
 import { IExtendedPoolDataFromApi, ISubgraphPoolData, IDict, INetworkName } from "./interfaces";
 export declare const _getPoolsFromApi: ((network: INetworkName, poolType: "main" | "crypto" | "factory" | "factory-crvusd" | "factory-crypto") => Promise<IExtendedPoolDataFromApi>) & memoize.Memoized<(network: INetworkName, poolType: "main" | "crypto" | "factory" | "factory-crvusd" | "factory-crypto") => Promise<IExtendedPoolDataFromApi>>;
+export declare const _getAllPoolsFromApi: (network: INetworkName) => Promise<IExtendedPoolDataFromApi[]>;
 export declare const _getSubgraphData: ((network: INetworkName) => Promise<{
     poolsData: ISubgraphPoolData[];
     totalVolume: number;

package/lib/external-api.js

@@ -53,6 +53,20 @@ export var _getPoolsFromApi = memoize(function (network, poolType) { return __aw
     promise: true,
     maxAge: 5 * 60 * 1000, // 5m
 });
+export var _getAllPoolsFromApi = function (network) { return __awaiter(void 0, void 0, void 0, function () {
+    return __generator(this, function (_a) {
+        switch (_a.label) {
+            case 0: return [4 /*yield*/, Promise.all([
+                    _getPoolsFromApi(network, "main"),
+                    _getPoolsFromApi(network, "crypto"),
+                    _getPoolsFromApi(network, "factory"),
+                    _getPoolsFromApi(network, "factory-crvusd"),
+                    _getPoolsFromApi(network, "factory-crypto"),
+                ])];
+            case 1: return [2 /*return*/, _a.sent()];
+        }
+    });
+}); };
 export var _getSubgraphData = memoize(function (network) { return __awaiter(void 0, void 0, void 0, function () {
     var url, response;
     var _a, _b, _c, _d;

package/lib/pools/PoolTemplate.js

@@ -183,10 +183,13 @@ var PoolTemplate = /** @class */ (function () {
                         case 3:
                             if (!useApi) return [3 /*break*/, 5];
                             network = curve.constants.NETWORK_NAME;
-                            poolType = !this.isFactory && !this.isCrypto ? "main" :
-                                !this.isFactory ? "crypto" :
-                                    !(this.isCrypto && this.isFactory) ? "factory" :
-                                        "factory-crypto";
+                            poolType = this.isCrypto ? "crypto" : "main";
+                            if (this.id.startsWith("factory-v2-"))
+                                poolType = "factory";
+                            if (this.id.startsWith("factory-crvusd-"))
+                                poolType = "factory-crvusd";
+                            if (this.id.startsWith("factory-crypto-"))
+                                poolType = "factory-crypto";
                             return [4 /*yield*/, _getPoolsFromApi(network, poolType)];
                         case 4:
                             poolsData = (_e.sent()).poolData;
@@ -436,7 +439,7 @@ var PoolTemplate = /** @class */ (function () {
                 return __generator(this, function (_c) {
                     switch (_c.label) {
                         case 0:
-                            if (!this.isCrypto) return [3 /*break*/, 6];
+                            if (!(this.isCrypto || this.id === "wbeth")) return [3 /*break*/, 6];
                             _c.label = 1;
                         case 1:
                             _c.trys.push([1, 3, , 6]);

package/lib/pools/utils.js

@@ -48,7 +48,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 import { getPool } from "./poolConstructor.js";
 import { curve } from "../curve.js";
 import { _getRewardsFromApi, _getUsdRate, _setContracts, toBN } from "../utils.js";
-import { _getPoolsFromApi } from "../external-api.js";
+import { _getAllPoolsFromApi } from "../external-api.js";
 import ERC20Abi from "../constants/abis/ERC20.json" assert { type: 'json' };
 // _userLpBalance: { address: { poolId: { _lpBalance: 0, time: 0 } } }
 var _userLpBalanceCache = {};
@@ -474,18 +474,12 @@ export var getUserPoolList = function (address, useApi) {
     });
 };
 export var _getAmplificationCoefficientsFromApi = function () { return __awaiter(void 0, void 0, void 0, function () {
-    var network, promises, allTypesExtendedPoolData, amplificationCoefficientDict, _i, allTypesExtendedPoolData_1, extendedPoolData, _a, _b, pool;
+    var network, allTypesExtendedPoolData, amplificationCoefficientDict, _i, allTypesExtendedPoolData_1, extendedPoolData, _a, _b, pool;
     return __generator(this, function (_c) {
         switch (_c.label) {
             case 0:
                 network = curve.constants.NETWORK_NAME;
-                promises = [
-                    _getPoolsFromApi(network, "main"),
-                    _getPoolsFromApi(network, "crypto"),
-                    _getPoolsFromApi(network, "factory"),
-                    _getPoolsFromApi(network, "factory-crypto"),
-                ];
-                return [4 /*yield*/, Promise.all(promises)];
+                return [4 /*yield*/, _getAllPoolsFromApi(network)];
             case 1:
                 allTypesExtendedPoolData = _c.sent();
                 amplificationCoefficientDict = {};

package/lib/utils.js

@@ -59,7 +59,7 @@ import { Contract } from 'ethers';
 import { Contract as MulticallContract } from "ethcall";
 import BigNumber from 'bignumber.js';
 import { curve, NETWORK_CONSTANTS } from "./curve.js";
-import { _getFactoryAPYsAndVolumes, _getLegacyAPYsAndVolumes, _getPoolsFromApi, _getSubgraphData } from "./external-api.js";
+import { _getFactoryAPYsAndVolumes, _getLegacyAPYsAndVolumes, _getAllPoolsFromApi, _getSubgraphData } from "./external-api.js";
 import ERC20Abi from './constants/abis/ERC20.json' assert { type: 'json' };
 export var ETH_ADDRESS = "0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee";
 // export const MAX_ALLOWANCE = curve.parseUnits(new BigNumber(2).pow(256).minus(1).toFixed(), 0);
@@ -408,19 +408,13 @@ var _getTokenAddressBySwapAddress = function (swapAddress) {
     return res[0][1].token_address;
 };
 export var _getUsdPricesFromApi = function () { return __awaiter(void 0, void 0, void 0, function () {
-    var network, promises, allTypesExtendedPoolData, priceDict, _i, allTypesExtendedPoolData_1, extendedPoolData, _a, _b, pool, lpTokenAddress, totalSupply, _c, _d, coin, _e, _f, coin;
+    var network, allTypesExtendedPoolData, priceDict, _i, allTypesExtendedPoolData_1, extendedPoolData, _a, _b, pool, lpTokenAddress, totalSupply, _c, _d, coin, _e, _f, coin;
     var _g, _h;
     return __generator(this, function (_j) {
         switch (_j.label) {
             case 0:
                 network = curve.constants.NETWORK_NAME;
-                promises = [
-                    _getPoolsFromApi(network, "main"),
-                    _getPoolsFromApi(network, "crypto"),
-                    _getPoolsFromApi(network, "factory"),
-                    _getPoolsFromApi(network, "factory-crypto"),
-                ];
-                return [4 /*yield*/, Promise.all(promises)];
+                return [4 /*yield*/, _getAllPoolsFromApi(network)];
             case 1:
                 allTypesExtendedPoolData = _j.sent();
                 priceDict = {};
@@ -448,19 +442,13 @@ export var _getUsdPricesFromApi = function () { return __awaiter(void 0, void 0,
     });
 }); };
 export var _getCrvApyFromApi = function () { return __awaiter(void 0, void 0, void 0, function () {
-    var network, promises, allTypesExtendedPoolData, apyDict, _i, allTypesExtendedPoolData_2, extendedPoolData, _a, _b, pool;
+    var network, allTypesExtendedPoolData, apyDict, _i, allTypesExtendedPoolData_2, extendedPoolData, _a, _b, pool;
     var _c, _d;
     return __generator(this, function (_e) {
         switch (_e.label) {
             case 0:
                 network = curve.constants.NETWORK_NAME;
-                promises = [
-                    _getPoolsFromApi(network, "main"),
-                    _getPoolsFromApi(network, "crypto"),
-                    _getPoolsFromApi(network, "factory"),
-                    _getPoolsFromApi(network, "factory-crypto"),
-                ];
-                return [4 /*yield*/, Promise.all(promises)];
+                return [4 /*yield*/, _getAllPoolsFromApi(network)];
             case 1:
                 allTypesExtendedPoolData = _e.sent();
                 apyDict = {};
@@ -483,18 +471,12 @@ export var _getCrvApyFromApi = function () { return __awaiter(void 0, void 0, vo
     });
 }); };
 export var _getRewardsFromApi = function () { return __awaiter(void 0, void 0, void 0, function () {
-    var network, promises, allTypesExtendedPoolData, rewardsDict, _i, allTypesExtendedPoolData_3, extendedPoolData, _a, _b, pool;
+    var network, allTypesExtendedPoolData, rewardsDict, _i, allTypesExtendedPoolData_3, extendedPoolData, _a, _b, pool;
     return __generator(this, function (_c) {
         switch (_c.label) {
             case 0:
                 network = curve.constants.NETWORK_NAME;
-                promises = [
-                    _getPoolsFromApi(network, "main"),
-                    _getPoolsFromApi(network, "crypto"),
-                    _getPoolsFromApi(network, "factory"),
-                    _getPoolsFromApi(network, "factory-crypto"),
-                ];
-                return [4 /*yield*/, Promise.all(promises)];
+                return [4 /*yield*/, _getAllPoolsFromApi(network)];
             case 1:
                 allTypesExtendedPoolData = _c.sent();
                 rewardsDict = {};
@@ -630,18 +612,12 @@ var _getChainId = function (network) {
 export var getTVL = function (network) {
     if (network === void 0) { network = curve.chainId; }
     return __awaiter(void 0, void 0, void 0, function () {
-        var promises, allTypesExtendedPoolData;
+        var allTypesExtendedPoolData;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
                     network = _getNetworkName(network);
-                    promises = [
-                        _getPoolsFromApi(network, "main"),
-                        _getPoolsFromApi(network, "crypto"),
-                        _getPoolsFromApi(network, "factory"),
-                        _getPoolsFromApi(network, "factory-crypto"),
-                    ];
-                    return [4 /*yield*/, Promise.all(promises)];
+                    return [4 /*yield*/, _getAllPoolsFromApi(network)];
                 case 1:
                     allTypesExtendedPoolData = _a.sent();
                     return [2 /*return*/, allTypesExtendedPoolData.reduce(function (sum, data) { var _a, _b; return sum + ((_b = (_a = data.tvl) !== null && _a !== void 0 ? _a : data.tvlAll) !== null && _b !== void 0 ? _b : 0); }, 0)];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@curvefi/api",
-  "version": "2.36.0",
+  "version": "2.36.1",
   "description": "JavaScript library for curve.fi",
   "main": "lib/index.js",
   "author": "Macket",