@openocean.finance/openocean-sdk 1.7.10 → 1.7.11

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/lib/api/index.js CHANGED
@@ -15,8 +15,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
15
15
  });
16
16
  };
17
17
  var __generator = (this && this.__generator) || function (thisArg, body) {
18
- var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
19
- return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
18
+ 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);
19
+ return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
20
20
  function verb(n) { return function (v) { return step([n, v]); }; }
21
21
  function step(op) {
22
22
  if (f) throw new TypeError("Generator is already executing.");
@@ -1,6 +1,7 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.getProxyContract = exports.config = exports.ERC20_abi = void 0;
3
+ exports.config = exports.ERC20_abi = void 0;
4
+ exports.getProxyContract = getProxyContract;
4
5
  // import { wallets, Wallets } from "./Wallets";
5
6
  // import { chains, Chains } from "./Chains";
6
7
  var wallet_1 = require("@openocean.finance/wallet");
@@ -29,5 +30,4 @@ function getProxyContract(chainName) {
29
30
  tron: "TTpcMZbsojNCMhea2a9LFHq9DLCxsgGZVv",
30
31
  }[chainName];
31
32
  }
32
- exports.getProxyContract = getProxyContract;
33
33
  ;
@@ -9,8 +9,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
9
9
  });
10
10
  };
11
11
  var __generator = (this && this.__generator) || function (thisArg, body) {
12
- var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
13
- return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
12
+ 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);
13
+ return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
14
14
  function verb(n) { return function (v) { return step([n, v]); }; }
15
15
  function step(op) {
16
16
  if (f) throw new TypeError("Generator is already executing.");
@@ -9,8 +9,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
9
9
  });
10
10
  };
11
11
  var __generator = (this && this.__generator) || function (thisArg, body) {
12
- var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
13
- return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
12
+ 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);
13
+ return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
14
14
  function verb(n) { return function (v) { return step([n, v]); }; }
15
15
  function step(op) {
16
16
  if (f) throw new TypeError("Generator is already executing.");
@@ -192,9 +192,9 @@ var Swap = /** @class */ (function () {
192
192
  });
193
193
  };
194
194
  Swap.prototype.sendSolanaTransaction = function () {
195
- var _a, _b;
196
195
  return __awaiter(this, void 0, void 0, function () {
197
- var res, transaction, signed, result, bytes, _c, msg, data, bytes, serializedTransaction, transactionResponse, e_1;
196
+ var res, transaction, signed, result, bytes, _a, msg, data, bytes, serializedTransaction, transactionResponse, e_1;
197
+ var _b, _c;
198
198
  return __generator(this, function (_d) {
199
199
  switch (_d.label) {
200
200
  case 0:
@@ -227,7 +227,7 @@ var Swap = /** @class */ (function () {
227
227
  if (!this.wallet.sdk.isSlopeWallet) return [3 /*break*/, 5];
228
228
  return [4 /*yield*/, this.wallet.sdk.signTransaction(bs58.encode(transaction.serializeMessage ? transaction.serializeMessage() : transaction.message.serialize()))];
229
229
  case 4:
230
- _c = _d.sent(), msg = _c.msg, data = _c.data;
230
+ _a = _d.sent(), msg = _a.msg, data = _a.data;
231
231
  if (msg !== "ok")
232
232
  return [2 /*return*/];
233
233
  bytes = bs58.decode(data.signature);
@@ -252,8 +252,8 @@ var Swap = /** @class */ (function () {
252
252
  case 8:
253
253
  transactionResponse = _d.sent();
254
254
  if (transactionResponse && transactionResponse.response) {
255
- if ((_a = transactionResponse.response.meta) === null || _a === void 0 ? void 0 : _a.err) {
256
- this.errorCallback((_b = transactionResponse.response.meta) === null || _b === void 0 ? void 0 : _b.err);
255
+ if ((_b = transactionResponse.response.meta) === null || _b === void 0 ? void 0 : _b.err) {
256
+ this.errorCallback((_c = transactionResponse.response.meta) === null || _c === void 0 ? void 0 : _c.err);
257
257
  }
258
258
  else {
259
259
  this.transactionHashCallback(transactionResponse.txid);
@@ -9,8 +9,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
9
9
  });
10
10
  };
11
11
  var __generator = (this && this.__generator) || function (thisArg, body) {
12
- var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
13
- return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
12
+ 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);
13
+ return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
14
14
  function verb(n) { return function (v) { return step([n, v]); }; }
15
15
  function step(op) {
16
16
  if (f) throw new TypeError("Generator is already executing.");
@@ -36,7 +36,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
36
36
  }
37
37
  };
38
38
  Object.defineProperty(exports, "__esModule", { value: true });
39
- exports.getAllowance = void 0;
39
+ exports.getAllowance = getAllowance;
40
40
  var utils_1 = require("./../utils");
41
41
  var config_1 = require("./../config");
42
42
  var wallet_1 = require("@openocean.finance/wallet");
@@ -95,4 +95,3 @@ function getAllowance(account, tokenAddress, decimals, chainName, approveContrac
95
95
  });
96
96
  });
97
97
  }
98
- exports.getAllowance = getAllowance;
@@ -9,8 +9,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
9
9
  });
10
10
  };
11
11
  var __generator = (this && this.__generator) || function (thisArg, body) {
12
- var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
13
- return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
12
+ 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);
13
+ return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
14
14
  function verb(n) { return function (v) { return step([n, v]); }; }
15
15
  function step(op) {
16
16
  if (f) throw new TypeError("Generator is already executing.");
@@ -39,7 +39,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
39
39
  return (mod && mod.__esModule) ? mod : { "default": mod };
40
40
  };
41
41
  Object.defineProperty(exports, "__esModule", { value: true });
42
- exports.getBalance = void 0;
42
+ exports.getBalance = getBalance;
43
43
  var axios_1 = __importDefault(require("axios"));
44
44
  var utils_1 = require("./../utils");
45
45
  var terra_js_1 = require("@terra-money/terra.js");
@@ -277,4 +277,3 @@ function getBalance(account, tokenAddressOrSymbol, decimals, chainName, myWallet
277
277
  });
278
278
  });
279
279
  }
280
- exports.getBalance = getBalance;
@@ -9,8 +9,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
9
9
  });
10
10
  };
11
11
  var __generator = (this && this.__generator) || function (thisArg, body) {
12
- var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
13
- return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
12
+ 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);
13
+ return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
14
14
  function verb(n) { return function (v) { return step([n, v]); }; }
15
15
  function step(op) {
16
16
  if (f) throw new TypeError("Generator is already executing.");
@@ -1,4 +1,3 @@
1
- /// <reference types="node" />
2
1
  import { BlockhashWithExpiryBlockHeight, Connection } from "@solana/web3.js";
3
2
  type TransactionSenderAndConfirmationWaiterArgs = {
4
3
  connection: Connection;
@@ -9,8 +9,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
9
9
  });
10
10
  };
11
11
  var __generator = (this && this.__generator) || function (thisArg, body) {
12
- var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
13
- return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
12
+ 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);
13
+ return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
14
14
  function verb(n) { return function (v) { return step([n, v]); }; }
15
15
  function step(op) {
16
16
  if (f) throw new TypeError("Generator is already executing.");
@@ -35,135 +35,88 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
35
35
  if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
36
36
  }
37
37
  };
38
- var __importDefault = (this && this.__importDefault) || function (mod) {
39
- return (mod && mod.__esModule) ? mod : { "default": mod };
40
- };
41
38
  Object.defineProperty(exports, "__esModule", { value: true });
42
- exports.transactionSenderAndConfirmationWaiter = void 0;
43
- var web3_js_1 = require("@solana/web3.js");
44
- var promise_retry_1 = __importDefault(require("promise-retry"));
39
+ exports.transactionSenderAndConfirmationWaiter = transactionSenderAndConfirmationWaiter;
45
40
  var sleep = function (time) {
46
41
  return new Promise(function (resolve) { return setTimeout(resolve, time); });
47
42
  };
48
- function transactionSenderAndConfirmationWaiter(_a) {
49
- var connection = _a.connection, serializedTransaction = _a.serializedTransaction;
43
+ function sendRawTransaction(connection, serializedTransaction, n) {
50
44
  return __awaiter(this, void 0, void 0, function () {
51
- var txid, controller, abortSignal, abortableResender, times_1, races, e_1, response;
52
- var _this = this;
45
+ var txid, tx;
46
+ var _a;
53
47
  return __generator(this, function (_b) {
54
48
  switch (_b.label) {
55
- case 0: return [4 /*yield*/, connection.sendRawTransaction(serializedTransaction, {
56
- skipPreflight: true,
57
- })];
49
+ case 0:
50
+ if (n > 10)
51
+ return [2 /*return*/];
52
+ return [4 /*yield*/, connection.sendRawTransaction(serializedTransaction, {
53
+ skipPreflight: true,
54
+ })];
58
55
  case 1:
59
56
  txid = _b.sent();
60
57
  console.log('txid', txid);
61
- controller = new AbortController();
62
- abortSignal = controller.signal;
63
- abortableResender = function () { return __awaiter(_this, void 0, void 0, function () {
64
- var id, e_2;
65
- return __generator(this, function (_a) {
66
- switch (_a.label) {
67
- case 0:
68
- if (!true) return [3 /*break*/, 6];
69
- return [4 /*yield*/, sleep(6000)];
70
- case 1:
71
- _a.sent();
72
- if (abortSignal.aborted)
73
- return [2 /*return*/];
74
- _a.label = 2;
75
- case 2:
76
- _a.trys.push([2, 4, , 5]);
77
- return [4 /*yield*/, connection.sendRawTransaction(serializedTransaction, {
78
- skipPreflight: true,
79
- })];
80
- case 3:
81
- id = _a.sent();
82
- console.log('Resender-------------');
83
- console.log(id);
84
- return [3 /*break*/, 5];
85
- case 4:
86
- e_2 = _a.sent();
87
- console.warn("Failed to resend transaction: ".concat(e_2));
88
- return [3 /*break*/, 5];
89
- case 5: return [3 /*break*/, 0];
90
- case 6: return [2 /*return*/];
91
- }
92
- });
93
- }); };
94
- _b.label = 2;
58
+ return [4 /*yield*/, sleep(3000)];
95
59
  case 2:
96
- _b.trys.push([2, 4, 5, 6]);
97
- abortableResender();
98
- times_1 = 0;
99
- races = [
100
- new Promise(function (resolve) { return __awaiter(_this, void 0, void 0, function () {
101
- var tx;
102
- var _a;
103
- return __generator(this, function (_b) {
104
- switch (_b.label) {
105
- case 0:
106
- if (!!abortSignal.aborted) return [3 /*break*/, 3];
107
- times_1++;
108
- if (times_1 > 8)
109
- resolve('');
110
- return [4 /*yield*/, sleep(3000)];
111
- case 1:
112
- _b.sent();
113
- return [4 /*yield*/, connection.getSignatureStatus(txid, {
114
- searchTransactionHistory: false,
115
- })];
116
- case 2:
117
- tx = _b.sent();
118
- if (((_a = tx === null || tx === void 0 ? void 0 : tx.value) === null || _a === void 0 ? void 0 : _a.confirmationStatus) === "confirmed") {
119
- resolve(tx);
120
- }
121
- return [3 /*break*/, 0];
122
- case 3: return [2 /*return*/];
123
- }
124
- });
125
- }); }),
126
- ];
127
- return [4 /*yield*/, Promise.race(races)];
128
- case 3:
129
60
  _b.sent();
130
- return [3 /*break*/, 6];
131
- case 4:
132
- e_1 = _b.sent();
133
- if (e_1 instanceof web3_js_1.TransactionExpiredBlockheightExceededError) {
134
- return [2 /*return*/, null];
61
+ return [4 /*yield*/, connection.getSignatureStatus(txid, {
62
+ searchTransactionHistory: false,
63
+ })];
64
+ case 3:
65
+ tx = _b.sent();
66
+ if (!(((_a = tx === null || tx === void 0 ? void 0 : tx.value) === null || _a === void 0 ? void 0 : _a.confirmationStatus) === "confirmed")) return [3 /*break*/, 4];
67
+ return [2 /*return*/, txid];
68
+ case 4: return [4 /*yield*/, sendRawTransaction(connection, serializedTransaction, n++)];
69
+ case 5: return [2 /*return*/, _b.sent()];
70
+ }
71
+ });
72
+ });
73
+ }
74
+ function getTransaction(connection, txid, n) {
75
+ return __awaiter(this, void 0, void 0, function () {
76
+ var response;
77
+ return __generator(this, function (_a) {
78
+ switch (_a.label) {
79
+ case 0:
80
+ if (n > 2)
81
+ return [2 /*return*/];
82
+ return [4 /*yield*/, connection.getTransaction(txid, {
83
+ commitment: "confirmed",
84
+ maxSupportedTransactionVersion: 0,
85
+ })];
86
+ case 1:
87
+ response = _a.sent();
88
+ console.log('getTransaction', response);
89
+ if (!!response) return [3 /*break*/, 4];
90
+ return [4 /*yield*/, sleep(3000)];
91
+ case 2:
92
+ _a.sent();
93
+ return [4 /*yield*/, getTransaction(connection, txid, n++)];
94
+ case 3: return [2 /*return*/, _a.sent()];
95
+ case 4: return [2 /*return*/, response];
96
+ }
97
+ });
98
+ });
99
+ }
100
+ function transactionSenderAndConfirmationWaiter(_a) {
101
+ return __awaiter(this, arguments, void 0, function (_b) {
102
+ var txid, response;
103
+ var connection = _b.connection, serializedTransaction = _b.serializedTransaction;
104
+ return __generator(this, function (_c) {
105
+ switch (_c.label) {
106
+ case 0: return [4 /*yield*/, sendRawTransaction(connection, serializedTransaction, 0)];
107
+ case 1:
108
+ txid = _c.sent();
109
+ if (!txid) {
110
+ throw new Error('Transaction not confirmed.');
135
111
  }
136
- else {
137
- throw e_1;
112
+ return [4 /*yield*/, getTransaction(connection, txid, 0)];
113
+ case 2:
114
+ response = _c.sent();
115
+ if (!response) {
116
+ throw new Error('Transaction not confirmed.');
138
117
  }
139
- return [3 /*break*/, 6];
140
- case 5:
141
- controller.abort();
142
- return [7 /*endfinally*/];
143
- case 6:
144
- response = (0, promise_retry_1.default)(function (retry) { return __awaiter(_this, void 0, void 0, function () {
145
- var response;
146
- return __generator(this, function (_a) {
147
- switch (_a.label) {
148
- case 0: return [4 /*yield*/, connection.getTransaction(txid, {
149
- commitment: "confirmed",
150
- maxSupportedTransactionVersion: 0,
151
- })];
152
- case 1:
153
- response = _a.sent();
154
- if (!response) {
155
- retry(response);
156
- }
157
- return [2 /*return*/, response];
158
- }
159
- });
160
- }); }, {
161
- retries: 2,
162
- minTimeout: 3000,
163
- });
164
118
  return [2 /*return*/, { response: response, txid: txid }];
165
119
  }
166
120
  });
167
121
  });
168
122
  }
169
- exports.transactionSenderAndConfirmationWaiter = transactionSenderAndConfirmationWaiter;
package/lib/utils/ajx.js CHANGED
@@ -9,8 +9,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
9
9
  });
10
10
  };
11
11
  var __generator = (this && this.__generator) || function (thisArg, body) {
12
- var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
13
- return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
12
+ 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);
13
+ return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
14
14
  function verb(n) { return function (v) { return step([n, v]); }; }
15
15
  function step(op) {
16
16
  if (f) throw new TypeError("Generator is already executing.");
@@ -39,7 +39,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
39
39
  return (mod && mod.__esModule) ? mod : { "default": mod };
40
40
  };
41
41
  Object.defineProperty(exports, "__esModule", { value: true });
42
- exports.post = exports.get = exports.validateReq = void 0;
42
+ exports.validateReq = validateReq;
43
+ exports.get = get;
44
+ exports.post = post;
43
45
  var class_validator_1 = require("class-validator");
44
46
  var class_transformer_1 = require("class-transformer");
45
47
  var axios_1 = __importDefault(require("axios"));
@@ -66,7 +68,6 @@ function validateReq(option, vo) {
66
68
  });
67
69
  });
68
70
  }
69
- exports.validateReq = validateReq;
70
71
  function get(url, option, vo) {
71
72
  return __awaiter(this, void 0, void 0, function () {
72
73
  var _this = this;
@@ -108,7 +109,6 @@ function get(url, option, vo) {
108
109
  });
109
110
  });
110
111
  }
111
- exports.get = get;
112
112
  function post(url, option, vo) {
113
113
  return __awaiter(this, void 0, void 0, function () {
114
114
  var _this = this;
@@ -150,4 +150,3 @@ function post(url, option, vo) {
150
150
  });
151
151
  });
152
152
  }
153
- exports.post = post;
@@ -3,7 +3,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
3
3
  return (mod && mod.__esModule) ? mod : { "default": mod };
4
4
  };
5
5
  Object.defineProperty(exports, "__esModule", { value: true });
6
- exports.WETH_ADDRESS = exports.WETH_ABI = exports.EIP_712_ORDER_TYPE = exports.confirmLater = exports.isPc = exports.utils = exports.Utils = exports.ChainNames = void 0;
6
+ exports.WETH_ADDRESS = exports.WETH_ABI = exports.EIP_712_ORDER_TYPE = exports.utils = exports.Utils = exports.ChainNames = void 0;
7
+ exports.isPc = isPc;
8
+ exports.confirmLater = confirmLater;
7
9
  var bignumber_js_1 = __importDefault(require("bignumber.js"));
8
10
  var ChainNames;
9
11
  (function (ChainNames) {
@@ -30,7 +32,7 @@ var ChainNames;
30
32
  ChainNames[ChainNames["osmosis"] = 20] = "osmosis";
31
33
  ChainNames[ChainNames["harmony"] = 21] = "harmony";
32
34
  ChainNames[ChainNames["bsctest"] = 22] = "bsctest";
33
- })(ChainNames = exports.ChainNames || (exports.ChainNames = {}));
35
+ })(ChainNames || (exports.ChainNames = ChainNames = {}));
34
36
  var Utils = /** @class */ (function () {
35
37
  function Utils() {
36
38
  }
@@ -85,7 +87,6 @@ function isPc() {
85
87
  return userAgent.includes(i);
86
88
  });
87
89
  }
88
- exports.isPc = isPc;
89
90
  function confirmLater(promise) {
90
91
  return new Promise(function (resolve, reject) {
91
92
  promise.on("transactionHash", resolve);
@@ -96,7 +97,6 @@ function confirmLater(promise) {
96
97
  promise.on("confirmation", onConfirm);
97
98
  });
98
99
  }
99
- exports.confirmLater = confirmLater;
100
100
  exports.EIP_712_ORDER_TYPE = {
101
101
  EIP712Domain: [
102
102
  {
@@ -15,18 +15,18 @@ var ChainId;
15
15
  ChainId[ChainId["POLYGON"] = 137] = "POLYGON";
16
16
  ChainId[ChainId["KAVA"] = 2222] = "KAVA";
17
17
  ChainId[ChainId["AVAX"] = 43114] = "AVAX";
18
- })(ChainId = exports.ChainId || (exports.ChainId = {}));
18
+ })(ChainId || (exports.ChainId = ChainId = {}));
19
19
  var TradeType;
20
20
  (function (TradeType) {
21
21
  TradeType[TradeType["EXACT_INPUT"] = 0] = "EXACT_INPUT";
22
22
  TradeType[TradeType["EXACT_OUTPUT"] = 1] = "EXACT_OUTPUT";
23
- })(TradeType = exports.TradeType || (exports.TradeType = {}));
23
+ })(TradeType || (exports.TradeType = TradeType = {}));
24
24
  var Rounding;
25
25
  (function (Rounding) {
26
26
  Rounding[Rounding["ROUND_DOWN"] = 0] = "ROUND_DOWN";
27
27
  Rounding[Rounding["ROUND_HALF_UP"] = 1] = "ROUND_HALF_UP";
28
28
  Rounding[Rounding["ROUND_UP"] = 2] = "ROUND_UP";
29
- })(Rounding = exports.Rounding || (exports.Rounding = {}));
29
+ })(Rounding || (exports.Rounding = Rounding = {}));
30
30
  // export const FACTORY_ADDRESS = '0xF22b5afBe6152ca43fAE20DDA4F75575BABD0c5A'
31
31
  // export const INIT_CODE_HASH = '0xe7da666f616ba3bdb18c6908b22d556a41659bdd652762c246b8d1fa4f7506b4'
32
32
  exports.FACTORY_ADDRESS = {
@@ -64,7 +64,7 @@ var SolidityType;
64
64
  (function (SolidityType) {
65
65
  SolidityType["uint8"] = "uint8";
66
66
  SolidityType["uint256"] = "uint256";
67
- })(SolidityType = exports.SolidityType || (exports.SolidityType = {}));
67
+ })(SolidityType || (exports.SolidityType = SolidityType = {}));
68
68
  exports.SOLIDITY_TYPE_MAXIMA = (_a = {},
69
69
  _a[SolidityType.uint8] = jsbi_1.default.BigInt('0xff'),
70
70
  _a[SolidityType.uint256] = jsbi_1.default.BigInt('0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff'),
@@ -19,7 +19,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
19
19
  };
20
20
  var _a;
21
21
  Object.defineProperty(exports, "__esModule", { value: true });
22
- exports.WETH = exports.currencyEquals = exports.Token = void 0;
22
+ exports.WETH = exports.Token = void 0;
23
+ exports.currencyEquals = currencyEquals;
23
24
  var tiny_invariant_1 = __importDefault(require("tiny-invariant"));
24
25
  var constants_1 = require("../constants");
25
26
  var utils_1 = require("../utils");
@@ -77,7 +78,6 @@ function currencyEquals(currencyA, currencyB) {
77
78
  return currencyA === currencyB;
78
79
  }
79
80
  }
80
- exports.currencyEquals = currencyEquals;
81
81
  exports.WETH = (_a = {},
82
82
  _a[constants_1.ChainId.ETH] = new Token(constants_1.ChainId.ETH, '0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2', 18, 'WETH', 'Wrapped ETH'),
83
83
  _a[constants_1.ChainId.MAINNET] = new Token(constants_1.ChainId.MAINNET, '0xbb4CdB9CBd36B01bD1cBaEBF2De08d9173bc095c', 18, 'WBNB', 'Wrapped BNB'),
@@ -12,7 +12,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
12
12
  return (mod && mod.__esModule) ? mod : { "default": mod };
13
13
  };
14
14
  Object.defineProperty(exports, "__esModule", { value: true });
15
- exports.Trade = exports.tradeComparator = exports.inputOutputComparator = void 0;
15
+ exports.Trade = void 0;
16
+ exports.inputOutputComparator = inputOutputComparator;
17
+ exports.tradeComparator = tradeComparator;
16
18
  var tiny_invariant_1 = __importDefault(require("tiny-invariant"));
17
19
  var constants_1 = require("../constants");
18
20
  var utils_1 = require("../utils");
@@ -64,7 +66,6 @@ function inputOutputComparator(a, b) {
64
66
  }
65
67
  }
66
68
  }
67
- exports.inputOutputComparator = inputOutputComparator;
68
69
  // extension of the input output comparator that also considers other dimensions of the trade in ranking them
69
70
  function tradeComparator(a, b) {
70
71
  var ioComp = inputOutputComparator(a, b);
@@ -81,7 +82,6 @@ function tradeComparator(a, b) {
81
82
  // finally consider the number of hops since each hop costs gas
82
83
  return a.route.path.length - b.route.path.length;
83
84
  }
84
- exports.tradeComparator = tradeComparator;
85
85
  /**
86
86
  * Given a currency amount and a chain ID, returns the equivalent representation as the token amount.
87
87
  * In other words, if the currency is ETHER, returns the WETH token amount for the given chain. Otherwise, returns
package/lib/v1/fetcher.js CHANGED
@@ -20,8 +20,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
20
20
  });
21
21
  };
22
22
  var __generator = (this && this.__generator) || function (thisArg, body) {
23
- var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
24
- return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
23
+ 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);
24
+ return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
25
25
  function verb(n) { return function (v) { return step([n, v]); }; }
26
26
  function step(op) {
27
27
  if (f) throw new TypeError("Generator is already executing.");
@@ -85,16 +85,16 @@ var Fetcher = /** @class */ (function () {
85
85
  * @param symbol optional symbol of the token
86
86
  * @param name optional name of the token
87
87
  */
88
- Fetcher.fetchTokenData = function (chainId, address, provider, symbol, name) {
89
- var _a;
90
- if (provider === void 0) { provider = (0, providers_1.getDefaultProvider)((0, networks_1.getNetwork)(chainId)); }
91
- return __awaiter(this, void 0, void 0, function () {
92
- var parsedDecimals, _b;
88
+ Fetcher.fetchTokenData = function (chainId_1, address_1) {
89
+ return __awaiter(this, arguments, void 0, function (chainId, address, provider, symbol, name) {
90
+ var parsedDecimals, _a;
91
+ var _b;
92
+ if (provider === void 0) { provider = (0, providers_1.getDefaultProvider)((0, networks_1.getNetwork)(chainId)); }
93
93
  return __generator(this, function (_c) {
94
94
  switch (_c.label) {
95
95
  case 0:
96
- 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];
97
- _b = TOKEN_DECIMALS_CACHE[chainId][address];
96
+ 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];
97
+ _a = TOKEN_DECIMALS_CACHE[chainId][address];
98
98
  return [3 /*break*/, 3];
99
99
  case 1: return [4 /*yield*/, new contracts_1.Contract(address, ERC20_1.default, provider).decimals().then(function (decimals) {
100
100
  var _a, _b;
@@ -102,10 +102,10 @@ var Fetcher = /** @class */ (function () {
102
102
  return decimals;
103
103
  })];
104
104
  case 2:
105
- _b = _c.sent();
105
+ _a = _c.sent();
106
106
  _c.label = 3;
107
107
  case 3:
108
- parsedDecimals = _b;
108
+ parsedDecimals = _a;
109
109
  return [2 /*return*/, new token_1.Token(chainId, address, parsedDecimals, symbol, name)];
110
110
  }
111
111
  });
@@ -117,10 +117,10 @@ var Fetcher = /** @class */ (function () {
117
117
  * @param tokenB second token
118
118
  * @param provider the provider to use to fetch the data
119
119
  */
120
- Fetcher.fetchPairData = function (tokenA, tokenB, provider) {
121
- if (provider === void 0) { provider = (0, providers_1.getDefaultProvider)((0, networks_1.getNetwork)(tokenA.chainId)); }
122
- return __awaiter(this, void 0, void 0, function () {
120
+ Fetcher.fetchPairData = function (tokenA_1, tokenB_1) {
121
+ return __awaiter(this, arguments, void 0, function (tokenA, tokenB, provider) {
123
122
  var address, _a, reserves0, reserves1, balances;
123
+ if (provider === void 0) { provider = (0, providers_1.getDefaultProvider)((0, networks_1.getNetwork)(tokenA.chainId)); }
124
124
  return __generator(this, function (_b) {
125
125
  switch (_b.label) {
126
126
  case 0:
package/lib/v1/utils.js CHANGED
@@ -3,7 +3,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
3
3
  return (mod && mod.__esModule) ? mod : { "default": mod };
4
4
  };
5
5
  Object.defineProperty(exports, "__esModule", { value: true });
6
- exports.sortedInsert = exports.sqrt = exports.parseBigintIsh = exports.validateAndParseAddress = exports.validateSolidityTypeInstance = void 0;
6
+ exports.validateSolidityTypeInstance = validateSolidityTypeInstance;
7
+ exports.validateAndParseAddress = validateAndParseAddress;
8
+ exports.parseBigintIsh = parseBigintIsh;
9
+ exports.sqrt = sqrt;
10
+ exports.sortedInsert = sortedInsert;
7
11
  var tiny_invariant_1 = __importDefault(require("tiny-invariant"));
8
12
  var tiny_warning_1 = __importDefault(require("tiny-warning"));
9
13
  var jsbi_1 = __importDefault(require("jsbi"));
@@ -13,7 +17,6 @@ function validateSolidityTypeInstance(value, solidityType) {
13
17
  (0, tiny_invariant_1.default)(jsbi_1.default.greaterThanOrEqual(value, constants_1.ZERO), "".concat(value, " is not a ").concat(solidityType, "."));
14
18
  (0, tiny_invariant_1.default)(jsbi_1.default.lessThanOrEqual(value, constants_1.SOLIDITY_TYPE_MAXIMA[solidityType]), "".concat(value, " is not a ").concat(solidityType, "."));
15
19
  }
16
- exports.validateSolidityTypeInstance = validateSolidityTypeInstance;
17
20
  // warns if addresses are not checksummed
18
21
  function validateAndParseAddress(address) {
19
22
  try {
@@ -25,7 +28,6 @@ function validateAndParseAddress(address) {
25
28
  (0, tiny_invariant_1.default)(false, "".concat(address, " is not a valid address."));
26
29
  }
27
30
  }
28
- exports.validateAndParseAddress = validateAndParseAddress;
29
31
  function parseBigintIsh(bigintIsh) {
30
32
  return bigintIsh instanceof jsbi_1.default
31
33
  ? bigintIsh
@@ -33,7 +35,6 @@ function parseBigintIsh(bigintIsh) {
33
35
  ? jsbi_1.default.BigInt(bigintIsh.toString())
34
36
  : jsbi_1.default.BigInt(bigintIsh);
35
37
  }
36
- exports.parseBigintIsh = parseBigintIsh;
37
38
  // mock the on-chain sqrt function
38
39
  function sqrt(y) {
39
40
  validateSolidityTypeInstance(y, constants_1.SolidityType.uint256);
@@ -52,7 +53,6 @@ function sqrt(y) {
52
53
  }
53
54
  return z;
54
55
  }
55
- exports.sqrt = sqrt;
56
56
  // given an array of items sorted by `comparator`, insert an item into its sort index and constrain the size to
57
57
  // `maxSize` by removing the last item
58
58
  function sortedInsert(items, add, maxSize, comparator) {
@@ -84,4 +84,3 @@ function sortedInsert(items, add, maxSize, comparator) {
84
84
  return isFull ? items.pop() : null;
85
85
  }
86
86
  }
87
- exports.sortedInsert = sortedInsert;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@openocean.finance/openocean-sdk",
3
- "version": "1.7.10",
3
+ "version": "1.7.11",
4
4
  "description": "Openocean sdk",
5
5
  "main": "lib/index.js",
6
6
  "scripts": {
package/lib/.DS_Store DELETED
Binary file