@curvefi/api 1.2.0 → 1.4.2

package/lib/utils.d.ts

@@ -17,6 +17,7 @@ export declare const _getAllowance: (coins: string[], address: string, spender:
 export declare const getAllowance: (coins: string[], address: string, spender: string) => Promise<string[]>;
 export declare const hasAllowance: (coins: string[], amounts: 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: string[], spender: string) => Promise<number>;
 export declare const ensureAllowance: (coins: string[], amounts: string[], spender: string) => Promise<string[]>;
 export declare const getPoolNameBySwapAddress: (swapAddress: string) => string;
 export declare const getCrvRate: () => Promise<number>;

package/lib/utils.js

@@ -46,16 +46,20 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
-var __spreadArray = (this && this.__spreadArray) || function (to, from) {
-    for (var i = 0, il = from.length, j = to.length; i < il; i++, j++)
-        to[j] = from[i];
-    return to;
+var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
+    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+        if (ar || !(i in from)) {
+            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+            ar[i] = from[i];
+        }
+    }
+    return to.concat(ar || Array.prototype.slice.call(from));
 };
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getCrvRate = exports.getPoolNameBySwapAddress = exports.ensureAllowance = exports._ensureAllowance = exports.hasAllowance = exports.getAllowance = exports._getAllowance = exports.getBalances = exports._prepareAddresses = exports._getBalances = exports._getCoinDecimals = exports._getCoinAddresses = exports.getEthIndex = exports.isEth = exports.fromBN = exports.toStringFromBN = exports.toBN = exports.BN = exports.MAX_ALLOWANCE = void 0;
+exports.getCrvRate = 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.fromBN = exports.toStringFromBN = exports.toBN = exports.BN = exports.MAX_ALLOWANCE = void 0;
 var axios_1 = __importDefault(require("axios"));
 var ethers_1 = require("ethers");
 var bignumber_js_1 = __importDefault(require("bignumber.js"));
@@ -71,7 +75,7 @@ var BN = function (val) { return new bignumber_js_1.default(val); };
 exports.BN = BN;
 var toBN = function (n, decimals) {
     if (decimals === void 0) { decimals = 18; }
-    return exports.BN(ethers_1.ethers.utils.formatUnits(n, decimals)).times(decimals);
+    return (0, exports.BN)(ethers_1.ethers.utils.formatUnits(n, decimals)).times(decimals);
 };
 exports.toBN = toBN;
 var toStringFromBN = function (bn, decimals) {
@@ -81,7 +85,7 @@ var toStringFromBN = function (bn, decimals) {
 exports.toStringFromBN = toStringFromBN;
 var fromBN = function (bn, decimals) {
     if (decimals === void 0) { decimals = 18; }
-    return ethers_1.ethers.utils.parseUnits(exports.toStringFromBN(bn, decimals), decimals);
+    return ethers_1.ethers.utils.parseUnits((0, exports.toStringFromBN)(bn, decimals), decimals);
 };
 exports.fromBN = fromBN;
 // -------------------
@@ -99,7 +103,7 @@ var _getCoinAddresses = function () {
         coins = coins[0];
     coins = coins;
     var coinAddresses = coins.map(function (c) { return coins_1.COINS[c.toLowerCase()] || c; });
-    var availableAddresses = __spreadArray(__spreadArray(__spreadArray([], Object.keys(coins_1.LOWER_CASE_DECIMALS).filter(function (c) { return c !== coins_1.COINS['snx'].toLowerCase(); })), LP_TOKENS), GAUGES);
+    var availableAddresses = __spreadArray(__spreadArray(__spreadArray([], Object.keys(coins_1.LOWER_CASE_DECIMALS).filter(function (c) { return c !== coins_1.COINS['snx'].toLowerCase(); }), true), LP_TOKENS, true), GAUGES, true);
     for (var _a = 0, coinAddresses_1 = coinAddresses; _a < coinAddresses_1.length; _a++) {
         var coinAddr = coinAddresses_1[_a];
         if (!availableAddresses.includes(coinAddr.toLowerCase()))
@@ -124,9 +128,9 @@ var _getBalances = function (coins, addresses) { return __awaiter(void 0, void 0
     return __generator(this, function (_e) {
         switch (_e.label) {
             case 0:
-                coinAddresses = exports._getCoinAddresses(coins);
-                decimals = exports._getCoinDecimals(coinAddresses);
-                ethIndex = exports.getEthIndex(coinAddresses);
+                coinAddresses = (0, exports._getCoinAddresses)(coins);
+                decimals = (0, exports._getCoinDecimals)(coinAddresses);
+                ethIndex = (0, exports.getEthIndex)(coinAddresses);
                 if (ethIndex !== -1) {
                     coinAddresses.splice(ethIndex, 1);
                 }
@@ -157,7 +161,7 @@ var _getBalances = function (coins, addresses) { return __awaiter(void 0, void 0
                 _a++;
                 return [3 /*break*/, 2];
             case 5:
-                response.splice.apply(response, __spreadArray([ethIndex * addresses.length, 0], ethBalances));
+                response.splice.apply(response, __spreadArray([ethIndex * addresses.length, 0], ethBalances, false));
                 _e.label = 6;
             case 6:
                 _balances = {};
@@ -193,8 +197,8 @@ var getBalances = function (coins) {
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
-                    addresses = exports._prepareAddresses(addresses);
-                    return [4 /*yield*/, exports._getBalances(coins, addresses)];
+                    addresses = (0, exports._prepareAddresses)(addresses);
+                    return [4 /*yield*/, (0, exports._getBalances)(coins, addresses)];
                 case 1:
                     balances = _a.sent();
                     return [2 /*return*/, addresses.length === 1 ? balances[addresses[0]] : balances];
@@ -208,8 +212,8 @@ var _getAllowance = function (coins, address, spender) { return __awaiter(void 0
     return __generator(this, function (_a) {
         switch (_a.label) {
             case 0:
-                _coins = __spreadArray([], coins);
-                ethIndex = exports.getEthIndex(_coins);
+                _coins = __spreadArray([], coins, true);
+                ethIndex = (0, exports.getEthIndex)(_coins);
                 if (ethIndex !== -1) {
                     _coins.splice(ethIndex, 1);
                 }
@@ -239,9 +243,9 @@ var getAllowance = function (coins, address, spender) { return __awaiter(void 0,
     return __generator(this, function (_a) {
         switch (_a.label) {
             case 0:
-                coinAddresses = exports._getCoinAddresses(coins);
-                decimals = exports._getCoinDecimals(coinAddresses);
-                return [4 /*yield*/, exports._getAllowance(coinAddresses, address, spender)];
+                coinAddresses = (0, exports._getCoinAddresses)(coins);
+                decimals = (0, exports._getCoinDecimals)(coinAddresses);
+                return [4 /*yield*/, (0, exports._getAllowance)(coinAddresses, address, spender)];
             case 1:
                 _allowance = _a.sent();
                 return [2 /*return*/, _allowance.map(function (a, i) { return ethers_1.ethers.utils.formatUnits(a, decimals[i]); })];
@@ -255,9 +259,9 @@ var hasAllowance = function (coins, amounts, address, spender) { return __awaite
     return __generator(this, function (_a) {
         switch (_a.label) {
             case 0:
-                coinAddresses = exports._getCoinAddresses(coins);
-                decimals = exports._getCoinDecimals(coinAddresses);
-                return [4 /*yield*/, exports._getAllowance(coinAddresses, address, spender)];
+                coinAddresses = (0, exports._getCoinAddresses)(coins);
+                decimals = (0, exports._getCoinDecimals)(coinAddresses);
+                return [4 /*yield*/, (0, exports._getAllowance)(coinAddresses, address, spender)];
             case 1:
                 _allowance = _a.sent();
                 _amounts = amounts.map(function (a, i) { return ethers_1.ethers.utils.parseUnits(a, decimals[i]); });
@@ -272,51 +276,94 @@ var _ensureAllowance = function (coins, amounts, spender) { return __awaiter(voi
         switch (_e.label) {
             case 0:
                 address = curve_1.curve.signerAddress;
-                return [4 /*yield*/, exports._getAllowance(coins, address, spender)];
+                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*/, 9];
-                if (!allowance[i].lt(amounts[i])) return [3 /*break*/, 8];
+                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;
-                if (!allowance[i].gt(ethers_1.ethers.BigNumber.from(0))) return [3 /*break*/, 5];
-                return [4 /*yield*/, contract.estimateGas.approve(spender, ethers_1.ethers.BigNumber.from(0), curve_1.curve.options)];
+                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 4:
+            case 5:
                 _b.apply(_a, [(_e.sent()).hash]);
-                _e.label = 5;
-            case 5: return [4 /*yield*/, contract.estimateGas.approve(spender, exports.MAX_ALLOWANCE, curve_1.curve.options)];
-            case 6:
+                _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 7:
-                _d.apply(_c, [(_e.sent()).hash]);
-                _e.label = 8;
             case 8:
+                _d.apply(_c, [(_e.sent()).hash]);
+                _e.label = 9;
+            case 9:
                 i++;
                 return [3 /*break*/, 2];
-            case 9: return [2 /*return*/, txHashes];
+            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 ethers_1.ethers.utils.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];
+        }
+    });
+}); };
+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 = exports._getCoinAddresses(coins);
-                decimals = exports._getCoinDecimals(coinAddresses);
+                coinAddresses = (0, exports._getCoinAddresses)(coins);
+                decimals = (0, exports._getCoinDecimals)(coinAddresses);
                 _amounts = amounts.map(function (a, i) { return ethers_1.ethers.utils.parseUnits(a, decimals[i]); });
-                return [4 /*yield*/, exports._ensureAllowance(coinAddresses, _amounts, spender)];
+                return [4 /*yield*/, (0, exports._ensureAllowance)(coinAddresses, _amounts, spender)];
             case 1: return [2 /*return*/, _a.sent()];
         }
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@curvefi/api",
-  "version": "1.2.0",
+  "version": "1.4.2",
   "description": "JavaScript library for curve.fi",
   "main": "lib/index.js",
   "scripts": {
@@ -23,7 +23,7 @@
   "dependencies": {
     "axios": "^0.21.1",
     "bignumber.js": "^9.0.1",
-    "ethers": "^5.1.0",
+    "ethers": "^5.4.6",
     "ethers-multicall": "^0.1.6"
   }
 }