@curvefi/api 2.61.8 → 2.61.9

package/lib/pools/PoolTemplate.d.ts

@@ -120,7 +120,7 @@ export declare class PoolTemplate {
     depositBonus(amounts: (number | string)[]): Promise<string>;
     depositIsApproved(amounts: (number | string)[]): Promise<boolean>;
     private depositApproveEstimateGas;
-    depositApprove(amounts: (number | string)[]): Promise<string[]>;
+    depositApprove(amounts: (number | string)[], isMax?: boolean): Promise<string[]>;
     private depositEstimateGas;
     deposit(amounts: (number | string)[], slippage?: number): Promise<string>;
     depositWrappedBalancedAmounts(): Promise<string[]>;

package/lib/pools/PoolTemplate.js

@@ -1534,11 +1534,12 @@ var PoolTemplate = /** @class */ (function () {
             });
         });
     };
-    PoolTemplate.prototype.depositApprove = function (amounts) {
+    PoolTemplate.prototype.depositApprove = function (amounts, isMax) {
+        if (isMax === void 0) { isMax = true; }
         return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_c) {
                 switch (_c.label) {
-                    case 0: return [4 /*yield*/, ensureAllowance(this.underlyingCoinAddresses, amounts, this.zap || this.address)];
+                    case 0: return [4 /*yield*/, ensureAllowance(this.underlyingCoinAddresses, amounts, this.zap || this.address, isMax)];
                     case 1: return [2 /*return*/, _c.sent()];
                 }
             });

package/lib/utils.js

@@ -324,51 +324,59 @@ export var hasAllowance = function (coins, amounts, address, spender) { return _
 export 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, _c, _d, gasLimit, _e, _f, _g, _h;
-        return __generator(this, function (_j) {
-            switch (_j.label) {
+        var address, allowance, txHashes, i, contract, _approveAmount, gasLimit_1, _a, _b, resetTx, gasLimit, _c, _d, approveTx;
+        return __generator(this, function (_e) {
+            switch (_e.label) {
                 case 0:
                     address = curve.signerAddress;
                     return [4 /*yield*/, _getAllowance(coins, address, spender)];
                 case 1:
-                    allowance = _j.sent();
+                    allowance = _e.sent();
                     txHashes = [];
                     i = 0;
-                    _j.label = 2;
+                    _e.label = 2;
                 case 2:
-                    if (!(i < allowance.length)) return [3 /*break*/, 10];
-                    if (!(allowance[i] < amounts[i])) return [3 /*break*/, 9];
+                    if (!(i < allowance.length)) return [3 /*break*/, 12];
+                    if (!(allowance[i] < amounts[i])) return [3 /*break*/, 11];
                     contract = curve.contracts[coins[i]].contract;
                     _approveAmount = isMax ? MAX_ALLOWANCE : amounts[i];
                     return [4 /*yield*/, curve.updateFeeData()];
                 case 3:
-                    _j.sent();
-                    if (!(allowance[i] > curve.parseUnits("0"))) return [3 /*break*/, 6];
+                    _e.sent();
+                    if (!(allowance[i] > curve.parseUnits("0"))) return [3 /*break*/, 7];
                     _a = mulBy1_3;
                     _b = DIGas;
                     return [4 /*yield*/, contract.approve.estimateGas(spender, curve.parseUnits("0"), curve.constantOptions)];
                 case 4:
-                    gasLimit_1 = _a.apply(void 0, [_b.apply(void 0, [_j.sent()])]);
-                    _d = (_c = txHashes).push;
+                    gasLimit_1 = _a.apply(void 0, [_b.apply(void 0, [_e.sent()])]);
                     return [4 /*yield*/, contract.approve(spender, curve.parseUnits("0"), __assign(__assign({}, curve.options), { gasLimit: gasLimit_1 }))];
                 case 5:
-                    _d.apply(_c, [(_j.sent()).hash]);
-                    _j.label = 6;
+                    resetTx = _e.sent();
+                    console.log("Reset approval tx hash: ".concat(resetTx.hash));
+                    txHashes.push(resetTx.hash);
+                    return [4 /*yield*/, resetTx.wait()];
                 case 6:
-                    _e = mulBy1_3;
-                    _f = DIGas;
-                    return [4 /*yield*/, contract.approve.estimateGas(spender, _approveAmount, curve.constantOptions)];
+                    _e.sent();
+                    _e.label = 7;
                 case 7:
-                    gasLimit = _e.apply(void 0, [_f.apply(void 0, [_j.sent()])]);
-                    _h = (_g = txHashes).push;
-                    return [4 /*yield*/, contract.approve(spender, _approveAmount, __assign(__assign({}, curve.options), { gasLimit: gasLimit }))];
+                    _c = mulBy1_3;
+                    _d = DIGas;
+                    return [4 /*yield*/, contract.approve.estimateGas(spender, _approveAmount, curve.constantOptions)];
                 case 8:
-                    _h.apply(_g, [(_j.sent()).hash]);
-                    _j.label = 9;
+                    gasLimit = _c.apply(void 0, [_d.apply(void 0, [_e.sent()])]);
+                    return [4 /*yield*/, contract.approve(spender, _approveAmount, __assign(__assign({}, curve.options), { gasLimit: gasLimit }))];
                 case 9:
+                    approveTx = _e.sent();
+                    console.log("Set approval tx hash: ".concat(approveTx.hash));
+                    txHashes.push(approveTx.hash);
+                    return [4 /*yield*/, approveTx.wait()];
+                case 10:
+                    _e.sent();
+                    _e.label = 11;
+                case 11:
                     i++;
                     return [3 /*break*/, 2];
-                case 10: return [2 /*return*/, txHashes];
+                case 12: return [2 /*return*/, txHashes];
             }
         });
     });

package/package.json

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