@curvefi/api 2.28.3 → 2.29.0

package/README.md

@@ -140,6 +140,12 @@ import curve from "@curvefi/api";
 (async () => {
     await curve.getTVL();
     // 7870819849.685552
+    await curve.getVolume();
+    // {
+    //     totalVolume: 514893871.3481678,
+    //     cryptoVolume: 162757004.96876568,
+    //     cryptoShare: 31.609815930147377
+    // }
 
     const balances1 = await curve.getBalances(['DAI', 'sUSD']);
     // OR const balances1 = await curve.getBalances(['0x6B175474E89094C44Da98b954EedeAC495271d0F', '0x57Ab1ec28D129707052df4dF418D58a2D46d5f51']);

package/lib/boosting.js

@@ -180,7 +180,7 @@ exports.isApproved = isApproved;
 var approveEstimateGas = function (amount) { return __awaiter(void 0, void 0, void 0, function () {
     return __generator(this, function (_a) {
         switch (_a.label) {
-            case 0: return [4 /*yield*/, (0, utils_1.ensureAllowanceEstimateGas)([curve_1.curve.constants.ALIASES.crv], [amount], curve_1.curve.constants.ALIASES.voting_escrow)];
+            case 0: return [4 /*yield*/, (0, utils_1.ensureAllowanceEstimateGas)([curve_1.curve.constants.ALIASES.crv], [amount], curve_1.curve.constants.ALIASES.voting_escrow, false)];
             case 1: return [2 /*return*/, _a.sent()];
         }
     });
@@ -189,7 +189,7 @@ exports.approveEstimateGas = approveEstimateGas;
 var approve = function (amount) { return __awaiter(void 0, void 0, void 0, function () {
     return __generator(this, function (_a) {
         switch (_a.label) {
-            case 0: return [4 /*yield*/, (0, utils_1.ensureAllowance)([curve_1.curve.constants.ALIASES.crv], [amount], curve_1.curve.constants.ALIASES.voting_escrow)];
+            case 0: return [4 /*yield*/, (0, utils_1.ensureAllowance)([curve_1.curve.constants.ALIASES.crv], [amount], curve_1.curve.constants.ALIASES.voting_escrow, false)];
             case 1: return [2 /*return*/, _a.sent()];
         }
     });
@@ -233,7 +233,7 @@ var createLock = function (amount, days) { return __awaiter(void 0, void 0, void
             case 0:
                 _amount = (0, utils_2.parseUnits)(amount);
                 unlockTime = Math.floor(Date.now() / 1000) + (86400 * days);
-                return [4 /*yield*/, (0, utils_2._ensureAllowance)([curve_1.curve.constants.ALIASES.crv], [_amount], curve_1.curve.constants.ALIASES.voting_escrow)];
+                return [4 /*yield*/, (0, utils_2._ensureAllowance)([curve_1.curve.constants.ALIASES.crv], [_amount], curve_1.curve.constants.ALIASES.voting_escrow, false)];
             case 1:
                 _a.sent();
                 contract = curve_1.curve.contracts[curve_1.curve.constants.ALIASES.voting_escrow].contract;
@@ -278,7 +278,7 @@ var increaseAmount = function (amount) { return __awaiter(void 0, void 0, void 0
         switch (_a.label) {
             case 0:
                 _amount = (0, utils_2.parseUnits)(amount);
-                return [4 /*yield*/, (0, utils_2._ensureAllowance)([curve_1.curve.constants.ALIASES.crv], [_amount], curve_1.curve.constants.ALIASES.voting_escrow)];
+                return [4 /*yield*/, (0, utils_2._ensureAllowance)([curve_1.curve.constants.ALIASES.crv], [_amount], curve_1.curve.constants.ALIASES.voting_escrow, false)];
             case 1:
                 _a.sent();
                 contract = curve_1.curve.contracts[curve_1.curve.constants.ALIASES.voting_escrow].contract;

package/lib/constants/coins/ethereum.js

@@ -9,7 +9,7 @@ exports.COINS_ETHEREUM = (0, utils_1.lowerCaseValues)({
     ycdai: "0x99d1Fa417f94dcD62BfE781a1213c092a47041Bc",
     ycusdc: "0x9777d7E2b60bB01759D0E2f8be2095df444cb07E",
     ycusdt: "0x1bE5d71F2dA660BFdee8012dDc58D024448A0A59",
-    pax: "0x8E870D67F660D95d5be530380D0eC0bd388289E1",
+    usdp: "0x8E870D67F660D95d5be530380D0eC0bd388289E1",
     adai: "0x028171bCA77440897B824Ca71D1c56caC55b68A3",
     ausdc: "0xBcca60bB61934080951369a648Fb03DF4F96263C",
     ausdt: "0x3Ed3B47Dd13EC9a98b44e6204A523E766B225811",
@@ -34,7 +34,6 @@ exports.COINS_ETHEREUM = (0, utils_1.lowerCaseValues)({
     rsv: "0x196f4727526eA7FB1e17b2071B3d8eAA38486988",
     dusd: "0x5BC25f649fc4e26069dDF4cF4010F9f706c23831",
     ust: "0xa47c8bf37f92abed4a126bda807a7b7498661acd",
-    usdp: "0x1456688345527bE1f37E9e627DA0837D6f08C925",
     usdn: "0x674C6Ad92Fd080e4004b2312b45f796a192D27a0",
     dai: "0x6B175474E89094C44Da98b954EedeAC495271d0F",
     usdc: "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48",

package/lib/constants/pools/ethereum.js

@@ -255,8 +255,8 @@ exports.POOLS_DATA_ETHEREUM = (0, utils_1.lowerCasePoolDataAddresses)({
         gauge_address: '0x64E3C23bfc40722d3B649844055F1D51c1ac041d',
         deposit_address: '0xA50cCc70b6a011CffDdf45057E39679379187287',
         is_lending: true,
-        underlying_coins: ['DAI', 'USDC', 'USDT', 'PAX'],
-        wrapped_coins: ['ycDAI', 'ycUSDC', 'ycUSDT', 'PAX'],
+        underlying_coins: ['DAI', 'USDC', 'USDT', 'USDP'],
+        wrapped_coins: ['ycDAI', 'ycUSDC', 'ycUSDT', 'USDP'],
         underlying_coin_addresses: [
             '0x6B175474E89094C44Da98b954EedeAC495271d0F',
             '0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48',
@@ -1599,4 +1599,28 @@ exports.POOLS_DATA_ETHEREUM = (0, utils_1.lowerCasePoolDataAddresses)({
         swap_abi: swap_json_44.default,
         gauge_abi: gauge_v5_json_1.default,
     },
+    fraxusdp: {
+        name: "fraxusdp",
+        full_name: "fraxusdp",
+        symbol: "fraxusdp",
+        reference_asset: 'USD',
+        swap_address: '0xaE34574AC03A15cd58A92DC79De7B1A0800F1CE3',
+        token_address: '0xFC2838a17D8e8B1D5456E0a351B0708a09211147',
+        gauge_address: '0xfb860600F1bE1f1c72A89B2eF5CAF345aff7D39d',
+        is_plain: true,
+        underlying_coins: ['FRAX', 'USDP'],
+        wrapped_coins: ['FRAX', 'USDP'],
+        underlying_coin_addresses: [
+            '0x853d955aCEf822Db058eb8505911ED77F175b99e',
+            '0x8E870D67F660D95d5be530380D0eC0bd388289E1',
+        ],
+        wrapped_coin_addresses: [
+            '0x853d955aCEf822Db058eb8505911ED77F175b99e',
+            '0x8E870D67F660D95d5be530380D0eC0bd388289E1',
+        ],
+        underlying_decimals: [18, 18],
+        wrapped_decimals: [18, 18],
+        swap_abi: swap_json_42.default,
+        gauge_abi: gauge_v5_json_1.default,
+    },
 });

package/lib/curve.d.ts

@@ -1,7 +1,7 @@
 import { ethers, Contract } from "ethers";
 import { Networkish } from "@ethersproject/networks";
 import { Provider as MulticallProvider, Contract as MulticallContract } from 'ethcall';
-import { IPoolData, IDict, ICurve, INetworkName } from "./interfaces";
+import { IPoolData, IDict, ICurve, INetworkName, IChainId } from "./interfaces";
 export declare const NATIVE_TOKENS: {
     [index: number]: {
         symbol: string;
@@ -18,7 +18,7 @@ declare class Curve implements ICurve {
     multicallProvider: MulticallProvider;
     signer: ethers.Signer | null;
     signerAddress: string;
-    chainId: number;
+    chainId: IChainId;
     contracts: {
         [index: string]: {
             contract: Contract;

package/lib/curve.js

@@ -304,7 +304,7 @@ var Curve = /** @class */ (function () {
         // @ts-ignore
         this.signer = null;
         this.signerAddress = '';
-        this.chainId = 0;
+        this.chainId = 1;
         // @ts-ignore
         this.multicallProvider = null;
         this.contracts = {};
@@ -337,7 +337,7 @@ var Curve = /** @class */ (function () {
                         // @ts-ignore
                         this.signer = null;
                         this.signerAddress = '';
-                        this.chainId = 0;
+                        this.chainId = 1;
                         // @ts-ignore
                         this.multicallProvider = null;
                         this.contracts = {};

package/lib/external-api.d.ts

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

package/lib/external-api.js

@@ -42,7 +42,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports._getHiddenPools = exports._getAllGauges = exports._getFactoryAPYsAndVolumes = exports._getLegacyAPYsAndVolumes = exports._getSubgraphData = exports._getPoolsFromApi = void 0;
 var axios_1 = __importDefault(require("axios"));
 var memoizee_1 = __importDefault(require("memoizee"));
-var curve_1 = require("./curve");
 exports._getPoolsFromApi = (0, memoizee_1.default)(function (network, poolType) { return __awaiter(void 0, void 0, void 0, function () {
     var url, response;
     var _a;
@@ -62,15 +61,20 @@ exports._getPoolsFromApi = (0, memoizee_1.default)(function (network, poolType)
 });
 exports._getSubgraphData = (0, memoizee_1.default)(function (network) { return __awaiter(void 0, void 0, void 0, function () {
     var url, response;
-    var _a;
-    return __generator(this, function (_b) {
-        switch (_b.label) {
+    var _a, _b, _c, _d;
+    return __generator(this, function (_e) {
+        switch (_e.label) {
             case 0:
                 url = "https://api.curve.fi/api/getSubgraphData/".concat(network);
                 return [4 /*yield*/, axios_1.default.get(url, { validateStatus: function () { return true; } })];
             case 1:
-                response = _b.sent();
-                return [2 /*return*/, (_a = response.data.data.poolList) !== null && _a !== void 0 ? _a : []];
+                response = _e.sent();
+                return [2 /*return*/, {
+                        poolsData: (_a = response.data.data.poolList) !== null && _a !== void 0 ? _a : [],
+                        totalVolume: (_b = response.data.data.totalVolume) !== null && _b !== void 0 ? _b : 0,
+                        cryptoVolume: (_c = response.data.data.cryptoVolume) !== null && _c !== void 0 ? _c : 0,
+                        cryptoShare: (_d = response.data.data.cryptoShare) !== null && _d !== void 0 ? _d : 0,
+                    }];
         }
     });
 }); }, {
@@ -83,9 +87,9 @@ exports._getLegacyAPYsAndVolumes = (0, memoizee_1.default)(function (network) {
     return __generator(this, function (_a) {
         switch (_a.label) {
             case 0:
-                if (curve_1.curve.chainId === 2222 || curve_1.curve.chainId === 42220)
+                if (network === "kava" || network === "celo")
                     return [2 /*return*/, {}]; // Exclude Kava and Celo
-                url = "https://stats.curve.fi/raw-stats-".concat(network, "/apys.json");
+                url = "https://api.curve.fi/api/getMainPoolsAPYs/" + network;
                 return [4 /*yield*/, axios_1.default.get(url, { validateStatus: function () { return true; } })];
             case 1:
                 data = (_a.sent()).data;
@@ -110,7 +114,7 @@ exports._getFactoryAPYsAndVolumes = (0, memoizee_1.default)(function (network) {
     return __generator(this, function (_b) {
         switch (_b.label) {
             case 0:
-                if (curve_1.curve.chainId === 1313161554)
+                if (network === "aurora")
                     return [2 /*return*/, []]; // Exclude Aurora
                 url = "https://api.curve.fi/api/getFactoryAPYs-".concat(network);
                 return [4 /*yield*/, axios_1.default.get(url, { validateStatus: function () { return true; } })];

package/lib/factory/constants.js

@@ -44,6 +44,8 @@ exports.implementationABIDictEthereum = (0, utils_1.lowerCaseKeys)({
     "0x55Aa9BF126bCABF0bDC17Fa9E39Ec9239e1ce7A9": MetaUSDBalances_json_1.default,
     "0x33bB0e62d5e8C688E645Dd46DFb48Cd613250067": MetaFraxUSD_json_1.default,
     "0x2EB24483Ef551dA247ab87Cf18e1Cc980073032D": MetaFraxUSDBalances_json_1.default,
+    "0xF9B62b61d108232Ef0C9DD143bb3c22c7D4A715a": MetaFraxUSD_json_1.default,
+    "0xB172AC2Fe440B5dA74Dc460e5E9d96bc2BF6261F": MetaFraxUSDBalances_json_1.default,
     "0xC6A8466d128Fbfd34AdA64a9FFFce325D57C9a52": MetaBTC_json_1.default,
     "0xc4C78b08fA0c3d0a312605634461A88184Ecd630": MetaBTCBalances_json_1.default,
     "0xECAaecd9d2193900b424774133B1f51ae0F29d9E": MetaBTCRen_json_1.default,
@@ -223,6 +225,8 @@ exports.implementationBasePoolIdDictEthereum = (0, utils_1.lowerCaseKeys)({
     "0x55Aa9BF126bCABF0bDC17Fa9E39Ec9239e1ce7A9": "3pool",
     "0x33bB0e62d5e8C688E645Dd46DFb48Cd613250067": "fraxusdc",
     "0x2EB24483Ef551dA247ab87Cf18e1Cc980073032D": "fraxusdc",
+    "0xF9B62b61d108232Ef0C9DD143bb3c22c7D4A715a": "fraxusdp",
+    "0xB172AC2Fe440B5dA74Dc460e5E9d96bc2BF6261F": "fraxusdp",
     "0xC6A8466d128Fbfd34AdA64a9FFFce325D57C9a52": "sbtc",
     "0xc4C78b08fA0c3d0a312605634461A88184Ecd630": "sbtc",
     "0xECAaecd9d2193900b424774133B1f51ae0F29d9E": "ren",

package/lib/index.d.ts

@@ -47,18 +47,23 @@ declare const curve: {
     PoolTemplate: typeof PoolTemplate;
     getPool: (poolId: string) => PoolTemplate;
     getUsdRate: (coin: string) => Promise<number>;
-    getTVL: (chainId?: number) => Promise<number>;
+    getTVL: (network?: import("./interfaces").INetworkName | import("./interfaces").IChainId) => Promise<number>;
     getBalances: (coins: string[], ...addresses: string[] | string[][]) => Promise<string[] | import("./interfaces").IDict<string[]>>;
     getAllowance: (coins: string[], address: string, spender: string) => Promise<string[]>;
     hasAllowance: (coins: string[], amounts: (string | number)[], address: string, spender: string) => Promise<boolean>;
-    ensureAllowance: (coins: string[], amounts: (string | number)[], spender: string) => Promise<string[]>;
+    ensureAllowance: (coins: string[], amounts: (string | number)[], spender: string, isMax?: boolean) => Promise<string[]>;
     getCoinsData: (...coins: string[] | string[][]) => Promise<{
         name: string;
         symbol: string;
         decimals: number;
     }[]>;
+    getVolume: (network?: import("./interfaces").INetworkName | import("./interfaces").IChainId) => Promise<{
+        totalVolume: number;
+        cryptoVolume: number;
+        cryptoShare: number;
+    }>;
     factory: {
-        deployPlainPool: (name: string, symbol: string, coins: string[], A: number, fee: number, assetType: 0 | 2 | 1 | 3, implementationIdx: 0 | 2 | 1 | 3) => Promise<ethers.ContractTransaction>;
+        deployPlainPool: (name: string, symbol: string, coins: string[], A: number, fee: number, assetType: 0 | 1 | 2 | 3, implementationIdx: 0 | 1 | 2 | 3) => Promise<ethers.ContractTransaction>;
         deployMetaPool: (basePool: string, name: string, symbol: string, coin: string, A: number, fee: number, implementationIdx: 0 | 1) => Promise<ethers.ContractTransaction>;
         deployGauge: (poolAddress: string) => Promise<ethers.ContractTransaction>;
         getDeployedPlainPoolAddress: (tx: ethers.ContractTransaction) => Promise<string>;
@@ -66,7 +71,7 @@ declare const curve: {
         getDeployedGaugeAddress: (tx: ethers.ContractTransaction) => Promise<string>;
         fetchRecentlyDeployedPool: typeof fetchRecentlyDeployedFactoryPool;
         estimateGas: {
-            deployPlainPool: (name: string, symbol: string, coins: string[], A: number, fee: number, assetType: 0 | 2 | 1 | 3, implementationIdx: 0 | 2 | 1 | 3) => Promise<number>;
+            deployPlainPool: (name: string, symbol: string, coins: string[], A: number, fee: number, assetType: 0 | 1 | 2 | 3, implementationIdx: 0 | 1 | 2 | 3) => Promise<number>;
             deployMetaPool: (basePool: string, name: string, symbol: string, coin: string, A: number, fee: number, implementationIdx: 0 | 1) => Promise<number>;
             deployGauge: (poolAddress: string) => Promise<number>;
         };
@@ -84,7 +89,7 @@ declare const curve: {
         };
     };
     estimateGas: {
-        ensureAllowance: (coins: string[], amounts: (string | number)[], spender: string) => Promise<number>;
+        ensureAllowance: (coins: string[], amounts: (string | number)[], spender: string, isMax?: boolean) => Promise<number>;
     };
     boosting: {
         getCrv: (...addresses: string[] | string[][]) => Promise<string | import("./interfaces").IDict<string>>;

package/lib/index.js

@@ -133,6 +133,7 @@ var curve = {
     hasAllowance: utils_2.hasAllowance,
     ensureAllowance: utils_2.ensureAllowance,
     getCoinsData: utils_2.getCoinsData,
+    getVolume: utils_2.getVolume,
     factory: {
         deployPlainPool: deploy_1.deployStablePlainPool,
         deployMetaPool: deploy_1.deployStableMetaPool,

package/lib/interfaces.d.ts

@@ -3,7 +3,8 @@ import { Contract as MulticallContract, Provider as MulticallProvider } from "et
 export interface IDict<T> {
     [index: string]: T;
 }
-export type INetworkName = "ethereum" | "polygon" | "avalanche";
+export type INetworkName = "ethereum" | "optimism" | "xdai" | "polygon" | "fantom" | "moonbeam" | "kava" | "arbitrum" | "celo" | "avalanche" | "aurora";
+export type IChainId = 1 | 10 | 100 | 137 | 250 | 1284 | 2222 | 42161 | 42220 | 43114 | 1313161554;
 export type REFERENCE_ASSET = 'USD' | 'EUR' | 'BTC' | 'ETH' | 'LINK' | 'CRYPTO' | 'OTHER';
 export interface IPoolData {
     name: string;

package/lib/pools/PoolTemplate.js

@@ -230,7 +230,7 @@ var PoolTemplate = /** @class */ (function () {
                         network = curve_1.curve.constants.NETWORK_NAME;
                         return [4 /*yield*/, (0, external_api_1._getSubgraphData)(network)];
                     case 4:
-                        poolsData = (_e.sent());
+                        poolsData = (_e.sent()).poolsData;
                         poolData = poolsData.find(function (d) { return d.address.toLowerCase() === _this.address; });
                         if (!poolData)
                             throw Error("Can't get Volume for ".concat(this.name, " (id: ").concat(this.id, ")"));
@@ -268,7 +268,7 @@ var PoolTemplate = /** @class */ (function () {
                         network = curve_1.curve.constants.NETWORK_NAME;
                         return [4 /*yield*/, (0, external_api_1._getSubgraphData)(network)];
                     case 3:
-                        poolsData = (_d.sent());
+                        poolsData = (_d.sent()).poolsData;
                         poolData = poolsData.find(function (d) { return d.address.toLowerCase() === _this.address; });
                         if (!poolData)
                             throw Error("Can't get base APY for ".concat(this.name, " (id: ").concat(this.id, ")"));

package/lib/utils.d.ts

@@ -1,6 +1,6 @@
 import { ethers } from 'ethers';
 import BigNumber from 'bignumber.js';
-import { IDict, IRewardFromApi } from './interfaces';
+import { IChainId, IDict, INetworkName, IRewardFromApi } from './interfaces';
 export declare const ETH_ADDRESS = "0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee";
 export declare const MAX_ALLOWANCE: ethers.BigNumber;
 export declare const _cutZeros: (strn: string) => string;
@@ -22,16 +22,21 @@ export declare const getBalances: (coins: string[], ...addresses: string[] | str
 export declare const _getAllowance: (coins: string[], address: string, spender: string) => Promise<ethers.BigNumber[]>;
 export declare const getAllowance: (coins: string[], address: string, spender: string) => Promise<string[]>;
 export declare const hasAllowance: (coins: string[], amounts: (number | string)[], address: string, spender: string) => Promise<boolean>;
-export declare const _ensureAllowance: (coins: string[], amounts: ethers.BigNumber[], spender: string) => Promise<string[]>;
-export declare const ensureAllowanceEstimateGas: (coins: string[], amounts: (number | string)[], spender: string) => Promise<number>;
-export declare const ensureAllowance: (coins: string[], amounts: (number | string)[], spender: string) => Promise<string[]>;
+export declare const _ensureAllowance: (coins: string[], amounts: ethers.BigNumber[], spender: string, isMax?: boolean) => Promise<string[]>;
+export declare const ensureAllowanceEstimateGas: (coins: string[], amounts: (number | string)[], spender: string, isMax?: boolean) => Promise<number>;
+export declare const ensureAllowance: (coins: string[], amounts: (number | string)[], spender: string, isMax?: boolean) => Promise<string[]>;
 export declare const getPoolNameBySwapAddress: (swapAddress: string) => string;
 export declare const _getUsdPricesFromApi: () => Promise<IDict<number>>;
 export declare const _getCrvApyFromApi: () => Promise<IDict<[number, number]>>;
 export declare const _getRewardsFromApi: () => Promise<IDict<IRewardFromApi[]>>;
 export declare const _getUsdRate: (assetId: string) => Promise<number>;
 export declare const getUsdRate: (coin: string) => Promise<number>;
-export declare const getTVL: (chainId?: number) => Promise<number>;
+export declare const getTVL: (network?: INetworkName | IChainId) => Promise<number>;
+export declare const getVolume: (network?: INetworkName | IChainId) => Promise<{
+    totalVolume: number;
+    cryptoVolume: number;
+    cryptoShare: number;
+}>;
 export declare const _setContracts: (address: string, abi: any) => void;
 export declare const _get_small_x: (_x: ethers.BigNumber, _y: ethers.BigNumber, x_decimals: number, y_decimals: number) => BigNumber;
 export declare const _get_price_impact: (_x: ethers.BigNumber, _y: ethers.BigNumber, _small_x: ethers.BigNumber, _small_y: ethers.BigNumber, x_decimals: number, y_decimals: number) => BigNumber;

package/lib/utils.js

@@ -59,7 +59,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getCoinsData = exports._get_price_impact = exports._get_small_x = exports._setContracts = exports.getTVL = exports.getUsdRate = exports._getUsdRate = exports._getRewardsFromApi = exports._getCrvApyFromApi = exports._getUsdPricesFromApi = exports.getPoolNameBySwapAddress = exports.ensureAllowance = exports.ensureAllowanceEstimateGas = exports._ensureAllowance = exports.hasAllowance = exports.getAllowance = exports._getAllowance = exports.getBalances = exports._prepareAddresses = exports._getBalances = exports._getCoinDecimals = exports._getCoinAddresses = exports._getCoinAddressesNoCheck = exports.getEthIndex = exports.isEth = exports.fromBN = exports.toStringFromBN = exports.toBN = exports.BN = exports.parseUnits = exports.formatNumber = exports.checkNumber = exports._cutZeros = exports.MAX_ALLOWANCE = exports.ETH_ADDRESS = void 0;
+exports.getCoinsData = exports._get_price_impact = exports._get_small_x = exports._setContracts = exports.getVolume = exports.getTVL = exports.getUsdRate = exports._getUsdRate = exports._getRewardsFromApi = exports._getCrvApyFromApi = exports._getUsdPricesFromApi = exports.getPoolNameBySwapAddress = exports.ensureAllowance = exports.ensureAllowanceEstimateGas = exports._ensureAllowance = exports.hasAllowance = exports.getAllowance = exports._getAllowance = exports.getBalances = exports._prepareAddresses = exports._getBalances = exports._getCoinDecimals = exports._getCoinAddresses = exports._getCoinAddressesNoCheck = exports.getEthIndex = exports.isEth = exports.fromBN = exports.toStringFromBN = exports.toBN = exports.BN = exports.parseUnits = exports.formatNumber = exports.checkNumber = exports._cutZeros = exports.MAX_ALLOWANCE = exports.ETH_ADDRESS = void 0;
 var axios_1 = __importDefault(require("axios"));
 var ethers_1 = require("ethers");
 var ethcall_1 = require("ethcall");
@@ -301,104 +301,115 @@ var hasAllowance = function (coins, amounts, address, spender) { return __awaite
     });
 }); };
 exports.hasAllowance = hasAllowance;
-var _ensureAllowance = function (coins, amounts, spender) { return __awaiter(void 0, void 0, void 0, function () {
-    var address, allowance, txHashes, i, contract, gasLimit_1, _a, _b, gasLimit, _c, _d;
-    return __generator(this, function (_e) {
-        switch (_e.label) {
-            case 0:
-                address = curve_1.curve.signerAddress;
-                return [4 /*yield*/, (0, exports._getAllowance)(coins, address, spender)];
-            case 1:
-                allowance = _e.sent();
-                txHashes = [];
-                i = 0;
-                _e.label = 2;
-            case 2:
-                if (!(i < allowance.length)) return [3 /*break*/, 10];
-                if (!allowance[i].lt(amounts[i])) return [3 /*break*/, 9];
-                contract = curve_1.curve.contracts[coins[i]].contract;
-                return [4 /*yield*/, curve_1.curve.updateFeeData()];
-            case 3:
-                _e.sent();
-                if (!allowance[i].gt(ethers_1.ethers.BigNumber.from(0))) return [3 /*break*/, 6];
-                return [4 /*yield*/, contract.estimateGas.approve(spender, ethers_1.ethers.BigNumber.from(0), curve_1.curve.constantOptions)];
-            case 4:
-                gasLimit_1 = (_e.sent()).mul(130).div(100);
-                _b = (_a = txHashes).push;
-                return [4 /*yield*/, contract.approve(spender, ethers_1.ethers.BigNumber.from(0), __assign(__assign({}, curve_1.curve.options), { gasLimit: gasLimit_1 }))];
-            case 5:
-                _b.apply(_a, [(_e.sent()).hash]);
-                _e.label = 6;
-            case 6: return [4 /*yield*/, contract.estimateGas.approve(spender, exports.MAX_ALLOWANCE, curve_1.curve.constantOptions)];
-            case 7:
-                gasLimit = (_e.sent()).mul(130).div(100);
-                _d = (_c = txHashes).push;
-                return [4 /*yield*/, contract.approve(spender, exports.MAX_ALLOWANCE, __assign(__assign({}, curve_1.curve.options), { gasLimit: gasLimit }))];
-            case 8:
-                _d.apply(_c, [(_e.sent()).hash]);
-                _e.label = 9;
-            case 9:
-                i++;
-                return [3 /*break*/, 2];
-            case 10: return [2 /*return*/, txHashes];
-        }
+var _ensureAllowance = function (coins, amounts, spender, isMax) {
+    if (isMax === void 0) { isMax = true; }
+    return __awaiter(void 0, void 0, void 0, function () {
+        var address, allowance, txHashes, i, contract, _approveAmount, gasLimit_1, _a, _b, gasLimit, _c, _d;
+        return __generator(this, function (_e) {
+            switch (_e.label) {
+                case 0:
+                    address = curve_1.curve.signerAddress;
+                    return [4 /*yield*/, (0, exports._getAllowance)(coins, address, spender)];
+                case 1:
+                    allowance = _e.sent();
+                    txHashes = [];
+                    i = 0;
+                    _e.label = 2;
+                case 2:
+                    if (!(i < allowance.length)) return [3 /*break*/, 10];
+                    if (!allowance[i].lt(amounts[i])) return [3 /*break*/, 9];
+                    contract = curve_1.curve.contracts[coins[i]].contract;
+                    _approveAmount = isMax ? exports.MAX_ALLOWANCE : amounts[i];
+                    return [4 /*yield*/, curve_1.curve.updateFeeData()];
+                case 3:
+                    _e.sent();
+                    if (!allowance[i].gt(ethers_1.ethers.BigNumber.from(0))) return [3 /*break*/, 6];
+                    return [4 /*yield*/, contract.estimateGas.approve(spender, ethers_1.ethers.BigNumber.from(0), curve_1.curve.constantOptions)];
+                case 4:
+                    gasLimit_1 = (_e.sent()).mul(130).div(100);
+                    _b = (_a = txHashes).push;
+                    return [4 /*yield*/, contract.approve(spender, ethers_1.ethers.BigNumber.from(0), __assign(__assign({}, curve_1.curve.options), { gasLimit: gasLimit_1 }))];
+                case 5:
+                    _b.apply(_a, [(_e.sent()).hash]);
+                    _e.label = 6;
+                case 6: return [4 /*yield*/, contract.estimateGas.approve(spender, _approveAmount, curve_1.curve.constantOptions)];
+                case 7:
+                    gasLimit = (_e.sent()).mul(130).div(100);
+                    _d = (_c = txHashes).push;
+                    return [4 /*yield*/, contract.approve(spender, _approveAmount, __assign(__assign({}, curve_1.curve.options), { gasLimit: gasLimit }))];
+                case 8:
+                    _d.apply(_c, [(_e.sent()).hash]);
+                    _e.label = 9;
+                case 9:
+                    i++;
+                    return [3 /*break*/, 2];
+                case 10: return [2 /*return*/, txHashes];
+            }
+        });
     });
-}); };
+};
 exports._ensureAllowance = _ensureAllowance;
 // coins can be either addresses or symbols
-var ensureAllowanceEstimateGas = function (coins, amounts, spender) { return __awaiter(void 0, void 0, void 0, function () {
-    var coinAddresses, decimals, _amounts, address, allowance, gas, i, contract, _a, _b;
-    return __generator(this, function (_c) {
-        switch (_c.label) {
-            case 0:
-                coinAddresses = (0, exports._getCoinAddresses)(coins);
-                decimals = (0, exports._getCoinDecimals)(coinAddresses);
-                _amounts = amounts.map(function (a, i) { return (0, exports.parseUnits)(a, decimals[i]); });
-                address = curve_1.curve.signerAddress;
-                return [4 /*yield*/, (0, exports._getAllowance)(coinAddresses, address, spender)];
-            case 1:
-                allowance = _c.sent();
-                gas = 0;
-                i = 0;
-                _c.label = 2;
-            case 2:
-                if (!(i < allowance.length)) return [3 /*break*/, 7];
-                if (!allowance[i].lt(_amounts[i])) return [3 /*break*/, 6];
-                contract = curve_1.curve.contracts[coinAddresses[i]].contract;
-                if (!allowance[i].gt(ethers_1.ethers.BigNumber.from(0))) return [3 /*break*/, 4];
-                _a = gas;
-                return [4 /*yield*/, contract.estimateGas.approve(spender, ethers_1.ethers.BigNumber.from(0), curve_1.curve.constantOptions)];
-            case 3:
-                gas = _a + (_c.sent()).toNumber();
-                _c.label = 4;
-            case 4:
-                _b = gas;
-                return [4 /*yield*/, contract.estimateGas.approve(spender, exports.MAX_ALLOWANCE, curve_1.curve.constantOptions)];
-            case 5:
-                gas = _b + (_c.sent()).toNumber();
-                _c.label = 6;
-            case 6:
-                i++;
-                return [3 /*break*/, 2];
-            case 7: return [2 /*return*/, gas];
-        }
+var ensureAllowanceEstimateGas = function (coins, amounts, spender, isMax) {
+    if (isMax === void 0) { isMax = true; }
+    return __awaiter(void 0, void 0, void 0, function () {
+        var coinAddresses, decimals, _amounts, address, allowance, gas, i, contract, _approveAmount, _a, _b;
+        return __generator(this, function (_c) {
+            switch (_c.label) {
+                case 0:
+                    coinAddresses = (0, exports._getCoinAddresses)(coins);
+                    decimals = (0, exports._getCoinDecimals)(coinAddresses);
+                    _amounts = amounts.map(function (a, i) { return (0, exports.parseUnits)(a, decimals[i]); });
+                    address = curve_1.curve.signerAddress;
+                    return [4 /*yield*/, (0, exports._getAllowance)(coinAddresses, address, spender)];
+                case 1:
+                    allowance = _c.sent();
+                    gas = 0;
+                    i = 0;
+                    _c.label = 2;
+                case 2:
+                    if (!(i < allowance.length)) return [3 /*break*/, 7];
+                    if (!allowance[i].lt(_amounts[i])) return [3 /*break*/, 6];
+                    contract = curve_1.curve.contracts[coinAddresses[i]].contract;
+                    _approveAmount = isMax ? exports.MAX_ALLOWANCE : _amounts[i];
+                    if (!allowance[i].gt(ethers_1.ethers.BigNumber.from(0))) return [3 /*break*/, 4];
+                    _a = gas;
+                    return [4 /*yield*/, contract.estimateGas.approve(spender, ethers_1.ethers.BigNumber.from(0), curve_1.curve.constantOptions)];
+                case 3:
+                    gas = _a + (_c.sent()).toNumber();
+                    _c.label = 4;
+                case 4:
+                    _b = gas;
+                    return [4 /*yield*/, contract.estimateGas.approve(spender, _approveAmount, curve_1.curve.constantOptions)];
+                case 5:
+                    gas = _b + (_c.sent()).toNumber();
+                    _c.label = 6;
+                case 6:
+                    i++;
+                    return [3 /*break*/, 2];
+                case 7: return [2 /*return*/, gas];
+            }
+        });
     });
-}); };
+};
 exports.ensureAllowanceEstimateGas = ensureAllowanceEstimateGas;
 // coins can be either addresses or symbols
-var ensureAllowance = function (coins, amounts, spender) { return __awaiter(void 0, void 0, void 0, function () {
-    var coinAddresses, decimals, _amounts;
-    return __generator(this, function (_a) {
-        switch (_a.label) {
-            case 0:
-                coinAddresses = (0, exports._getCoinAddresses)(coins);
-                decimals = (0, exports._getCoinDecimals)(coinAddresses);
-                _amounts = amounts.map(function (a, i) { return (0, exports.parseUnits)(a, decimals[i]); });
-                return [4 /*yield*/, (0, exports._ensureAllowance)(coinAddresses, _amounts, spender)];
-            case 1: return [2 /*return*/, _a.sent()];
-        }
+var ensureAllowance = function (coins, amounts, spender, isMax) {
+    if (isMax === void 0) { isMax = true; }
+    return __awaiter(void 0, void 0, void 0, function () {
+        var coinAddresses, decimals, _amounts;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    coinAddresses = (0, exports._getCoinAddresses)(coins);
+                    decimals = (0, exports._getCoinDecimals)(coinAddresses);
+                    _amounts = amounts.map(function (a, i) { return (0, exports.parseUnits)(a, decimals[i]); });
+                    return [4 /*yield*/, (0, exports._ensureAllowance)(coinAddresses, _amounts, spender, isMax)];
+                case 1: return [2 /*return*/, _a.sent()];
+            }
+        });
     });
-}); };
+};
 exports.ensureAllowance = ensureAllowance;
 var getPoolNameBySwapAddress = function (swapAddress) {
     var poolsData = __assign(__assign(__assign({}, curve_1.curve.constants.POOLS_DATA), curve_1.curve.constants.FACTORY_POOLS_DATA), curve_1.curve.constants.CRYPTO_FACTORY_POOLS_DATA);
@@ -408,6 +419,16 @@ var getPoolNameBySwapAddress = function (swapAddress) {
     })[0][0];
 };
 exports.getPoolNameBySwapAddress = getPoolNameBySwapAddress;
+var _getTokenAddressBySwapAddress = function (swapAddress) {
+    var poolsData = __assign(__assign(__assign({}, curve_1.curve.constants.POOLS_DATA), curve_1.curve.constants.FACTORY_POOLS_DATA), curve_1.curve.constants.CRYPTO_FACTORY_POOLS_DATA);
+    var res = Object.entries(poolsData).filter(function (_a) {
+        var _ = _a[0], poolData = _a[1];
+        return poolData.swap_address.toLowerCase() === swapAddress.toLowerCase();
+    });
+    if (res.length === 0)
+        return "";
+    return res[0][1].token_address;
+};
 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 _g, _h;
@@ -608,27 +629,39 @@ var getUsdRate = function (coin) { return __awaiter(void 0, void 0, void 0, func
     });
 }); };
 exports.getUsdRate = getUsdRate;
-var getTVL = function (chainId) {
-    if (chainId === void 0) { chainId = curve_1.curve.chainId; }
+var _getNetworkName = function (network) {
+    if (network === void 0) { network = curve_1.curve.chainId; }
+    if (typeof network === "number" && curve_1.NETWORK_CONSTANTS[network]) {
+        return curve_1.NETWORK_CONSTANTS[network].NAME;
+    }
+    else if (typeof network === "string" && Object.values(curve_1.NETWORK_CONSTANTS).map(function (n) { return n.NAME; }).includes(network)) {
+        return network;
+    }
+    else {
+        throw Error("Wrong network name or id: ".concat(network));
+    }
+};
+var _getChainId = function (network) {
+    if (network === void 0) { network = curve_1.curve.chainId; }
+    if (typeof network === "number" && curve_1.NETWORK_CONSTANTS[network]) {
+        return network;
+    }
+    else if (typeof network === "string" && Object.values(curve_1.NETWORK_CONSTANTS).map(function (n) { return n.NAME; }).includes(network)) {
+        var idx = Object.values(curve_1.NETWORK_CONSTANTS).map(function (n) { return n.NAME; }).indexOf(network);
+        return Number(Object.keys(curve_1.NETWORK_CONSTANTS)[idx]);
+    }
+    else {
+        throw Error("Wrong network name or id: ".concat(network));
+    }
+};
+var getTVL = function (network) {
+    if (network === void 0) { network = curve_1.curve.chainId; }
     return __awaiter(void 0, void 0, void 0, function () {
-        var network, promises, allTypesExtendedPoolData;
-        var _a;
-        return __generator(this, function (_b) {
-            switch (_b.label) {
+        var promises, allTypesExtendedPoolData;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
                 case 0:
-                    network = (_a = {
-                        1: "ethereum",
-                        10: 'optimism',
-                        100: 'xdai',
-                        137: "polygon",
-                        250: "fantom",
-                        1284: "moonbeam",
-                        2222: 'kava',
-                        42220: 'celo',
-                        43114: "avalanche",
-                        42161: "arbitrum",
-                        1313161554: "aurora",
-                    }[chainId]) !== null && _a !== void 0 ? _a : "ethereum";
+                    network = _getNetworkName(network);
                     promises = [
                         (0, external_api_1._getPoolsFromApi)(network, "main"),
                         (0, external_api_1._getPoolsFromApi)(network, "crypto"),
@@ -637,13 +670,67 @@ var getTVL = function (chainId) {
                     ];
                     return [4 /*yield*/, Promise.all(promises)];
                 case 1:
-                    allTypesExtendedPoolData = _b.sent();
+                    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)];
             }
         });
     });
 };
 exports.getTVL = getTVL;
+var getVolume = function (network) {
+    if (network === void 0) { network = curve_1.curve.chainId; }
+    return __awaiter(void 0, void 0, void 0, function () {
+        var chainId, _a, mainPoolsData, factoryPoolsData, volume, id, _i, factoryPoolsData_1, pool, lpToken, lpPrice, _b, _c, totalVolume, cryptoVolume, cryptoShare;
+        var _d;
+        return __generator(this, function (_e) {
+            switch (_e.label) {
+                case 0:
+                    network = _getNetworkName(network);
+                    if (!["moonbeam", "kava", "celo", "aurora"].includes(network)) return [3 /*break*/, 8];
+                    chainId = _getChainId(network);
+                    if (curve_1.curve.chainId !== chainId)
+                        throw Error("To get volume for Moonbeam, Kava, Celo or Aurora connect to the network first");
+                    return [4 /*yield*/, Promise.all([
+                            (0, external_api_1._getLegacyAPYsAndVolumes)(network),
+                            (0, external_api_1._getFactoryAPYsAndVolumes)(network),
+                        ])];
+                case 1:
+                    _a = _e.sent(), mainPoolsData = _a[0], factoryPoolsData = _a[1];
+                    volume = 0;
+                    for (id in mainPoolsData) {
+                        volume += (_d = mainPoolsData[id].volume) !== null && _d !== void 0 ? _d : 0;
+                    }
+                    _i = 0, factoryPoolsData_1 = factoryPoolsData;
+                    _e.label = 2;
+                case 2:
+                    if (!(_i < factoryPoolsData_1.length)) return [3 /*break*/, 7];
+                    pool = factoryPoolsData_1[_i];
+                    lpToken = _getTokenAddressBySwapAddress(pool.poolAddress);
+                    if (!lpToken) return [3 /*break*/, 4];
+                    return [4 /*yield*/, (0, exports._getUsdRate)(lpToken)];
+                case 3:
+                    _b = _e.sent();
+                    return [3 /*break*/, 5];
+                case 4:
+                    _b = 0;
+                    _e.label = 5;
+                case 5:
+                    lpPrice = _b;
+                    volume += pool.volume * lpPrice;
+                    _e.label = 6;
+                case 6:
+                    _i++;
+                    return [3 /*break*/, 2];
+                case 7: return [2 /*return*/, { totalVolume: volume, cryptoVolume: 0, cryptoShare: 0 }];
+                case 8: return [4 /*yield*/, (0, external_api_1._getSubgraphData)(network)];
+                case 9:
+                    _c = _e.sent(), totalVolume = _c.totalVolume, cryptoVolume = _c.cryptoVolume, cryptoShare = _c.cryptoShare;
+                    return [2 /*return*/, { totalVolume: totalVolume, cryptoVolume: cryptoVolume, cryptoShare: cryptoShare }];
+            }
+        });
+    });
+};
+exports.getVolume = getVolume;
 var _setContracts = function (address, abi) {
     curve_1.curve.contracts[address] = {
         contract: new ethers_1.Contract(address, abi, curve_1.curve.signer || curve_1.curve.provider),

package/package.json

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