@curvefi/api 2.21.2 → 2.21.3

package/lib/constants/coins/fantom.js

@@ -17,7 +17,7 @@ exports.COINS_FANTOM = (0, utils_1.lowerCaseValues)({
     'dai+usdc': '0x27e611fd27b276acbd5ffd632e5eaebec9761e40',
     'frax': '0xdc301622e621166bd8e82f2ca0a26c13ad0be355',
     // --- BTC ---
-    'btc': '0x321162Cd933E2Be498Cd2267a90534A804051b11',
+    'wbtc': '0x321162Cd933E2Be498Cd2267a90534A804051b11',
     'renbtc': '0xDBf31dF14B66535aF65AaC99C32e9eA844e14501',
     // --- ETH ---
     'eth': '0x74b23882a30290451A17c44f4F05243b6b58C76d',

package/lib/constants/pools/fantom.js

@@ -85,8 +85,8 @@ exports.POOLS_DATA_FANTOM = (0, utils_1.lowerCasePoolDataAddresses)({
         // old_gauge: '0x6600e98b71dabfD4A8Cac03b302B0189Adb86Afb',
         // gauge_address: '0xBdFF0C27dd073C119ebcb1299a68A6A92aE607F0',
         gauge_address: '0xbC38bD19227F91424eD4132F630f51C9A42Fa338',
-        underlying_coins: ['BTC', 'renBTC'],
-        wrapped_coins: ['BTC', 'renBTC'],
+        underlying_coins: ['WBTC', 'renBTC'],
+        wrapped_coins: ['WBTC', 'renBTC'],
         underlying_coin_addresses: [
             '0x321162Cd933E2Be498Cd2267a90534A804051b11',
             '0xDBf31dF14B66535aF65AaC99C32e9eA844e14501',
@@ -111,8 +111,8 @@ exports.POOLS_DATA_FANTOM = (0, utils_1.lowerCasePoolDataAddresses)({
         gauge_address: '0x319E268f0A4C85D404734ee7958857F5891506d7',
         is_crypto: true,
         is_plain: true,
-        underlying_coins: ['fUSDT', 'BTC', 'ETH'],
-        wrapped_coins: ['fUSDT', 'BTC', 'ETH'],
+        underlying_coins: ['fUSDT', 'WBTC', 'ETH'],
+        wrapped_coins: ['fUSDT', 'WBTC', 'ETH'],
         underlying_coin_addresses: [
             '0x049d68029688eAbF473097a2fC38ef61633A3C7A',
             '0x321162Cd933E2Be498Cd2267a90534A804051b11',

package/lib/pools/PoolTemplate.d.ts

@@ -57,6 +57,7 @@ export declare class PoolTemplate {
     };
     stats: {
         parameters: () => Promise<{
+            lpTokenSupply: string;
             virtualPrice: string;
             fee: string;
             adminFee: string;
@@ -66,6 +67,8 @@ export declare class PoolTemplate {
             future_A_time?: number;
             initial_A_time?: number;
             gamma?: string;
+            price_oracle?: string[];
+            price_scale?: string[];
         }>;
         underlyingBalances: () => Promise<string[]>;
         wrappedBalances: () => Promise<string[]>;

package/lib/pools/PoolTemplate.js

@@ -74,8 +74,8 @@ var PoolTemplate = /** @class */ (function () {
     function PoolTemplate(id) {
         var _this = this;
         this.statsParameters = function () { return __awaiter(_this, void 0, void 0, function () {
-            var multicallContract, lpMulticallContract, calls, additionalCalls, _c, _virtualPrice, _lpTokenSupply, _fee, _adminFee, _A, _gamma, e_1, _d, virtualPrice, lpTokenSupply, fee, adminFee, A, gamma, A_PRECISION, _e, _future_A, _initial_A, _future_A_time, _initial_A_time, _f, future_A, initial_A, future_A_time, initial_A_time;
-            var _g, _h;
+            var multicallContract, lpMulticallContract, calls, i, additionalCalls, _virtualPrice, _fee, _prices, _adminFee, _A, _lpTokenSupply, _gamma, e_1, _c, virtualPrice, fee, adminFee, A, lpTokenSupply, gamma, priceOracle, priceScale, prices, i, A_PRECISION, _d, _future_A, _initial_A, _future_A_time, _initial_A_time, _e, future_A, initial_A, future_A_time, initial_A_time;
+            var _f, _g, _h;
             return __generator(this, function (_j) {
                 switch (_j.label) {
                     case 0:
@@ -83,52 +83,80 @@ var PoolTemplate = /** @class */ (function () {
                         lpMulticallContract = curve_1.curve.contracts[this.lpToken].multicallContract;
                         calls = [
                             multicallContract.get_virtual_price(),
-                            lpMulticallContract.totalSupply(),
                             multicallContract.fee(),
                             multicallContract.admin_fee(),
                             multicallContract.A(),
+                            lpMulticallContract.totalSupply(),
                         ];
-                        if (this.isCrypto)
+                        if (this.isCrypto) {
                             calls.push(multicallContract.gamma());
+                            if (this.wrappedCoins.length === 2) {
+                                calls.push(multicallContract.price_oracle());
+                                calls.push(multicallContract.price_scale());
+                            }
+                            else {
+                                for (i = 0; i < this.wrappedCoins.length - 1; i++) {
+                                    calls.push(multicallContract.price_oracle(i));
+                                    calls.push(multicallContract.price_scale(i));
+                                }
+                            }
+                        }
                         additionalCalls = this.isCrypto ? [] : [multicallContract.future_A()];
                         if ('initial_A' in multicallContract) {
                             additionalCalls.push(multicallContract.initial_A(), multicallContract.future_A_time(), multicallContract.initial_A_time());
                         }
-                        _c = Array(6).fill(ethers_1.ethers.BigNumber.from(0)), _virtualPrice = _c[0], _lpTokenSupply = _c[1], _fee = _c[2], _adminFee = _c[3], _A = _c[4], _gamma = _c[5];
+                        _virtualPrice = ethers_1.ethers.BigNumber.from(0);
+                        _fee = ethers_1.ethers.BigNumber.from(0);
                         _j.label = 1;
                     case 1:
-                        _j.trys.push([1, 3, , 5]);
+                        _j.trys.push([1, 3, , 8]);
                         return [4 /*yield*/, curve_1.curve.multicallProvider.all(calls)];
                     case 2:
-                        _g = (_j.sent()), _virtualPrice = _g[0], _lpTokenSupply = _g[1], _fee = _g[2], _adminFee = _g[3], _A = _g[4], _gamma = _g[5];
-                        return [3 /*break*/, 5];
+                        _f = (_j.sent()), _virtualPrice = _f[0], _fee = _f[1], _adminFee = _f[2], _A = _f[3], _lpTokenSupply = _f[4], _gamma = _f[5], _prices = _f.slice(6);
+                        return [3 /*break*/, 8];
                     case 3:
                         e_1 = _j.sent();
                         calls.shift();
+                        if (!this.isCrypto) return [3 /*break*/, 5];
+                        calls.shift();
                         return [4 /*yield*/, curve_1.curve.multicallProvider.all(calls)];
                     case 4:
-                        _h = (_j.sent()), _lpTokenSupply = _h[0], _fee = _h[1], _adminFee = _h[2], _A = _h[3], _gamma = _h[4];
-                        return [3 /*break*/, 5];
-                    case 5:
-                        _d = [
+                        _g = (_j.sent()), _adminFee = _g[0], _A = _g[1], _lpTokenSupply = _g[2], _gamma = _g[3], _prices = _g.slice(4);
+                        return [3 /*break*/, 7];
+                    case 5: return [4 /*yield*/, curve_1.curve.multicallProvider.all(calls)];
+                    case 6:
+                        _h = (_j.sent()), _fee = _h[0], _adminFee = _h[1], _A = _h[2], _lpTokenSupply = _h[3], _gamma = _h[4], _prices = _h.slice(5);
+                        _j.label = 7;
+                    case 7: return [3 /*break*/, 8];
+                    case 8:
+                        _c = [
                             ethers_1.ethers.utils.formatUnits(_virtualPrice),
-                            ethers_1.ethers.utils.formatUnits(_lpTokenSupply),
                             ethers_1.ethers.utils.formatUnits(_fee, 8),
                             ethers_1.ethers.utils.formatUnits(_adminFee.mul(_fee)),
                             ethers_1.ethers.utils.formatUnits(_A, 0),
+                            ethers_1.ethers.utils.formatUnits(_lpTokenSupply),
                             _gamma ? ethers_1.ethers.utils.formatUnits(_gamma) : _gamma,
-                        ], virtualPrice = _d[0], lpTokenSupply = _d[1], fee = _d[2], adminFee = _d[3], A = _d[4], gamma = _d[5];
+                        ], virtualPrice = _c[0], fee = _c[1], adminFee = _c[2], A = _c[3], lpTokenSupply = _c[4], gamma = _c[5];
+                        if (this.isCrypto) {
+                            prices = _prices.map(function (_p) { return ethers_1.ethers.utils.formatUnits(_p); });
+                            priceOracle = [];
+                            priceScale = [];
+                            for (i = 0; i < this.wrappedCoins.length - 1; i++) {
+                                priceOracle.push(prices.shift());
+                                priceScale.push(prices.shift());
+                            }
+                        }
                         A_PRECISION = curve_1.curve.chainId === 1 && ['compound', 'usdt', 'y', 'busd', 'susd', 'pax', 'ren', 'sbtc', 'hbtc', '3pool'].includes(this.id) ? 1 : 100;
                         return [4 /*yield*/, curve_1.curve.multicallProvider.all(additionalCalls)];
-                    case 6:
-                        _e = _j.sent(), _future_A = _e[0], _initial_A = _e[1], _future_A_time = _e[2], _initial_A_time = _e[3];
-                        _f = [
+                    case 9:
+                        _d = _j.sent(), _future_A = _d[0], _initial_A = _d[1], _future_A_time = _d[2], _initial_A_time = _d[3];
+                        _e = [
                             _future_A ? String(Number(ethers_1.ethers.utils.formatUnits(_future_A, 0)) / A_PRECISION) : undefined,
                             _initial_A ? String(Number(ethers_1.ethers.utils.formatUnits(_initial_A, 0)) / A_PRECISION) : undefined,
                             _future_A_time ? Number(ethers_1.ethers.utils.formatUnits(_future_A_time, 0)) * 1000 : undefined,
                             _initial_A_time ? Number(ethers_1.ethers.utils.formatUnits(_initial_A_time, 0)) * 1000 : undefined,
-                        ], future_A = _f[0], initial_A = _f[1], future_A_time = _f[2], initial_A_time = _f[3];
-                        return [2 /*return*/, { virtualPrice: virtualPrice, lpTokenSupply: lpTokenSupply, fee: fee, adminFee: adminFee, A: A, future_A: future_A, initial_A: initial_A, future_A_time: future_A_time, initial_A_time: initial_A_time, gamma: gamma }];
+                        ], future_A = _e[0], initial_A = _e[1], future_A_time = _e[2], initial_A_time = _e[3];
+                        return [2 /*return*/, { lpTokenSupply: lpTokenSupply, virtualPrice: virtualPrice, fee: fee, adminFee: adminFee, A: A, future_A: future_A, initial_A: initial_A, future_A_time: future_A_time, initial_A_time: initial_A_time, gamma: gamma, priceOracle: priceOracle, priceScale: priceScale }];
                 }
             });
         }); };
@@ -1969,8 +1997,8 @@ var PoolTemplate = /** @class */ (function () {
     PoolTemplate.prototype._depositAndStake = function (amounts, isUnderlying, estimateGas) {
         return __awaiter(this, void 0, void 0, function () {
             var coinAddresses, coins, decimals, depositAddress, balances, _c, _d, _e, _f, _g, i, allowance, _h, _amounts, contract, useUnderlying, _minMintAmount, _j, _k, _l, _m, _o, ethIndex, value, i, _gas, gasLimit;
-            return __generator(this, function (_p) {
-                switch (_p.label) {
+            return __generator(this, function (_q) {
+                switch (_q.label) {
                     case 0:
                         coinAddresses = isUnderlying ? __spreadArray([], this.underlyingCoinAddresses, true) : __spreadArray([], this.wrappedCoinAddresses, true);
                         coins = isUnderlying ? this.underlyingCoins : this.wrappedCoinAddresses;
@@ -1983,14 +2011,14 @@ var PoolTemplate = /** @class */ (function () {
                         _e = (_d = Object).values;
                         return [4 /*yield*/, this.walletUnderlyingCoinBalances()];
                     case 1:
-                        _c = _e.apply(_d, [_p.sent()]);
+                        _c = _e.apply(_d, [_q.sent()]);
                         return [3 /*break*/, 4];
                     case 2:
                         _g = (_f = Object).values;
                         return [4 /*yield*/, this.walletWrappedCoinBalances()];
                     case 3:
-                        _c = _g.apply(_f, [_p.sent()]);
-                        _p.label = 4;
+                        _c = _g.apply(_f, [_q.sent()]);
+                        _q.label = 4;
                     case 4:
                         balances = _c;
                         for (i = 0; i < balances.length; i++) {
@@ -2001,12 +2029,12 @@ var PoolTemplate = /** @class */ (function () {
                         if (!isUnderlying) return [3 /*break*/, 6];
                         return [4 /*yield*/, this.depositAndStakeIsApproved(amounts)];
                     case 5:
-                        _h = _p.sent();
+                        _h = _q.sent();
                         return [3 /*break*/, 8];
                     case 6: return [4 /*yield*/, this.depositAndStakeWrappedIsApproved(amounts)];
                     case 7:
-                        _h = _p.sent();
-                        _p.label = 8;
+                        _h = _q.sent();
+                        _q.label = 8;
                     case 8:
                         allowance = _h;
                         if (estimateGas && !allowance) {
@@ -2016,12 +2044,12 @@ var PoolTemplate = /** @class */ (function () {
                         if (!isUnderlying) return [3 /*break*/, 10];
                         return [4 /*yield*/, this.depositAndStakeApprove(amounts)];
                     case 9:
-                        _p.sent();
+                        _q.sent();
                         return [3 /*break*/, 12];
                     case 10: return [4 /*yield*/, this.depositAndStakeWrappedApprove(amounts)];
                     case 11:
-                        _p.sent();
-                        _p.label = 12;
+                        _q.sent();
+                        _q.label = 12;
                     case 12:
                         _amounts = amounts.map(function (amount, i) { return (0, utils_1.parseUnits)(amount, decimals[i]); });
                         contract = curve_1.curve.contracts[curve_1.curve.constants.ALIASES.deposit_and_stake].contract;
@@ -2030,14 +2058,14 @@ var PoolTemplate = /** @class */ (function () {
                         _l = (_k = ethers_1.ethers.utils).parseUnits;
                         return [4 /*yield*/, this.depositAndStakeExpected(amounts)];
                     case 13:
-                        _j = _l.apply(_k, [_p.sent()]).mul(99).div(100);
+                        _j = _l.apply(_k, [_q.sent()]).mul(99).div(100);
                         return [3 /*break*/, 16];
                     case 14:
                         _o = (_m = ethers_1.ethers.utils).parseUnits;
                         return [4 /*yield*/, this.depositAndStakeWrappedExpected(amounts)];
                     case 15:
-                        _j = _o.apply(_m, [_p.sent()]).mul(99).div(100);
-                        _p.label = 16;
+                        _j = _o.apply(_m, [_q.sent()]).mul(99).div(100);
+                        _q.label = 16;
                     case 16:
                         _minMintAmount = _j;
                         ethIndex = (0, utils_1.getEthIndex)(coinAddresses);
@@ -2048,15 +2076,15 @@ var PoolTemplate = /** @class */ (function () {
                         }
                         return [4 /*yield*/, contract.estimateGas.deposit_and_stake(depositAddress, this.lpToken, this.gauge, coins.length, coinAddresses, _amounts, _minMintAmount, useUnderlying, this.isMetaFactory && isUnderlying ? this.address : ethers_1.ethers.constants.AddressZero, __assign(__assign({}, curve_1.curve.constantOptions), { value: value }))];
                     case 17:
-                        _gas = (_p.sent());
+                        _gas = (_q.sent());
                         if (estimateGas)
                             return [2 /*return*/, _gas.toNumber()];
                         return [4 /*yield*/, curve_1.curve.updateFeeData()];
                     case 18:
-                        _p.sent();
+                        _q.sent();
                         gasLimit = _gas.mul(200).div(100);
                         return [4 /*yield*/, contract.deposit_and_stake(depositAddress, this.lpToken, this.gauge, coins.length, coinAddresses, _amounts, _minMintAmount, useUnderlying, this.isMetaFactory && isUnderlying ? this.address : ethers_1.ethers.constants.AddressZero, __assign(__assign({}, curve_1.curve.options), { gasLimit: gasLimit, value: value }))];
-                    case 19: return [2 /*return*/, (_p.sent()).hash];
+                    case 19: return [2 /*return*/, (_q.sent()).hash];
                 }
             });
         });
@@ -2645,17 +2673,17 @@ var PoolTemplate = /** @class */ (function () {
                         return [3 /*break*/, 5];
                     case 3:
                         _d = (_c = ethers_1.ethers.utils).formatUnits;
-                        return [4 /*yield*/, curve_1.curve.contracts[this.lpToken].contract.totalSupply()];
+                        return [4 /*yield*/, curve_1.curve.contracts[this.lpToken].contract.totalSupply(curve_1.curve.constantOptions)];
                     case 4:
                         totalLp = _d.apply(_c, [_f.sent()]);
                         _f.label = 5;
                     case 5: return [2 /*return*/, {
                             lpUser: userLpTotalBalanceBN.toString(),
                             lpTotal: totalLp,
-                            lpShare: userLpTotalBalanceBN.div(totalLp).times(100).toString(),
+                            lpShare: (0, utils_1.BN)(totalLp).gt(0) ? userLpTotalBalanceBN.div(totalLp).times(100).toString() : '0',
                             gaugeUser: userLpBalance.gauge,
                             gaugeTotal: gaugeLp,
-                            gaugeShare: withGauge ? (0, utils_1.BN)(userLpBalance.gauge).div((0, utils_1.BN)(gaugeLp)).times(100).toString() : undefined,
+                            gaugeShare: !withGauge ? undefined : (0, utils_1.BN)(gaugeLp).gt(0) ? (0, utils_1.BN)(userLpBalance.gauge).div(gaugeLp).times(100).toString() : '0',
                         }];
                 }
             });

package/package.json

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