@openocean.finance/openocean-sdk 1.6.21 → 1.6.23

package/lib/swapSdk/Swap.d.ts

@@ -22,7 +22,7 @@ export declare class Swap {
     sendNearTransaction(): Promise<void>;
     sendCosmosTransaction(): Promise<void>;
     getGasOld(): Promise<number>;
-    getGasNew(): Promise<number | undefined>;
+    getGasNew(): Promise<number>;
     sendEthTransactionNew(): Promise<void>;
     sendEthTransaction(): Promise<void>;
     signEthTransactionByLedger(swapParams: any): Promise<void>;

package/lib/swapSdk/Swap.js

@@ -578,11 +578,10 @@ var Swap = /** @class */ (function () {
     };
     Swap.prototype.getGasNew = function () {
         return __awaiter(this, void 0, void 0, function () {
-            var _a, inToken, inAmount, outAmount, outToken, data, to, gmxFee, myWallet, contract, invitee, path, amounts, swapAddr, swapExtraData, value, gas, e_5;
+            var _a, inToken, inAmount, outAmount, outToken, data, to, gmxFee, myWallet, contract, invitee, path, amounts, swapAddr, swapExtraData, value, gas;
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
-                        _b.trys.push([0, 2, , 3]);
                         console.log('getGasNew');
                         _a = this.res, inToken = _a.inToken, inAmount = _a.inAmount, outAmount = _a.outAmount, outToken = _a.outToken, data = _a.data, to = _a.to, gmxFee = _a.gmxFee;
                         myWallet = this.wallet.sdk;
@@ -604,22 +603,16 @@ var Swap = /** @class */ (function () {
                     case 1:
                         gas = _b.sent();
                         return [2 /*return*/, Math.ceil(gas * 1.5)];
-                    case 2:
-                        e_5 = _b.sent();
-                        console.log('getGasNew error', e_5);
-                        return [3 /*break*/, 3];
-                    case 3: return [2 /*return*/];
                 }
             });
         });
     };
     Swap.prototype.sendEthTransactionNew = function () {
         return __awaiter(this, void 0, void 0, function () {
-            var _a, inToken, inAmount, outAmount, outToken, data, to, ethGasPrice, gasPrice, gmxFee, myWallet, contract, invitee, path, amounts, swapAddr, swapExtraData, swapParams, maxFeePerGas, maxPriorityFeePerGas;
-            var _b;
+            var _a, inToken, inAmount, outAmount, outToken, data, to, ethGasPrice, gasPrice, gmxFee, myWallet, contract, invitee, path, amounts, swapAddr, swapExtraData, swapParams, gas, e_5, maxFeePerGas, maxPriorityFeePerGas;
             var _this = this;
-            return __generator(this, function (_c) {
-                switch (_c.label) {
+            return __generator(this, function (_b) {
+                switch (_b.label) {
                     case 0:
                         _a = this.res, inToken = _a.inToken, inAmount = _a.inAmount, outAmount = _a.outAmount, outToken = _a.outToken, data = _a.data, to = _a.to, ethGasPrice = _a.ethGasPrice, gasPrice = _a.gasPrice, gmxFee = _a.gmxFee;
                         console.log('sendEthTransactionNew', JSON.stringify(this.res));
@@ -630,15 +623,27 @@ var Swap = /** @class */ (function () {
                         amounts = [inAmount, outAmount];
                         swapAddr = to;
                         swapExtraData = data;
-                        _b = {
-                            from: this.wallet.address
+                        swapParams = {
+                            from: this.wallet.address,
+                            to: to,
+                            data: data,
                         };
-                        return [4 /*yield*/, this.getGasNew()];
+                        _b.label = 1;
                     case 1:
-                        swapParams = (_b.gas = _c.sent(),
-                            _b.to = to,
-                            _b.data = data,
-                            _b);
+                        _b.trys.push([1, 3, , 4]);
+                        return [4 /*yield*/, this.getGasNew()];
+                    case 2:
+                        gas = _b.sent();
+                        swapParams.gas = gas;
+                        return [3 /*break*/, 4];
+                    case 3:
+                        e_5 = _b.sent();
+                        if (e_5 && e_5.message.indexOf("JSON-RPC error.") != -1) {
+                            e_5 = JSON.parse(e_5.message.split("JSON-RPC error.")[1]);
+                        }
+                        this.errorCallback((e_5 && e_5.message) || e_5);
+                        return [2 /*return*/];
+                    case 4:
                         if (ethGasPrice) {
                             maxFeePerGas = ethGasPrice.maxFeePerGas, maxPriorityFeePerGas = ethGasPrice.maxPriorityFeePerGas;
                             if (maxFeePerGas && maxPriorityFeePerGas) {
@@ -747,7 +752,7 @@ var Swap = /** @class */ (function () {
                             e_7 = JSON.parse(e_7.message.split("JSON-RPC error.")[1]);
                         }
                         this.errorCallback((e_7 && e_7.message) || e_7);
-                        return [3 /*break*/, 9];
+                        return [2 /*return*/];
                     case 9:
                         console.log('sendEthTransaction swapParams', JSON.stringify(swapParams));
                         this.wallet.sdk.eth

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openocean.finance/openocean-sdk",
-  "version": "1.6.21",
+  "version": "1.6.23",
   "description": "Openocean sdk",
   "main": "lib/index.js",
   "scripts": {