@openocean.finance/openocean-sdk 1.7.4 → 1.7.6
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/.DS_Store +0 -0
- package/lib/api/index.js +2 -2
- package/lib/config/index.js +2 -2
- package/lib/swapSdk/Approve.js +3 -3
- package/lib/swapSdk/Swap.js +7 -7
- package/lib/swapSdk/getAllowance.js +4 -3
- package/lib/swapSdk/getBalance.js +4 -3
- package/lib/swapSdk/index.js +2 -2
- package/lib/swapSdk/solanaTransactionSender.d.ts +1 -0
- package/lib/swapSdk/solanaTransactionSender.js +13 -12
- package/lib/utils/ajx.js +6 -5
- package/lib/utils/index.js +4 -4
- package/lib/v1/constants.js +4 -4
- package/lib/v1/entities/token.js +2 -2
- package/lib/v1/entities/trade.js +3 -3
- package/lib/v1/fetcher.js +14 -14
- package/lib/v1/utils.js +6 -5
- package/package.json +1 -1
package/lib/.DS_Store
ADDED
|
Binary file
|
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
|
|
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;
|
|
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.");
|
package/lib/config/index.js
CHANGED
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.config = exports.ERC20_abi = void 0;
|
|
4
|
-
exports.getProxyContract = getProxyContract;
|
|
3
|
+
exports.getProxyContract = exports.config = exports.ERC20_abi = void 0;
|
|
5
4
|
// import { wallets, Wallets } from "./Wallets";
|
|
6
5
|
// import { chains, Chains } from "./Chains";
|
|
7
6
|
var wallet_1 = require("@openocean.finance/wallet");
|
|
@@ -30,4 +29,5 @@ function getProxyContract(chainName) {
|
|
|
30
29
|
tron: "TTpcMZbsojNCMhea2a9LFHq9DLCxsgGZVv",
|
|
31
30
|
}[chainName];
|
|
32
31
|
}
|
|
32
|
+
exports.getProxyContract = getProxyContract;
|
|
33
33
|
;
|
package/lib/swapSdk/Approve.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
|
|
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;
|
|
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.");
|
|
@@ -236,7 +236,7 @@ var Approve = /** @class */ (function () {
|
|
|
236
236
|
.on("receipt", function (receipt) {
|
|
237
237
|
console.log('eee receipt');
|
|
238
238
|
_this.receiptCallback(receipt);
|
|
239
|
-
_this.
|
|
239
|
+
_this.successCallback(receipt);
|
|
240
240
|
});
|
|
241
241
|
_c.label = 27;
|
|
242
242
|
case 27: return [2 /*return*/];
|
package/lib/swapSdk/Swap.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
|
|
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;
|
|
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;
|
|
195
196
|
return __awaiter(this, void 0, void 0, function () {
|
|
196
|
-
var res, transaction, signed, result, bytes,
|
|
197
|
-
var _b, _c;
|
|
197
|
+
var res, transaction, signed, result, bytes, _c, msg, data, bytes, serializedTransaction, blockhashWithExpiryBlockHeight, blockhashInfo, lastValidBlockHeight, transactionResponse, e_1;
|
|
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
|
-
|
|
230
|
+
_c = _d.sent(), msg = _c.msg, data = _c.data;
|
|
231
231
|
if (msg !== "ok")
|
|
232
232
|
return [2 /*return*/];
|
|
233
233
|
bytes = bs58.decode(data.signature);
|
|
@@ -270,8 +270,8 @@ var Swap = /** @class */ (function () {
|
|
|
270
270
|
case 12:
|
|
271
271
|
transactionResponse = _d.sent();
|
|
272
272
|
if (transactionResponse && transactionResponse.response) {
|
|
273
|
-
if ((
|
|
274
|
-
this.errorCallback((
|
|
273
|
+
if ((_a = transactionResponse.response.meta) === null || _a === void 0 ? void 0 : _a.err) {
|
|
274
|
+
this.errorCallback((_b = transactionResponse.response.meta) === null || _b === void 0 ? void 0 : _b.err);
|
|
275
275
|
}
|
|
276
276
|
else {
|
|
277
277
|
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
|
|
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;
|
|
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 =
|
|
39
|
+
exports.getAllowance = void 0;
|
|
40
40
|
var utils_1 = require("./../utils");
|
|
41
41
|
var config_1 = require("./../config");
|
|
42
42
|
var wallet_1 = require("@openocean.finance/wallet");
|
|
@@ -95,3 +95,4 @@ 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
|
|
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;
|
|
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 =
|
|
42
|
+
exports.getBalance = void 0;
|
|
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,3 +277,4 @@ function getBalance(account, tokenAddressOrSymbol, decimals, chainName, myWallet
|
|
|
277
277
|
});
|
|
278
278
|
});
|
|
279
279
|
}
|
|
280
|
+
exports.getBalance = getBalance;
|
package/lib/swapSdk/index.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
|
|
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;
|
|
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.");
|
|
@@ -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
|
|
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;
|
|
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.");
|
|
@@ -50,25 +50,25 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
50
50
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
51
51
|
};
|
|
52
52
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
53
|
-
exports.transactionSenderAndConfirmationWaiter =
|
|
53
|
+
exports.transactionSenderAndConfirmationWaiter = void 0;
|
|
54
54
|
var web3_js_1 = require("@solana/web3.js");
|
|
55
55
|
var promise_retry_1 = __importDefault(require("promise-retry"));
|
|
56
56
|
var wait = function (time) {
|
|
57
57
|
return new Promise(function (resolve) { return setTimeout(resolve, time); });
|
|
58
58
|
};
|
|
59
59
|
function transactionSenderAndConfirmationWaiter(_a) {
|
|
60
|
-
|
|
60
|
+
var connection = _a.connection, serializedTransaction = _a.serializedTransaction, blockhashWithExpiryBlockHeight = _a.blockhashWithExpiryBlockHeight;
|
|
61
|
+
return __awaiter(this, void 0, void 0, function () {
|
|
61
62
|
var txid, controller, abortSignal, abortableResender, races, lastValidBlockHeight, e_1, response;
|
|
62
63
|
var _this = this;
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
switch (_c.label) {
|
|
64
|
+
return __generator(this, function (_b) {
|
|
65
|
+
switch (_b.label) {
|
|
66
66
|
case 0: return [4 /*yield*/, connection.sendRawTransaction(serializedTransaction, {
|
|
67
67
|
skipPreflight: true,
|
|
68
68
|
// preflightCommitment: "confirmed",
|
|
69
69
|
})];
|
|
70
70
|
case 1:
|
|
71
|
-
txid =
|
|
71
|
+
txid = _b.sent();
|
|
72
72
|
console.log('txid', txid);
|
|
73
73
|
controller = new AbortController();
|
|
74
74
|
abortSignal = controller.signal;
|
|
@@ -104,9 +104,9 @@ function transactionSenderAndConfirmationWaiter(_a) {
|
|
|
104
104
|
}
|
|
105
105
|
});
|
|
106
106
|
}); };
|
|
107
|
-
|
|
107
|
+
_b.label = 2;
|
|
108
108
|
case 2:
|
|
109
|
-
|
|
109
|
+
_b.trys.push([2, 4, 5, 6]);
|
|
110
110
|
abortableResender();
|
|
111
111
|
races = [
|
|
112
112
|
new Promise(function (resolve) { return __awaiter(_this, void 0, void 0, function () {
|
|
@@ -141,10 +141,10 @@ function transactionSenderAndConfirmationWaiter(_a) {
|
|
|
141
141
|
return [4 /*yield*/, Promise.race(races)];
|
|
142
142
|
case 3:
|
|
143
143
|
// this would throw TransactionExpiredBlockheightExceededError
|
|
144
|
-
|
|
144
|
+
_b.sent();
|
|
145
145
|
return [3 /*break*/, 6];
|
|
146
146
|
case 4:
|
|
147
|
-
e_1 =
|
|
147
|
+
e_1 = _b.sent();
|
|
148
148
|
if (e_1 instanceof web3_js_1.TransactionExpiredBlockheightExceededError) {
|
|
149
149
|
// we consume this error and getTransaction would return null
|
|
150
150
|
return [2 /*return*/, null];
|
|
@@ -183,3 +183,4 @@ function transactionSenderAndConfirmationWaiter(_a) {
|
|
|
183
183
|
});
|
|
184
184
|
});
|
|
185
185
|
}
|
|
186
|
+
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
|
|
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;
|
|
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,9 +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.validateReq =
|
|
43
|
-
exports.get = get;
|
|
44
|
-
exports.post = post;
|
|
42
|
+
exports.post = exports.get = exports.validateReq = void 0;
|
|
45
43
|
var class_validator_1 = require("class-validator");
|
|
46
44
|
var class_transformer_1 = require("class-transformer");
|
|
47
45
|
var axios_1 = __importDefault(require("axios"));
|
|
@@ -68,6 +66,7 @@ function validateReq(option, vo) {
|
|
|
68
66
|
});
|
|
69
67
|
});
|
|
70
68
|
}
|
|
69
|
+
exports.validateReq = validateReq;
|
|
71
70
|
function get(url, option, vo) {
|
|
72
71
|
return __awaiter(this, void 0, void 0, function () {
|
|
73
72
|
var _this = this;
|
|
@@ -109,6 +108,7 @@ function get(url, option, vo) {
|
|
|
109
108
|
});
|
|
110
109
|
});
|
|
111
110
|
}
|
|
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,3 +150,4 @@ function post(url, option, vo) {
|
|
|
150
150
|
});
|
|
151
151
|
});
|
|
152
152
|
}
|
|
153
|
+
exports.post = post;
|
package/lib/utils/index.js
CHANGED
|
@@ -3,9 +3,7 @@ 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.utils = exports.Utils = exports.ChainNames = void 0;
|
|
7
|
-
exports.isPc = isPc;
|
|
8
|
-
exports.confirmLater = confirmLater;
|
|
6
|
+
exports.WETH_ADDRESS = exports.WETH_ABI = exports.EIP_712_ORDER_TYPE = exports.confirmLater = exports.isPc = exports.utils = exports.Utils = exports.ChainNames = void 0;
|
|
9
7
|
var bignumber_js_1 = __importDefault(require("bignumber.js"));
|
|
10
8
|
var ChainNames;
|
|
11
9
|
(function (ChainNames) {
|
|
@@ -32,7 +30,7 @@ var ChainNames;
|
|
|
32
30
|
ChainNames[ChainNames["osmosis"] = 20] = "osmosis";
|
|
33
31
|
ChainNames[ChainNames["harmony"] = 21] = "harmony";
|
|
34
32
|
ChainNames[ChainNames["bsctest"] = 22] = "bsctest";
|
|
35
|
-
})(ChainNames
|
|
33
|
+
})(ChainNames = exports.ChainNames || (exports.ChainNames = {}));
|
|
36
34
|
var Utils = /** @class */ (function () {
|
|
37
35
|
function Utils() {
|
|
38
36
|
}
|
|
@@ -87,6 +85,7 @@ function isPc() {
|
|
|
87
85
|
return userAgent.includes(i);
|
|
88
86
|
});
|
|
89
87
|
}
|
|
88
|
+
exports.isPc = isPc;
|
|
90
89
|
function confirmLater(promise) {
|
|
91
90
|
return new Promise(function (resolve, reject) {
|
|
92
91
|
promise.on("transactionHash", resolve);
|
|
@@ -97,6 +96,7 @@ function confirmLater(promise) {
|
|
|
97
96
|
promise.on("confirmation", onConfirm);
|
|
98
97
|
});
|
|
99
98
|
}
|
|
99
|
+
exports.confirmLater = confirmLater;
|
|
100
100
|
exports.EIP_712_ORDER_TYPE = {
|
|
101
101
|
EIP712Domain: [
|
|
102
102
|
{
|
package/lib/v1/constants.js
CHANGED
|
@@ -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
|
|
18
|
+
})(ChainId = exports.ChainId || (exports.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
|
|
23
|
+
})(TradeType = exports.TradeType || (exports.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
|
|
29
|
+
})(Rounding = exports.Rounding || (exports.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
|
|
67
|
+
})(SolidityType = exports.SolidityType || (exports.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'),
|
package/lib/v1/entities/token.js
CHANGED
|
@@ -19,8 +19,7 @@ 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.Token = void 0;
|
|
23
|
-
exports.currencyEquals = currencyEquals;
|
|
22
|
+
exports.WETH = exports.currencyEquals = exports.Token = void 0;
|
|
24
23
|
var tiny_invariant_1 = __importDefault(require("tiny-invariant"));
|
|
25
24
|
var constants_1 = require("../constants");
|
|
26
25
|
var utils_1 = require("../utils");
|
|
@@ -78,6 +77,7 @@ function currencyEquals(currencyA, currencyB) {
|
|
|
78
77
|
return currencyA === currencyB;
|
|
79
78
|
}
|
|
80
79
|
}
|
|
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'),
|
package/lib/v1/entities/trade.js
CHANGED
|
@@ -12,9 +12,7 @@ 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 = void 0;
|
|
16
|
-
exports.inputOutputComparator = inputOutputComparator;
|
|
17
|
-
exports.tradeComparator = tradeComparator;
|
|
15
|
+
exports.Trade = exports.tradeComparator = exports.inputOutputComparator = void 0;
|
|
18
16
|
var tiny_invariant_1 = __importDefault(require("tiny-invariant"));
|
|
19
17
|
var constants_1 = require("../constants");
|
|
20
18
|
var utils_1 = require("../utils");
|
|
@@ -66,6 +64,7 @@ function inputOutputComparator(a, b) {
|
|
|
66
64
|
}
|
|
67
65
|
}
|
|
68
66
|
}
|
|
67
|
+
exports.inputOutputComparator = inputOutputComparator;
|
|
69
68
|
// extension of the input output comparator that also considers other dimensions of the trade in ranking them
|
|
70
69
|
function tradeComparator(a, b) {
|
|
71
70
|
var ioComp = inputOutputComparator(a, b);
|
|
@@ -82,6 +81,7 @@ function tradeComparator(a, b) {
|
|
|
82
81
|
// finally consider the number of hops since each hop costs gas
|
|
83
82
|
return a.route.path.length - b.route.path.length;
|
|
84
83
|
}
|
|
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
|
|
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;
|
|
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 (
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
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;
|
|
93
93
|
return __generator(this, function (_c) {
|
|
94
94
|
switch (_c.label) {
|
|
95
95
|
case 0:
|
|
96
|
-
if (!(typeof ((
|
|
97
|
-
|
|
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];
|
|
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
|
-
|
|
105
|
+
_b = _c.sent();
|
|
106
106
|
_c.label = 3;
|
|
107
107
|
case 3:
|
|
108
|
-
parsedDecimals =
|
|
108
|
+
parsedDecimals = _b;
|
|
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 (
|
|
121
|
-
|
|
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 () {
|
|
122
123
|
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,11 +3,7 @@ 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.validateSolidityTypeInstance =
|
|
7
|
-
exports.validateAndParseAddress = validateAndParseAddress;
|
|
8
|
-
exports.parseBigintIsh = parseBigintIsh;
|
|
9
|
-
exports.sqrt = sqrt;
|
|
10
|
-
exports.sortedInsert = sortedInsert;
|
|
6
|
+
exports.sortedInsert = exports.sqrt = exports.parseBigintIsh = exports.validateAndParseAddress = exports.validateSolidityTypeInstance = void 0;
|
|
11
7
|
var tiny_invariant_1 = __importDefault(require("tiny-invariant"));
|
|
12
8
|
var tiny_warning_1 = __importDefault(require("tiny-warning"));
|
|
13
9
|
var jsbi_1 = __importDefault(require("jsbi"));
|
|
@@ -17,6 +13,7 @@ function validateSolidityTypeInstance(value, solidityType) {
|
|
|
17
13
|
(0, tiny_invariant_1.default)(jsbi_1.default.greaterThanOrEqual(value, constants_1.ZERO), "".concat(value, " is not a ").concat(solidityType, "."));
|
|
18
14
|
(0, tiny_invariant_1.default)(jsbi_1.default.lessThanOrEqual(value, constants_1.SOLIDITY_TYPE_MAXIMA[solidityType]), "".concat(value, " is not a ").concat(solidityType, "."));
|
|
19
15
|
}
|
|
16
|
+
exports.validateSolidityTypeInstance = validateSolidityTypeInstance;
|
|
20
17
|
// warns if addresses are not checksummed
|
|
21
18
|
function validateAndParseAddress(address) {
|
|
22
19
|
try {
|
|
@@ -28,6 +25,7 @@ function validateAndParseAddress(address) {
|
|
|
28
25
|
(0, tiny_invariant_1.default)(false, "".concat(address, " is not a valid address."));
|
|
29
26
|
}
|
|
30
27
|
}
|
|
28
|
+
exports.validateAndParseAddress = validateAndParseAddress;
|
|
31
29
|
function parseBigintIsh(bigintIsh) {
|
|
32
30
|
return bigintIsh instanceof jsbi_1.default
|
|
33
31
|
? bigintIsh
|
|
@@ -35,6 +33,7 @@ function parseBigintIsh(bigintIsh) {
|
|
|
35
33
|
? jsbi_1.default.BigInt(bigintIsh.toString())
|
|
36
34
|
: jsbi_1.default.BigInt(bigintIsh);
|
|
37
35
|
}
|
|
36
|
+
exports.parseBigintIsh = parseBigintIsh;
|
|
38
37
|
// mock the on-chain sqrt function
|
|
39
38
|
function sqrt(y) {
|
|
40
39
|
validateSolidityTypeInstance(y, constants_1.SolidityType.uint256);
|
|
@@ -53,6 +52,7 @@ function sqrt(y) {
|
|
|
53
52
|
}
|
|
54
53
|
return z;
|
|
55
54
|
}
|
|
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,3 +84,4 @@ function sortedInsert(items, add, maxSize, comparator) {
|
|
|
84
84
|
return isFull ? items.pop() : null;
|
|
85
85
|
}
|
|
86
86
|
}
|
|
87
|
+
exports.sortedInsert = sortedInsert;
|