@curvefi/api 2.8.4 → 2.8.7

package/lib/curve.js

@@ -188,11 +188,12 @@ var Curve = /** @class */ (function () {
     }
     Curve.prototype.init = function (providerType, providerSettings, options // gasPrice in Gwei
     ) {
+        var _a;
         if (options === void 0) { options = {}; }
         return __awaiter(this, void 0, void 0, function () {
-            var network, _a, _b, cTokens, yTokens, ycTokens, aTokens, customAbiTokens, _c, err_1, _i, _d, pool, _e, _f, coinAddr, _g, _h, coinAddr, _j, _k, coinAddr, _minterABI, addressProviderContract, _l;
-            return __generator(this, function (_m) {
-                switch (_m.label) {
+            var network, _b, _c, cTokens, yTokens, ycTokens, aTokens, customAbiTokens, _d, err_1, _i, _e, pool, _f, _g, coinAddr, _h, _j, coinAddr, _k, _l, coinAddr, _minterABI, addressProviderContract, _m;
+            return __generator(this, function (_o) {
+                switch (_o.label) {
                     case 0:
                         // @ts-ignore
                         this.provider = null;
@@ -228,7 +229,7 @@ var Curve = /** @class */ (function () {
                             if (providerSettings.privateKey) {
                                 this.signer = new ethers_1.ethers.Wallet(providerSettings.privateKey, this.provider);
                             }
-                            else {
+                            else if (!((_a = providerSettings.url) === null || _a === void 0 ? void 0 : _a.startsWith("https://rpc.gnosischain.com"))) {
                                 this.signer = this.provider.getSigner();
                             }
                             // Web3 provider
@@ -253,14 +254,14 @@ var Curve = /** @class */ (function () {
                         else {
                             throw Error('Wrong providerType');
                         }
-                        _a = this.provider.network;
-                        if (_a) return [3 /*break*/, 2];
+                        _b = this.provider.network;
+                        if (_b) return [3 /*break*/, 2];
                         return [4 /*yield*/, this.provider._networkPromise];
                     case 1:
-                        _a = (_m.sent());
-                        _m.label = 2;
+                        _b = (_o.sent());
+                        _o.label = 2;
                     case 2:
-                        network = _a;
+                        network = _b;
                         console.log("CURVE-JS IS CONNECTED TO NETWORK:", network);
                         this.chainId = network.chainId === 1337 ? 1 : network.chainId;
                         this.constants.NETWORK_NAME = exports.NETWORK_CONSTANTS[this.chainId].NAME;
@@ -269,41 +270,41 @@ var Curve = /** @class */ (function () {
                         this.constants.COINS = exports.NETWORK_CONSTANTS[this.chainId].COINS;
                         this.constants.DECIMALS = (0, utils_1.extractDecimals)(this.constants.POOLS_DATA);
                         this.constants.GAUGES = (0, utils_1.extractGauges)(this.constants.POOLS_DATA);
-                        _b = [
+                        _c = [
                             exports.NETWORK_CONSTANTS[this.chainId].cTokens,
                             exports.NETWORK_CONSTANTS[this.chainId].yTokens,
                             exports.NETWORK_CONSTANTS[this.chainId].ycTokens,
                             exports.NETWORK_CONSTANTS[this.chainId].aTokens,
-                        ], cTokens = _b[0], yTokens = _b[1], ycTokens = _b[2], aTokens = _b[3];
+                        ], cTokens = _c[0], yTokens = _c[1], ycTokens = _c[2], aTokens = _c[3];
                         customAbiTokens = __spreadArray(__spreadArray(__spreadArray(__spreadArray([], cTokens, true), yTokens, true), ycTokens, true), aTokens, true);
                         this.multicallProvider = new ethcall_1.Provider();
                         return [4 /*yield*/, this.multicallProvider.init(this.provider)];
                     case 3:
-                        _m.sent();
+                        _o.sent();
                         if (!this.signer) return [3 /*break*/, 8];
-                        _m.label = 4;
+                        _o.label = 4;
                     case 4:
-                        _m.trys.push([4, 6, , 7]);
-                        _c = this;
+                        _o.trys.push([4, 6, , 7]);
+                        _d = this;
                         return [4 /*yield*/, this.signer.getAddress()];
                     case 5:
-                        _c.signerAddress = _m.sent();
+                        _d.signerAddress = _o.sent();
                         return [3 /*break*/, 7];
                     case 6:
-                        err_1 = _m.sent();
+                        err_1 = _o.sent();
                         this.signer = null;
                         return [3 /*break*/, 7];
                     case 7: return [3 /*break*/, 9];
                     case 8:
                         this.signerAddress = '';
-                        _m.label = 9;
+                        _o.label = 9;
                     case 9:
                         this.feeData = { gasPrice: options.gasPrice, maxFeePerGas: options.maxFeePerGas, maxPriorityFeePerGas: options.maxPriorityFeePerGas };
                         return [4 /*yield*/, this.updateFeeData()];
                     case 10:
-                        _m.sent();
-                        for (_i = 0, _d = Object.values(this.constants.POOLS_DATA); _i < _d.length; _i++) {
-                            pool = _d[_i];
+                        _o.sent();
+                        for (_i = 0, _e = Object.values(this.constants.POOLS_DATA); _i < _e.length; _i++) {
+                            pool = _e[_i];
                             this.contracts[pool.swap_address] = {
                                 contract: new ethers_1.Contract(pool.swap_address, pool.swap_abi, this.signer || this.provider),
                                 multicallContract: new ethcall_1.Contract(pool.swap_address, pool.swap_abi),
@@ -326,15 +327,15 @@ var Curve = /** @class */ (function () {
                                     multicallContract: new ethcall_1.Contract(pool.deposit_address, pool.deposit_abi),
                                 };
                             }
-                            for (_e = 0, _f = pool.underlying_coin_addresses; _e < _f.length; _e++) {
-                                coinAddr = _f[_e];
+                            for (_f = 0, _g = pool.underlying_coin_addresses; _f < _g.length; _f++) {
+                                coinAddr = _g[_f];
                                 this.contracts[coinAddr] = {
                                     contract: new ethers_1.Contract(coinAddr, ERC20_json_1.default, this.signer || this.provider),
                                     multicallContract: new ethcall_1.Contract(coinAddr, ERC20_json_1.default),
                                 };
                             }
-                            for (_g = 0, _h = pool.wrapped_coin_addresses; _g < _h.length; _g++) {
-                                coinAddr = _h[_g];
+                            for (_h = 0, _j = pool.wrapped_coin_addresses; _h < _j.length; _h++) {
+                                coinAddr = _j[_h];
                                 if (customAbiTokens.includes(coinAddr))
                                     continue;
                                 if (coinAddr in this.contracts)
@@ -345,8 +346,8 @@ var Curve = /** @class */ (function () {
                                 };
                             }
                             // TODO add all coins
-                            for (_j = 0, _k = pool.wrapped_coin_addresses; _j < _k.length; _j++) {
-                                coinAddr = _k[_j];
+                            for (_k = 0, _l = pool.wrapped_coin_addresses; _k < _l.length; _k++) {
+                                coinAddr = _l[_k];
                                 if (cTokens.includes(coinAddr)) {
                                     this.contracts[coinAddr] = {
                                         contract: new ethers_1.Contract(coinAddr, cERC20_json_1.default, this.signer || this.provider),
@@ -414,10 +415,10 @@ var Curve = /** @class */ (function () {
                             multicallContract: new ethcall_1.Contract(this.constants.ALIASES.address_provider, address_provider_json_1.default),
                         };
                         addressProviderContract = this.contracts[this.constants.ALIASES.address_provider].contract;
-                        _l = this.constants.ALIASES;
+                        _m = this.constants.ALIASES;
                         return [4 /*yield*/, addressProviderContract.get_address(2, this.constantOptions)];
                     case 11:
-                        _l.registry_exchange = _m.sent();
+                        _m.registry_exchange = _o.sent();
                         this.contracts[this.constants.ALIASES.registry_exchange] = {
                             contract: new ethers_1.Contract(this.constants.ALIASES.registry_exchange, registry_exchange_json_1.default, this.signer || this.provider),
                             multicallContract: new ethcall_1.Contract(this.constants.ALIASES.registry_exchange, registry_exchange_json_1.default),

package/lib/factory/common.js

@@ -32,6 +32,11 @@ function setFactoryZapContracts() {
             contract: new ethers_1.Contract(metaUsdZapAddress, deposit_json_1.default, this.signer || this.provider),
             multicallContract: new ethcall_1.Contract(metaUsdZapAddress, deposit_json_1.default),
         };
+        var metaUsd2ZapAddress = "0x4244eB811D6e0Ef302326675207A95113dB4E1F8".toLowerCase();
+        this.contracts[metaUsd2ZapAddress] = {
+            contract: new ethers_1.Contract(metaUsd2ZapAddress, DepositZapFantom_json_1.default, this.signer || this.provider),
+            multicallContract: new ethcall_1.Contract(metaUsd2ZapAddress, DepositZapFantom_json_1.default),
+        };
     }
     else if (this.chainId === 100) {
         var metaUsdZapAddress = "0x87C067fAc25f123554a0E76596BF28cFa37fD5E9".toLowerCase();
@@ -92,6 +97,11 @@ function setFactoryZapContracts() {
             contract: new ethers_1.Contract(metaBtcZapAddress, DepositZapFantom_json_1.default, this.signer || this.provider),
             multicallContract: new ethcall_1.Contract(metaBtcZapAddress, DepositZapFantom_json_1.default),
         };
+        var metaUsd2ZapAddress = "0x58AC91f5BE7dC0c35b24B96B19BAc55FBB8E705e".toLowerCase();
+        this.contracts[metaUsd2ZapAddress] = {
+            contract: new ethers_1.Contract(metaUsd2ZapAddress, DepositZapFantom_json_1.default, this.signer || this.provider),
+            multicallContract: new ethcall_1.Contract(metaUsd2ZapAddress, DepositZapFantom_json_1.default),
+        };
     }
 }
 exports.setFactoryZapContracts = setFactoryZapContracts;

package/lib/factory/constants.js

@@ -110,6 +110,8 @@ exports.implementationABIDictArbitrum = {
     "0xBE175115BF33E12348ff77CcfEE4726866A0Fbd5": MetaUSDBalances_json_1.default,
     "0x094d12e5b541784701FD8d65F11fc0598FBC6332": MetaBTCRen_json_1.default,
     "0xF1f85a74AD6c64315F85af52d3d46bF715236ADc": MetaBTCBalancesRen_json_1.default,
+    "0x8DEb66a4A40E370355bEe35f12E55Fe9c755d686": MetaFraxUSD_json_1.default,
+    "0x3edE9b145F82e9e46C03f8A8F67B77aEE847b632": MetaFraxUSDBalances_json_1.default,
     "0x54e8A25d0Ac0E4945b697C80b8372445FEA17A62": Plain2Basic_json_1.default,
     "0xD68970e266cE1A015953897C7055a5E0bC657Af8": Plain2Balances_json_1.default,
     "0x7DA64233Fefb352f8F501B357c018158ED8aA455": Plain2ETH_json_1.default,
@@ -193,6 +195,8 @@ exports.implementationBasePoolIdDictArbitrum = {
     "0xBE175115BF33E12348ff77CcfEE4726866A0Fbd5": "2pool",
     "0x094d12e5b541784701FD8d65F11fc0598FBC6332": "ren",
     "0xF1f85a74AD6c64315F85af52d3d46bF715236ADc": "ren",
+    "0x8DEb66a4A40E370355bEe35f12E55Fe9c755d686": "factory-v2-41",
+    "0x3edE9b145F82e9e46C03f8A8F67B77aEE847b632": "factory-v2-41", // fraxbp
 };
 exports.implementationBasePoolIdDictOptimism = {
     "0x78CF256256C8089d68Cde634Cf7cDEFb39286470": "3pool",
@@ -226,10 +230,11 @@ exports.basePoolIdZapDictAvalanche = {
 exports.basePoolIdZapDictArbitrum = {
     "2pool": "0x7544Fe3d184b6B55D6B36c3FCA1157eE0Ba30287".toLowerCase(),
     ren: "0x803A2B40c5a9BB2B86DD630B274Fa2A9202874C2".toLowerCase(),
+    "factory-v2-41": "0x58AC91f5BE7dC0c35b24B96B19BAc55FBB8E705e".toLowerCase(),
 };
 exports.basePoolIdZapDictOptimism = {
     "3pool": "0x167e42a1c7ab4be03764a2222aac57f5f6754411".toLowerCase(),
-    "factory-v2-16": "'0x4244eB811D6e0Ef302326675207A95113dB4E1F8'".toLowerCase(),
+    "factory-v2-16": "0x4244eB811D6e0Ef302326675207A95113dB4E1F8".toLowerCase(),
 };
 exports.basePoolIdZapDictXDai = {
     "3pool": "0x87C067fAc25f123554a0E76596BF28cFa37fD5E9".toLowerCase(),

package/lib/pools/PoolTemplate.js

@@ -569,9 +569,9 @@ var PoolTemplate = /** @class */ (function () {
         };
         // ---------------- REWARDS PROFIT, CLAIM ----------------
         this.rewardTokens = (0, memoizee_1.default)(function () { return __awaiter(_this, void 0, void 0, function () {
-            var gaugeContract, gaugeMulticallContract, rewardCount, _c, _d, _e, tokenCalls, i, tokens, tokenInfoCalls, _i, tokens_1, token, tokenMulticallContract, tokenInfo_1, i, rewardContract, method, token, tokenMulticallContract, _f, symbol, decimals;
-            return __generator(this, function (_g) {
-                switch (_g.label) {
+            var gaugeContract, gaugeMulticallContract, rewardCount, _c, _d, _e, tokenCalls, i, tokens, tokenInfoCalls, _i, tokens_1, token, tokenMulticallContract, tokenInfo_1, i, rewardContract, method, token, tokenMulticallContract, res, symbol, decimals;
+            return __generator(this, function (_f) {
+                switch (_f.label) {
                     case 0:
                         if (this.gauge === ethers_1.ethers.constants.AddressZero)
                             return [2 /*return*/, []];
@@ -584,8 +584,8 @@ var PoolTemplate = /** @class */ (function () {
                         _e = (_d = ethers_1.ethers.utils).formatUnits;
                         return [4 /*yield*/, gaugeContract.reward_count(curve_1.curve.constantOptions)];
                     case 1:
-                        rewardCount = _c.apply(void 0, [_e.apply(_d, [_g.sent(), 0])]);
-                        _g.label = 2;
+                        rewardCount = _c.apply(void 0, [_e.apply(_d, [_f.sent(), 0])]);
+                        _f.label = 2;
                     case 2:
                         tokenCalls = [];
                         for (i = 0; i < rewardCount; i++) {
@@ -593,7 +593,7 @@ var PoolTemplate = /** @class */ (function () {
                         }
                         return [4 /*yield*/, curve_1.curve.multicallProvider.all(tokenCalls)];
                     case 3:
-                        tokens = (_g.sent())
+                        tokens = (_f.sent())
                             .filter(function (addr) { return addr !== ethers_1.ethers.constants.AddressZero; })
                             .map(function (addr) { return addr.toLowerCase(); });
                         tokenInfoCalls = [];
@@ -605,7 +605,7 @@ var PoolTemplate = /** @class */ (function () {
                         }
                         return [4 /*yield*/, curve_1.curve.multicallProvider.all(tokenInfoCalls)];
                     case 4:
-                        tokenInfo_1 = _g.sent();
+                        tokenInfo_1 = _f.sent();
                         for (i = 0; i < tokens.length; i++) {
                             curve_1.curve.constants.DECIMALS[tokens[i]] = tokenInfo_1[(i * 2) + 1];
                         }
@@ -617,7 +617,7 @@ var PoolTemplate = /** @class */ (function () {
                         ;
                         return [4 /*yield*/, rewardContract[method](curve_1.curve.constantOptions)];
                     case 6:
-                        token = (_g.sent()).toLowerCase();
+                        token = (_f.sent()).toLowerCase();
                         (0, utils_1._setContracts)(token, ERC20_json_1.default);
                         tokenMulticallContract = curve_1.curve.contracts[token].multicallContract;
                         return [4 /*yield*/, curve_1.curve.multicallProvider.all([
@@ -625,7 +625,9 @@ var PoolTemplate = /** @class */ (function () {
                                 tokenMulticallContract.decimals(),
                             ])];
                     case 7:
-                        _f = _g.sent(), symbol = _f[0], decimals = _f[1];
+                        res = _f.sent();
+                        symbol = res[0];
+                        decimals = res[0].toNumber();
                         return [2 /*return*/, [{ token: token, symbol: symbol, decimals: decimals }]];
                     case 8: return [2 /*return*/, []]; // gauge
                 }
@@ -699,7 +701,7 @@ var PoolTemplate = /** @class */ (function () {
                                 ])];
                         case 8:
                             _d = _f.sent(), _inflationRate = _d[0], _periodFinish = _d[1], _balance = _d[2], _totalSupply = _d[3];
-                            periodFinish = Number(ethers_1.ethers.utils.formatUnits(_periodFinish, 0)) * 1000;
+                            periodFinish = _periodFinish.toNumber() * 1000;
                             inflationRateBN = periodFinish > Date.now() ? (0, utils_1.toBN)(_inflationRate, rewardToken.decimals) : (0, utils_1.BN)(0);
                             balanceBN = (0, utils_1.toBN)(_balance);
                             totalSupplyBN = (0, utils_1.toBN)(_totalSupply);

package/lib/utils.d.ts

@@ -13,6 +13,7 @@ export declare const formatNumber: (n: number | string, decimals?: number) => st
 export declare const parseUnits: (n: number | string, decimals?: number) => ethers.BigNumber;
 export declare const isEth: (address: string) => boolean;
 export declare const getEthIndex: (addresses: string[]) => number;
+export declare const _getCoinAddressesNoCheck: (...coins: string[] | string[][]) => string[];
 export declare const _getCoinAddresses: (...coins: string[] | string[][]) => string[];
 export declare const _getCoinDecimals: (...coinAddresses: string[] | string[][]) => number[];
 export declare const _getBalances: (coins: string[], addresses: string[]) => Promise<IDict<string[]>>;

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._setContracts = exports.getTVL = exports.getUsdRate = exports._getUsdRate = 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.getEthIndex = exports.isEth = exports.parseUnits = exports.formatNumber = exports.checkNumber = exports._cutZeros = exports.fromBN = exports.toStringFromBN = exports.toBN = exports.BN = exports.MAX_ALLOWANCE = exports.ETH_ADDRESS = void 0;
+exports._setContracts = exports.getTVL = exports.getUsdRate = exports._getUsdRate = 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.parseUnits = exports.formatNumber = exports.checkNumber = exports._cutZeros = exports.fromBN = exports.toStringFromBN = exports.toBN = exports.BN = exports.MAX_ALLOWANCE = exports.ETH_ADDRESS = void 0;
 var axios_1 = __importDefault(require("axios"));
 var ethers_1 = require("ethers");
 var bignumber_js_1 = __importDefault(require("bignumber.js"));
@@ -116,7 +116,7 @@ exports.isEth = isEth;
 var getEthIndex = function (addresses) { return addresses.map(function (address) { return address.toLowerCase(); }).indexOf(exports.ETH_ADDRESS.toLowerCase()); };
 exports.getEthIndex = getEthIndex;
 // coins can be either addresses or symbols
-var _getCoinAddresses = function () {
+var _getCoinAddressesNoCheck = function () {
     var coins = [];
     for (var _i = 0; _i < arguments.length; _i++) {
         coins[_i] = arguments[_i];
@@ -124,7 +124,15 @@ var _getCoinAddresses = function () {
     if (coins.length == 1 && Array.isArray(coins[0]))
         coins = coins[0];
     coins = coins;
-    var coinAddresses = coins.map(function (c) { return c.toLowerCase(); }).map(function (c) { return curve_1.curve.constants.COINS[c] || c; });
+    return coins.map(function (c) { return c.toLowerCase(); }).map(function (c) { return curve_1.curve.constants.COINS[c] || c; });
+};
+exports._getCoinAddressesNoCheck = _getCoinAddressesNoCheck;
+var _getCoinAddresses = function () {
+    var coins = [];
+    for (var _i = 0; _i < arguments.length; _i++) {
+        coins[_i] = arguments[_i];
+    }
+    var coinAddresses = exports._getCoinAddressesNoCheck.apply(void 0, coins);
     var availableAddresses = __spreadArray(__spreadArray([], Object.keys(curve_1.curve.constants.DECIMALS), true), curve_1.curve.constants.GAUGES, true);
     for (var _a = 0, coinAddresses_1 = coinAddresses; _a < coinAddresses_1.length; _a++) {
         var coinAddr = coinAddresses_1[_a];
@@ -512,7 +520,7 @@ var getUsdRate = function (coin) { return __awaiter(void 0, void 0, void 0, func
     return __generator(this, function (_a) {
         switch (_a.label) {
             case 0:
-                coinAddress = (0, exports._getCoinAddresses)(coin)[0];
+                coinAddress = (0, exports._getCoinAddressesNoCheck)(coin)[0];
                 return [4 /*yield*/, (0, exports._getUsdRate)(coinAddress)];
             case 1: return [2 /*return*/, _a.sent()];
         }

package/package.json

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