@openocean.finance/openocean-sdk 1.7.8 → 1.7.9

package/lib/api/index.js

@@ -15,8 +15,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
+    return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");

package/lib/config/index.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getProxyContract = exports.config = exports.ERC20_abi = void 0;
+exports.config = exports.ERC20_abi = void 0;
+exports.getProxyContract = getProxyContract;
 // import { wallets, Wallets } from "./Wallets";
 // import { chains, Chains } from "./Chains";
 var wallet_1 = require("@openocean.finance/wallet");
@@ -29,5 +30,4 @@ function getProxyContract(chainName) {
         tron: "TTpcMZbsojNCMhea2a9LFHq9DLCxsgGZVv",
     }[chainName];
 }
-exports.getProxyContract = getProxyContract;
 ;

package/lib/swapSdk/Approve.js

@@ -9,8 +9,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
+    return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");

package/lib/swapSdk/Swap.js

@@ -9,8 +9,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
+    return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
@@ -192,16 +192,16 @@ var Swap = /** @class */ (function () {
         });
     };
     Swap.prototype.sendSolanaTransaction = function () {
-        var _a, _b;
         return __awaiter(this, void 0, void 0, function () {
-            var res, transaction, signed, result, bytes, _c, msg, data, bytes, serializedTransaction, blockhashWithExpiryBlockHeight, blockhashInfo, lastValidBlockHeight, transactionResponse, e_1;
+            var res, transaction, signed, result, bytes, _a, msg, data, bytes, serializedTransaction, transactionResponse, e_1;
+            var _b, _c;
             return __generator(this, function (_d) {
                 switch (_d.label) {
                     case 0:
                         res = this.res;
                         _d.label = 1;
                     case 1:
-                        _d.trys.push([1, 13, , 14]);
+                        _d.trys.push([1, 9, , 10]);
                         transaction = '';
                         if (res.dexId == 6 || res.dexId == 7) {
                             transaction = web3_js_1.VersionedTransaction.deserialize(Buffer.from(res.transaction, 'hex'));
@@ -227,7 +227,7 @@ var Swap = /** @class */ (function () {
                         if (!this.wallet.sdk.isSlopeWallet) return [3 /*break*/, 5];
                         return [4 /*yield*/, this.wallet.sdk.signTransaction(bs58.encode(transaction.serializeMessage ? transaction.serializeMessage() : transaction.message.serialize()))];
                     case 4:
-                        _c = _d.sent(), msg = _c.msg, data = _c.data;
+                        _a = _d.sent(), msg = _a.msg, data = _a.data;
                         if (msg !== "ok")
                             return [2 /*return*/];
                         bytes = bs58.decode(data.signature);
@@ -244,34 +244,16 @@ var Swap = /** @class */ (function () {
                             verifySignatures: false,
                             requireAllSignatures: false
                         });
-                        blockhashWithExpiryBlockHeight = void 0;
-                        if (!res.lastValidBlockHeight) return [3 /*break*/, 8];
-                        blockhashWithExpiryBlockHeight = {
-                            blockhash: transaction.message.recentBlockhash,
-                            lastValidBlockHeight: res.lastValidBlockHeight,
-                        };
-                        return [3 /*break*/, 11];
-                    case 8: return [4 /*yield*/, this.wallet.connection.getRecentBlockhash()];
-                    case 9:
-                        blockhashInfo = _d.sent();
-                        return [4 /*yield*/, this.wallet.connection.getBlockHeight()];
-                    case 10:
-                        lastValidBlockHeight = _d.sent();
-                        blockhashWithExpiryBlockHeight = {
-                            blockhash: transaction._message ? transaction._message.recentBlockhash : blockhashInfo.blockhash,
-                            lastValidBlockHeight: lastValidBlockHeight + 400,
-                        };
-                        _d.label = 11;
-                    case 11: return [4 /*yield*/, (0, solanaTransactionSender_1.transactionSenderAndConfirmationWaiter)({
-                            connection: this.wallet.connection,
-                            serializedTransaction: serializedTransaction,
-                            blockhashWithExpiryBlockHeight: blockhashWithExpiryBlockHeight
-                        })];
-                    case 12:
+                        return [4 /*yield*/, (0, solanaTransactionSender_1.transactionSenderAndConfirmationWaiter)({
+                                connection: this.wallet.connection,
+                                serializedTransaction: serializedTransaction,
+                                // blockhashWithExpiryBlockHeight
+                            })];
+                    case 8:
                         transactionResponse = _d.sent();
                         if (transactionResponse && transactionResponse.response) {
-                            if ((_a = transactionResponse.response.meta) === null || _a === void 0 ? void 0 : _a.err) {
-                                this.errorCallback((_b = transactionResponse.response.meta) === null || _b === void 0 ? void 0 : _b.err);
+                            if ((_b = transactionResponse.response.meta) === null || _b === void 0 ? void 0 : _b.err) {
+                                this.errorCallback((_c = transactionResponse.response.meta) === null || _c === void 0 ? void 0 : _c.err);
                             }
                             else {
                                 this.transactionHashCallback(transactionResponse.txid);
@@ -280,12 +262,12 @@ var Swap = /** @class */ (function () {
                         else {
                             this.errorCallback('Transaction not confirmed.');
                         }
-                        return [3 /*break*/, 14];
-                    case 13:
+                        return [3 /*break*/, 10];
+                    case 9:
                         e_1 = _d.sent();
                         this.errorCallback(e_1.message);
-                        return [3 /*break*/, 14];
-                    case 14: return [2 /*return*/];
+                        return [3 /*break*/, 10];
+                    case 10: return [2 /*return*/];
                 }
             });
         });

package/lib/swapSdk/getAllowance.js

@@ -9,8 +9,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
+    return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
@@ -36,7 +36,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     }
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getAllowance = void 0;
+exports.getAllowance = getAllowance;
 var utils_1 = require("./../utils");
 var config_1 = require("./../config");
 var wallet_1 = require("@openocean.finance/wallet");
@@ -95,4 +95,3 @@ function getAllowance(account, tokenAddress, decimals, chainName, approveContrac
         });
     });
 }
-exports.getAllowance = getAllowance;

package/lib/swapSdk/getBalance.js

@@ -9,8 +9,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
+    return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
@@ -39,7 +39,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getBalance = void 0;
+exports.getBalance = getBalance;
 var axios_1 = __importDefault(require("axios"));
 var utils_1 = require("./../utils");
 var terra_js_1 = require("@terra-money/terra.js");
@@ -277,4 +277,3 @@ function getBalance(account, tokenAddressOrSymbol, decimals, chainName, myWallet
         });
     });
 }
-exports.getBalance = getBalance;

package/lib/swapSdk/index.js

@@ -9,8 +9,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
+    return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");

package/lib/swapSdk/solanaTransactionSender.d.ts

@@ -1,9 +1,8 @@
-/// <reference types="node" />
 import { BlockhashWithExpiryBlockHeight, Connection } from "@solana/web3.js";
 type TransactionSenderAndConfirmationWaiterArgs = {
     connection: Connection;
     serializedTransaction: Buffer;
     blockhashWithExpiryBlockHeight?: BlockhashWithExpiryBlockHeight | any;
 };
-export declare function transactionSenderAndConfirmationWaiter({ connection, serializedTransaction, blockhashWithExpiryBlockHeight, }: TransactionSenderAndConfirmationWaiterArgs): Promise<any>;
+export declare function transactionSenderAndConfirmationWaiter({ connection, serializedTransaction, }: TransactionSenderAndConfirmationWaiterArgs): Promise<any>;
 export {};

package/lib/swapSdk/solanaTransactionSender.js

@@ -1,15 +1,4 @@
 "use strict";
-var __assign = (this && this.__assign) || function () {
-    __assign = Object.assign || function(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-                t[p] = s[p];
-        }
-        return t;
-    };
-    return __assign.apply(this, arguments);
-};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -20,8 +9,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
+    return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
@@ -50,25 +39,24 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.transactionSenderAndConfirmationWaiter = void 0;
+exports.transactionSenderAndConfirmationWaiter = transactionSenderAndConfirmationWaiter;
 var web3_js_1 = require("@solana/web3.js");
 var promise_retry_1 = __importDefault(require("promise-retry"));
-var wait = function (time) {
+var sleep = function (time) {
     return new Promise(function (resolve) { return setTimeout(resolve, time); });
 };
 function transactionSenderAndConfirmationWaiter(_a) {
-    var connection = _a.connection, serializedTransaction = _a.serializedTransaction, blockhashWithExpiryBlockHeight = _a.blockhashWithExpiryBlockHeight;
-    return __awaiter(this, void 0, void 0, function () {
-        var txid, controller, abortSignal, abortableResender, races, lastValidBlockHeight, e_1, response;
+    return __awaiter(this, arguments, void 0, function (_b) {
+        var txid, controller, abortSignal, abortableResender, times_1, races, e_1, response;
         var _this = this;
-        return __generator(this, function (_b) {
-            switch (_b.label) {
+        var connection = _b.connection, serializedTransaction = _b.serializedTransaction;
+        return __generator(this, function (_c) {
+            switch (_c.label) {
                 case 0: return [4 /*yield*/, connection.sendRawTransaction(serializedTransaction, {
                         skipPreflight: true,
-                        // preflightCommitment: "confirmed",
                     })];
                 case 1:
-                    txid = _b.sent();
+                    txid = _c.sent();
                     console.log('txid', txid);
                     controller = new AbortController();
                     abortSignal = controller.signal;
@@ -78,7 +66,7 @@ function transactionSenderAndConfirmationWaiter(_a) {
                             switch (_a.label) {
                                 case 0:
                                     if (!true) return [3 /*break*/, 6];
-                                    return [4 /*yield*/, wait(5000)];
+                                    return [4 /*yield*/, sleep(6000)];
                                 case 1:
                                     _a.sent();
                                     if (abortSignal.aborted)
@@ -88,7 +76,6 @@ function transactionSenderAndConfirmationWaiter(_a) {
                                     _a.trys.push([2, 4, , 5]);
                                     return [4 /*yield*/, connection.sendRawTransaction(serializedTransaction, {
                                             skipPreflight: true,
-                                            // preflightCommitment: "confirmed",
                                         })];
                                 case 3:
                                     id = _a.sent();
@@ -104,10 +91,11 @@ function transactionSenderAndConfirmationWaiter(_a) {
                             }
                         });
                     }); };
-                    _b.label = 2;
+                    _c.label = 2;
                 case 2:
-                    _b.trys.push([2, 4, 5, 6]);
+                    _c.trys.push([2, 4, 5, 6]);
                     abortableResender();
+                    times_1 = 0;
                     races = [
                         new Promise(function (resolve) { return __awaiter(_this, void 0, void 0, function () {
                             var tx;
@@ -116,7 +104,10 @@ function transactionSenderAndConfirmationWaiter(_a) {
                                 switch (_b.label) {
                                     case 0:
                                         if (!!abortSignal.aborted) return [3 /*break*/, 3];
-                                        return [4 /*yield*/, wait(4000)];
+                                        times_1++;
+                                        if (times_1 > 8)
+                                            resolve('');
+                                        return [4 /*yield*/, sleep(3000)];
                                     case 1:
                                         _b.sent();
                                         return [4 /*yield*/, connection.getSignatureStatus(txid, {
@@ -133,24 +124,16 @@ function transactionSenderAndConfirmationWaiter(_a) {
                             });
                         }); }),
                     ];
-                    if (blockhashWithExpiryBlockHeight && blockhashWithExpiryBlockHeight.lastValidBlockHeight) {
-                        lastValidBlockHeight = blockhashWithExpiryBlockHeight.lastValidBlockHeight - 150;
-                        races.push(connection.confirmTransaction(__assign(__assign({}, blockhashWithExpiryBlockHeight), { lastValidBlockHeight: lastValidBlockHeight, signature: txid, abortSignal: abortSignal }), "confirmed"));
-                    }
-                    // this would throw TransactionExpiredBlockheightExceededError
                     return [4 /*yield*/, Promise.race(races)];
                 case 3:
-                    // this would throw TransactionExpiredBlockheightExceededError
-                    _b.sent();
+                    _c.sent();
                     return [3 /*break*/, 6];
                 case 4:
-                    e_1 = _b.sent();
+                    e_1 = _c.sent();
                     if (e_1 instanceof web3_js_1.TransactionExpiredBlockheightExceededError) {
-                        // we consume this error and getTransaction would return null
                         return [2 /*return*/, null];
                     }
                     else {
-                        // invalid state from web3.js
                         throw e_1;
                     }
                     return [3 /*break*/, 6];
@@ -175,12 +158,11 @@ function transactionSenderAndConfirmationWaiter(_a) {
                             }
                         });
                     }); }, {
-                        retries: 5,
-                        minTimeout: 1e3,
+                        retries: 2,
+                        minTimeout: 3000,
                     });
                     return [2 /*return*/, { response: response, txid: txid }];
             }
         });
     });
 }
-exports.transactionSenderAndConfirmationWaiter = transactionSenderAndConfirmationWaiter;

package/lib/utils/ajx.js

@@ -9,8 +9,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
+    return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
@@ -39,7 +39,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.post = exports.get = exports.validateReq = void 0;
+exports.validateReq = validateReq;
+exports.get = get;
+exports.post = post;
 var class_validator_1 = require("class-validator");
 var class_transformer_1 = require("class-transformer");
 var axios_1 = __importDefault(require("axios"));
@@ -66,7 +68,6 @@ function validateReq(option, vo) {
         });
     });
 }
-exports.validateReq = validateReq;
 function get(url, option, vo) {
     return __awaiter(this, void 0, void 0, function () {
         var _this = this;
@@ -108,7 +109,6 @@ function get(url, option, vo) {
         });
     });
 }
-exports.get = get;
 function post(url, option, vo) {
     return __awaiter(this, void 0, void 0, function () {
         var _this = this;
@@ -150,4 +150,3 @@ function post(url, option, vo) {
         });
     });
 }
-exports.post = post;

package/lib/utils/index.js

@@ -3,7 +3,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.WETH_ADDRESS = exports.WETH_ABI = exports.EIP_712_ORDER_TYPE = exports.confirmLater = exports.isPc = exports.utils = exports.Utils = exports.ChainNames = void 0;
+exports.WETH_ADDRESS = exports.WETH_ABI = exports.EIP_712_ORDER_TYPE = exports.utils = exports.Utils = exports.ChainNames = void 0;
+exports.isPc = isPc;
+exports.confirmLater = confirmLater;
 var bignumber_js_1 = __importDefault(require("bignumber.js"));
 var ChainNames;
 (function (ChainNames) {
@@ -30,7 +32,7 @@ var ChainNames;
     ChainNames[ChainNames["osmosis"] = 20] = "osmosis";
     ChainNames[ChainNames["harmony"] = 21] = "harmony";
     ChainNames[ChainNames["bsctest"] = 22] = "bsctest";
-})(ChainNames = exports.ChainNames || (exports.ChainNames = {}));
+})(ChainNames || (exports.ChainNames = ChainNames = {}));
 var Utils = /** @class */ (function () {
     function Utils() {
     }
@@ -85,7 +87,6 @@ function isPc() {
         return userAgent.includes(i);
     });
 }
-exports.isPc = isPc;
 function confirmLater(promise) {
     return new Promise(function (resolve, reject) {
         promise.on("transactionHash", resolve);
@@ -96,7 +97,6 @@ function confirmLater(promise) {
         promise.on("confirmation", onConfirm);
     });
 }
-exports.confirmLater = confirmLater;
 exports.EIP_712_ORDER_TYPE = {
     EIP712Domain: [
         {

package/lib/v1/constants.js

@@ -15,18 +15,18 @@ var ChainId;
     ChainId[ChainId["POLYGON"] = 137] = "POLYGON";
     ChainId[ChainId["KAVA"] = 2222] = "KAVA";
     ChainId[ChainId["AVAX"] = 43114] = "AVAX";
-})(ChainId = exports.ChainId || (exports.ChainId = {}));
+})(ChainId || (exports.ChainId = ChainId = {}));
 var TradeType;
 (function (TradeType) {
     TradeType[TradeType["EXACT_INPUT"] = 0] = "EXACT_INPUT";
     TradeType[TradeType["EXACT_OUTPUT"] = 1] = "EXACT_OUTPUT";
-})(TradeType = exports.TradeType || (exports.TradeType = {}));
+})(TradeType || (exports.TradeType = TradeType = {}));
 var Rounding;
 (function (Rounding) {
     Rounding[Rounding["ROUND_DOWN"] = 0] = "ROUND_DOWN";
     Rounding[Rounding["ROUND_HALF_UP"] = 1] = "ROUND_HALF_UP";
     Rounding[Rounding["ROUND_UP"] = 2] = "ROUND_UP";
-})(Rounding = exports.Rounding || (exports.Rounding = {}));
+})(Rounding || (exports.Rounding = Rounding = {}));
 // export const FACTORY_ADDRESS = '0xF22b5afBe6152ca43fAE20DDA4F75575BABD0c5A'
 // export const INIT_CODE_HASH = '0xe7da666f616ba3bdb18c6908b22d556a41659bdd652762c246b8d1fa4f7506b4'
 exports.FACTORY_ADDRESS = {
@@ -64,7 +64,7 @@ var SolidityType;
 (function (SolidityType) {
     SolidityType["uint8"] = "uint8";
     SolidityType["uint256"] = "uint256";
-})(SolidityType = exports.SolidityType || (exports.SolidityType = {}));
+})(SolidityType || (exports.SolidityType = SolidityType = {}));
 exports.SOLIDITY_TYPE_MAXIMA = (_a = {},
     _a[SolidityType.uint8] = jsbi_1.default.BigInt('0xff'),
     _a[SolidityType.uint256] = jsbi_1.default.BigInt('0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff'),

package/lib/v1/entities/token.js

@@ -19,7 +19,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.WETH = exports.currencyEquals = exports.Token = void 0;
+exports.WETH = exports.Token = void 0;
+exports.currencyEquals = currencyEquals;
 var tiny_invariant_1 = __importDefault(require("tiny-invariant"));
 var constants_1 = require("../constants");
 var utils_1 = require("../utils");
@@ -77,7 +78,6 @@ function currencyEquals(currencyA, currencyB) {
         return currencyA === currencyB;
     }
 }
-exports.currencyEquals = currencyEquals;
 exports.WETH = (_a = {},
     _a[constants_1.ChainId.ETH] = new Token(constants_1.ChainId.ETH, '0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2', 18, 'WETH', 'Wrapped ETH'),
     _a[constants_1.ChainId.MAINNET] = new Token(constants_1.ChainId.MAINNET, '0xbb4CdB9CBd36B01bD1cBaEBF2De08d9173bc095c', 18, 'WBNB', 'Wrapped BNB'),

package/lib/v1/entities/trade.js

@@ -12,7 +12,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Trade = exports.tradeComparator = exports.inputOutputComparator = void 0;
+exports.Trade = void 0;
+exports.inputOutputComparator = inputOutputComparator;
+exports.tradeComparator = tradeComparator;
 var tiny_invariant_1 = __importDefault(require("tiny-invariant"));
 var constants_1 = require("../constants");
 var utils_1 = require("../utils");
@@ -64,7 +66,6 @@ function inputOutputComparator(a, b) {
         }
     }
 }
-exports.inputOutputComparator = inputOutputComparator;
 // extension of the input output comparator that also considers other dimensions of the trade in ranking them
 function tradeComparator(a, b) {
     var ioComp = inputOutputComparator(a, b);
@@ -81,7 +82,6 @@ function tradeComparator(a, b) {
     // finally consider the number of hops since each hop costs gas
     return a.route.path.length - b.route.path.length;
 }
-exports.tradeComparator = tradeComparator;
 /**
  * Given a currency amount and a chain ID, returns the equivalent representation as the token amount.
  * In other words, if the currency is ETHER, returns the WETH token amount for the given chain. Otherwise, returns

package/lib/v1/fetcher.js

@@ -20,8 +20,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
+    return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
@@ -85,16 +85,16 @@ var Fetcher = /** @class */ (function () {
      * @param symbol optional symbol of the token
      * @param name optional name of the token
      */
-    Fetcher.fetchTokenData = function (chainId, address, provider, symbol, name) {
-        var _a;
-        if (provider === void 0) { provider = (0, providers_1.getDefaultProvider)((0, networks_1.getNetwork)(chainId)); }
-        return __awaiter(this, void 0, void 0, function () {
-            var parsedDecimals, _b;
+    Fetcher.fetchTokenData = function (chainId_1, address_1) {
+        return __awaiter(this, arguments, void 0, function (chainId, address, provider, symbol, name) {
+            var parsedDecimals, _a;
+            var _b;
+            if (provider === void 0) { provider = (0, providers_1.getDefaultProvider)((0, networks_1.getNetwork)(chainId)); }
             return __generator(this, function (_c) {
                 switch (_c.label) {
                     case 0:
-                        if (!(typeof ((_a = TOKEN_DECIMALS_CACHE === null || TOKEN_DECIMALS_CACHE === void 0 ? void 0 : TOKEN_DECIMALS_CACHE[chainId]) === null || _a === void 0 ? void 0 : _a[address]) === 'number')) return [3 /*break*/, 1];
-                        _b = TOKEN_DECIMALS_CACHE[chainId][address];
+                        if (!(typeof ((_b = TOKEN_DECIMALS_CACHE === null || TOKEN_DECIMALS_CACHE === void 0 ? void 0 : TOKEN_DECIMALS_CACHE[chainId]) === null || _b === void 0 ? void 0 : _b[address]) === 'number')) return [3 /*break*/, 1];
+                        _a = TOKEN_DECIMALS_CACHE[chainId][address];
                         return [3 /*break*/, 3];
                     case 1: return [4 /*yield*/, new contracts_1.Contract(address, ERC20_1.default, provider).decimals().then(function (decimals) {
                             var _a, _b;
@@ -102,10 +102,10 @@ var Fetcher = /** @class */ (function () {
                             return decimals;
                         })];
                     case 2:
-                        _b = _c.sent();
+                        _a = _c.sent();
                         _c.label = 3;
                     case 3:
-                        parsedDecimals = _b;
+                        parsedDecimals = _a;
                         return [2 /*return*/, new token_1.Token(chainId, address, parsedDecimals, symbol, name)];
                 }
             });
@@ -117,10 +117,10 @@ var Fetcher = /** @class */ (function () {
      * @param tokenB second token
      * @param provider the provider to use to fetch the data
      */
-    Fetcher.fetchPairData = function (tokenA, tokenB, provider) {
-        if (provider === void 0) { provider = (0, providers_1.getDefaultProvider)((0, networks_1.getNetwork)(tokenA.chainId)); }
-        return __awaiter(this, void 0, void 0, function () {
+    Fetcher.fetchPairData = function (tokenA_1, tokenB_1) {
+        return __awaiter(this, arguments, void 0, function (tokenA, tokenB, provider) {
             var address, _a, reserves0, reserves1, balances;
+            if (provider === void 0) { provider = (0, providers_1.getDefaultProvider)((0, networks_1.getNetwork)(tokenA.chainId)); }
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:

package/lib/v1/utils.js

@@ -3,7 +3,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.sortedInsert = exports.sqrt = exports.parseBigintIsh = exports.validateAndParseAddress = exports.validateSolidityTypeInstance = void 0;
+exports.validateSolidityTypeInstance = validateSolidityTypeInstance;
+exports.validateAndParseAddress = validateAndParseAddress;
+exports.parseBigintIsh = parseBigintIsh;
+exports.sqrt = sqrt;
+exports.sortedInsert = sortedInsert;
 var tiny_invariant_1 = __importDefault(require("tiny-invariant"));
 var tiny_warning_1 = __importDefault(require("tiny-warning"));
 var jsbi_1 = __importDefault(require("jsbi"));
@@ -13,7 +17,6 @@ function validateSolidityTypeInstance(value, solidityType) {
     (0, tiny_invariant_1.default)(jsbi_1.default.greaterThanOrEqual(value, constants_1.ZERO), "".concat(value, " is not a ").concat(solidityType, "."));
     (0, tiny_invariant_1.default)(jsbi_1.default.lessThanOrEqual(value, constants_1.SOLIDITY_TYPE_MAXIMA[solidityType]), "".concat(value, " is not a ").concat(solidityType, "."));
 }
-exports.validateSolidityTypeInstance = validateSolidityTypeInstance;
 // warns if addresses are not checksummed
 function validateAndParseAddress(address) {
     try {
@@ -25,7 +28,6 @@ function validateAndParseAddress(address) {
         (0, tiny_invariant_1.default)(false, "".concat(address, " is not a valid address."));
     }
 }
-exports.validateAndParseAddress = validateAndParseAddress;
 function parseBigintIsh(bigintIsh) {
     return bigintIsh instanceof jsbi_1.default
         ? bigintIsh
@@ -33,7 +35,6 @@ function parseBigintIsh(bigintIsh) {
             ? jsbi_1.default.BigInt(bigintIsh.toString())
             : jsbi_1.default.BigInt(bigintIsh);
 }
-exports.parseBigintIsh = parseBigintIsh;
 // mock the on-chain sqrt function
 function sqrt(y) {
     validateSolidityTypeInstance(y, constants_1.SolidityType.uint256);
@@ -52,7 +53,6 @@ function sqrt(y) {
     }
     return z;
 }
-exports.sqrt = sqrt;
 // given an array of items sorted by `comparator`, insert an item into its sort index and constrain the size to
 // `maxSize` by removing the last item
 function sortedInsert(items, add, maxSize, comparator) {
@@ -84,4 +84,3 @@ function sortedInsert(items, add, maxSize, comparator) {
         return isFull ? items.pop() : null;
     }
 }
-exports.sortedInsert = sortedInsert;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openocean.finance/openocean-sdk",
-  "version": "1.7.8",
+  "version": "1.7.9",
   "description": "Openocean sdk",
   "main": "lib/index.js",
   "scripts": {
@@ -27,7 +27,7 @@
   "dependencies": {
     "@ethersproject/bignumber": "^5.1.1",
     "@looksrare/sdk": "^0.12.1",
-    "@openocean.finance/wallet": "^1.10.6",
+    "@openocean.finance/wallet": "^1.10.8",
     "@terra-money/terra.js": "^3.1.10",
     "@uniswap/v2-core": "^1.0.1",
     "@walletconnect/ethereum-provider": "2.17.1",