@openocean.finance/openocean-sdk 1.7.19 → 1.7.20
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 +2 -2
- package/lib/config/index.js +2 -2
- package/lib/swapSdk/Approve.js +2 -2
- package/lib/swapSdk/Swap.d.ts +1 -0
- package/lib/swapSdk/Swap.js +82 -52
- package/lib/swapSdk/getAllowance.js +3 -4
- package/lib/swapSdk/getBalance.js +82 -34
- package/lib/swapSdk/index.js +2 -2
- package/lib/swapSdk/solanaTransactionSender.d.ts +0 -1
- package/lib/swapSdk/solanaTransactionSender.js +10 -11
- package/lib/utils/ajx.js +5 -6
- 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 +5 -6
- package/package.json +2 -2
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 = 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.");
|
package/lib/config/index.js
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
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
|
;
|
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 = 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.");
|
package/lib/swapSdk/Swap.d.ts
CHANGED
|
@@ -16,6 +16,7 @@ export declare class Swap {
|
|
|
16
16
|
getGas(): Promise<unknown>;
|
|
17
17
|
sendONTTransaction(): Promise<void>;
|
|
18
18
|
sendSolanaTransaction(): Promise<void>;
|
|
19
|
+
sendSuiTransaction(): Promise<void>;
|
|
19
20
|
sendStarknetTransaction(): Promise<void>;
|
|
20
21
|
sendAptosTransaction(): Promise<void>;
|
|
21
22
|
_createTransaction(opt: any, wallet: any): Promise<any>;
|
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 = 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.");
|
|
@@ -57,6 +57,7 @@ var NotoMobile_1 = require("./NotoMobile");
|
|
|
57
57
|
var web3_1 = __importDefault(require("web3"));
|
|
58
58
|
var config_1 = require("./../config");
|
|
59
59
|
var solanaTransactionSender_1 = require("./solanaTransactionSender");
|
|
60
|
+
var transactions_1 = require("@mysten/sui/transactions");
|
|
60
61
|
var axios_1 = __importDefault(require("axios"));
|
|
61
62
|
// import bs58 from "bs58";
|
|
62
63
|
var bs58 = require("bs58");
|
|
@@ -118,6 +119,9 @@ var Swap = /** @class */ (function () {
|
|
|
118
119
|
case "STARKNET":
|
|
119
120
|
_this.sendStarknetTransaction();
|
|
120
121
|
break;
|
|
122
|
+
case "SUI":
|
|
123
|
+
_this.sendSuiTransaction();
|
|
124
|
+
break;
|
|
121
125
|
}
|
|
122
126
|
}, 200);
|
|
123
127
|
return this;
|
|
@@ -192,9 +196,9 @@ var Swap = /** @class */ (function () {
|
|
|
192
196
|
});
|
|
193
197
|
};
|
|
194
198
|
Swap.prototype.sendSolanaTransaction = function () {
|
|
195
|
-
var _a, _b;
|
|
196
199
|
return __awaiter(this, void 0, void 0, function () {
|
|
197
|
-
var res, transaction, signed, result, bytes,
|
|
200
|
+
var res, transaction, signed, result, bytes, _a, msg, data, bytes, serializedTransaction, transactionResponse, e_1;
|
|
201
|
+
var _b, _c;
|
|
198
202
|
return __generator(this, function (_d) {
|
|
199
203
|
switch (_d.label) {
|
|
200
204
|
case 0:
|
|
@@ -227,7 +231,7 @@ var Swap = /** @class */ (function () {
|
|
|
227
231
|
if (!this.wallet.sdk.isSlopeWallet) return [3 /*break*/, 5];
|
|
228
232
|
return [4 /*yield*/, this.wallet.sdk.signTransaction(bs58.encode(transaction.serializeMessage ? transaction.serializeMessage() : transaction.message.serialize()))];
|
|
229
233
|
case 4:
|
|
230
|
-
|
|
234
|
+
_a = _d.sent(), msg = _a.msg, data = _a.data;
|
|
231
235
|
if (msg !== "ok")
|
|
232
236
|
return [2 /*return*/];
|
|
233
237
|
bytes = bs58.decode(data.signature);
|
|
@@ -252,8 +256,8 @@ var Swap = /** @class */ (function () {
|
|
|
252
256
|
case 8:
|
|
253
257
|
transactionResponse = _d.sent();
|
|
254
258
|
if (transactionResponse && transactionResponse.response) {
|
|
255
|
-
if ((
|
|
256
|
-
this.errorCallback((
|
|
259
|
+
if ((_b = transactionResponse.response.meta) === null || _b === void 0 ? void 0 : _b.err) {
|
|
260
|
+
this.errorCallback((_c = transactionResponse.response.meta) === null || _c === void 0 ? void 0 : _c.err);
|
|
257
261
|
}
|
|
258
262
|
else {
|
|
259
263
|
this.transactionHashCallback(transactionResponse.txid);
|
|
@@ -272,9 +276,35 @@ var Swap = /** @class */ (function () {
|
|
|
272
276
|
});
|
|
273
277
|
});
|
|
274
278
|
};
|
|
279
|
+
Swap.prototype.sendSuiTransaction = function () {
|
|
280
|
+
return __awaiter(this, void 0, void 0, function () {
|
|
281
|
+
var transaction, transaction1, signature, e_2;
|
|
282
|
+
return __generator(this, function (_a) {
|
|
283
|
+
switch (_a.label) {
|
|
284
|
+
case 0:
|
|
285
|
+
_a.trys.push([0, 2, , 3]);
|
|
286
|
+
transaction = this.res.transaction;
|
|
287
|
+
console.log('sendSuiTransaction 1', transaction, this.res);
|
|
288
|
+
transaction1 = transactions_1.Transaction.from(transaction);
|
|
289
|
+
return [4 /*yield*/, this.wallet.sdk.features['sui:signAndExecuteTransaction']
|
|
290
|
+
.signAndExecuteTransaction({ transaction: transaction1 })];
|
|
291
|
+
case 1:
|
|
292
|
+
signature = _a.sent();
|
|
293
|
+
console.log('sendSuiTransaction 2', signature);
|
|
294
|
+
this.transactionHashCallback(signature.digest);
|
|
295
|
+
return [3 /*break*/, 3];
|
|
296
|
+
case 2:
|
|
297
|
+
e_2 = _a.sent();
|
|
298
|
+
this.errorCallback(e_2.message);
|
|
299
|
+
return [3 /*break*/, 3];
|
|
300
|
+
case 3: return [2 /*return*/];
|
|
301
|
+
}
|
|
302
|
+
});
|
|
303
|
+
});
|
|
304
|
+
};
|
|
275
305
|
Swap.prototype.sendStarknetTransaction = function () {
|
|
276
306
|
return __awaiter(this, void 0, void 0, function () {
|
|
277
|
-
var transaction, signature, transaction_hash,
|
|
307
|
+
var transaction, signature, transaction_hash, e_3;
|
|
278
308
|
return __generator(this, function (_a) {
|
|
279
309
|
switch (_a.label) {
|
|
280
310
|
case 0:
|
|
@@ -289,8 +319,8 @@ var Swap = /** @class */ (function () {
|
|
|
289
319
|
this.transactionHashCallback(transaction_hash);
|
|
290
320
|
return [3 /*break*/, 3];
|
|
291
321
|
case 2:
|
|
292
|
-
|
|
293
|
-
this.errorCallback(
|
|
322
|
+
e_3 = _a.sent();
|
|
323
|
+
this.errorCallback(e_3.message);
|
|
294
324
|
return [3 /*break*/, 3];
|
|
295
325
|
case 3: return [2 /*return*/];
|
|
296
326
|
}
|
|
@@ -386,7 +416,7 @@ var Swap = /** @class */ (function () {
|
|
|
386
416
|
};
|
|
387
417
|
Swap.prototype.sendNearTransaction = function () {
|
|
388
418
|
return __awaiter(this, void 0, void 0, function () {
|
|
389
|
-
var transaction, wallet_2, transactions, currentTransactions,
|
|
419
|
+
var transaction, wallet_2, transactions, currentTransactions, e_4, err, txResult, transaction_1, hash, error_2;
|
|
390
420
|
var _this = this;
|
|
391
421
|
return __generator(this, function (_a) {
|
|
392
422
|
switch (_a.label) {
|
|
@@ -421,11 +451,11 @@ var Swap = /** @class */ (function () {
|
|
|
421
451
|
_a.sent();
|
|
422
452
|
return [3 /*break*/, 5];
|
|
423
453
|
case 4:
|
|
424
|
-
|
|
425
|
-
err =
|
|
426
|
-
console.warn(
|
|
427
|
-
console.log("Error: " +
|
|
428
|
-
this.errorCallback(
|
|
454
|
+
e_4 = _a.sent();
|
|
455
|
+
err = e_4;
|
|
456
|
+
console.warn(e_4);
|
|
457
|
+
console.log("Error: " + e_4.message);
|
|
458
|
+
this.errorCallback(e_4.message);
|
|
429
459
|
return [3 /*break*/, 5];
|
|
430
460
|
case 5: return [3 /*break*/, 8];
|
|
431
461
|
case 6:
|
|
@@ -487,7 +517,7 @@ var Swap = /** @class */ (function () {
|
|
|
487
517
|
};
|
|
488
518
|
Swap.prototype.sendCosmosTransaction = function () {
|
|
489
519
|
return __awaiter(this, void 0, void 0, function () {
|
|
490
|
-
var _a, transaction, cosmosReceiver, wallet, transactions, result,
|
|
520
|
+
var _a, transaction, cosmosReceiver, wallet, transactions, result, e_5, err, error_3;
|
|
491
521
|
return __generator(this, function (_b) {
|
|
492
522
|
switch (_b.label) {
|
|
493
523
|
case 0:
|
|
@@ -518,11 +548,11 @@ var Swap = /** @class */ (function () {
|
|
|
518
548
|
}
|
|
519
549
|
return [3 /*break*/, 4];
|
|
520
550
|
case 3:
|
|
521
|
-
|
|
522
|
-
err =
|
|
523
|
-
console.warn(
|
|
524
|
-
console.log("Error: " +
|
|
525
|
-
this.errorCallback(
|
|
551
|
+
e_5 = _b.sent();
|
|
552
|
+
err = e_5;
|
|
553
|
+
console.warn(e_5);
|
|
554
|
+
console.log("Error: " + e_5.message);
|
|
555
|
+
this.errorCallback(e_5.message);
|
|
526
556
|
return [3 /*break*/, 4];
|
|
527
557
|
case 4: return [3 /*break*/, 6];
|
|
528
558
|
case 5:
|
|
@@ -591,7 +621,7 @@ var Swap = /** @class */ (function () {
|
|
|
591
621
|
};
|
|
592
622
|
Swap.prototype.sendEthTransactionNew = function () {
|
|
593
623
|
return __awaiter(this, void 0, void 0, function () {
|
|
594
|
-
var _a, inToken, inAmount, outAmount, outToken, data, to, ethGasPrice, gasPrice, gmxFee, myWallet, contract, invitee, path, amounts, swapAddr, swapExtraData, swapParams, gas,
|
|
624
|
+
var _a, inToken, inAmount, outAmount, outToken, data, to, ethGasPrice, gasPrice, gmxFee, myWallet, contract, invitee, path, amounts, swapAddr, swapExtraData, swapParams, gas, e_6, maxFeePerGas, maxPriorityFeePerGas;
|
|
595
625
|
var _this = this;
|
|
596
626
|
return __generator(this, function (_b) {
|
|
597
627
|
switch (_b.label) {
|
|
@@ -619,11 +649,11 @@ var Swap = /** @class */ (function () {
|
|
|
619
649
|
swapParams.gas = gas;
|
|
620
650
|
return [3 /*break*/, 4];
|
|
621
651
|
case 3:
|
|
622
|
-
|
|
623
|
-
if (
|
|
624
|
-
|
|
652
|
+
e_6 = _b.sent();
|
|
653
|
+
if (e_6 && e_6.message.indexOf("JSON-RPC error.") != -1) {
|
|
654
|
+
e_6 = JSON.parse(e_6.message.split("JSON-RPC error.")[1]);
|
|
625
655
|
}
|
|
626
|
-
this.errorCallback((
|
|
656
|
+
this.errorCallback((e_6 && e_6.message) || e_6);
|
|
627
657
|
return [2 /*return*/];
|
|
628
658
|
case 4:
|
|
629
659
|
if (ethGasPrice) {
|
|
@@ -664,7 +694,7 @@ var Swap = /** @class */ (function () {
|
|
|
664
694
|
};
|
|
665
695
|
Swap.prototype.sendEthTransaction = function () {
|
|
666
696
|
return __awaiter(this, void 0, void 0, function () {
|
|
667
|
-
var _a, inToken, inAmount, data, to, ethGasPrice, gasPrice, estimatedGas, gmxFee, swapParams, maxFeePerGas, maxPriorityFeePerGas, safeTxHash,
|
|
697
|
+
var _a, inToken, inAmount, data, to, ethGasPrice, gasPrice, estimatedGas, gmxFee, swapParams, maxFeePerGas, maxPriorityFeePerGas, safeTxHash, e_7, gas, e_8;
|
|
668
698
|
var _this = this;
|
|
669
699
|
return __generator(this, function (_b) {
|
|
670
700
|
switch (_b.label) {
|
|
@@ -711,8 +741,8 @@ var Swap = /** @class */ (function () {
|
|
|
711
741
|
this.getGnosisSafeTransaction(safeTxHash);
|
|
712
742
|
return [3 /*break*/, 4];
|
|
713
743
|
case 3:
|
|
714
|
-
|
|
715
|
-
this.errorCallback((
|
|
744
|
+
e_7 = _b.sent();
|
|
745
|
+
this.errorCallback((e_7 && e_7.message) || e_7);
|
|
716
746
|
return [3 /*break*/, 4];
|
|
717
747
|
case 4: return [2 /*return*/];
|
|
718
748
|
case 5:
|
|
@@ -731,11 +761,11 @@ var Swap = /** @class */ (function () {
|
|
|
731
761
|
swapParams.gas = gas;
|
|
732
762
|
return [3 /*break*/, 9];
|
|
733
763
|
case 8:
|
|
734
|
-
|
|
735
|
-
if (
|
|
736
|
-
|
|
764
|
+
e_8 = _b.sent();
|
|
765
|
+
if (e_8 && e_8.message.indexOf("JSON-RPC error.") != -1) {
|
|
766
|
+
e_8 = JSON.parse(e_8.message.split("JSON-RPC error.")[1]);
|
|
737
767
|
}
|
|
738
|
-
this.errorCallback((
|
|
768
|
+
this.errorCallback((e_8 && e_8.message) || e_8);
|
|
739
769
|
return [2 /*return*/];
|
|
740
770
|
case 9:
|
|
741
771
|
console.log('sendEthTransaction swapParams', JSON.stringify(swapParams));
|
|
@@ -759,7 +789,7 @@ var Swap = /** @class */ (function () {
|
|
|
759
789
|
};
|
|
760
790
|
Swap.prototype.signEthTransactionByLedger = function (swapParams) {
|
|
761
791
|
return __awaiter(this, void 0, void 0, function () {
|
|
762
|
-
var account, myWallet, gasPrice, txParams, serializedTx, signature, signedTx, hash,
|
|
792
|
+
var account, myWallet, gasPrice, txParams, serializedTx, signature, signedTx, hash, e_9;
|
|
763
793
|
var _a;
|
|
764
794
|
return __generator(this, function (_b) {
|
|
765
795
|
switch (_b.label) {
|
|
@@ -803,8 +833,8 @@ var Swap = /** @class */ (function () {
|
|
|
803
833
|
this.transactionHashCallback(hash);
|
|
804
834
|
return [3 /*break*/, 6];
|
|
805
835
|
case 5:
|
|
806
|
-
|
|
807
|
-
this.errorCallback(
|
|
836
|
+
e_9 = _b.sent();
|
|
837
|
+
this.errorCallback(e_9);
|
|
808
838
|
return [3 /*break*/, 6];
|
|
809
839
|
case 6: return [2 /*return*/];
|
|
810
840
|
}
|
|
@@ -843,7 +873,7 @@ var Swap = /** @class */ (function () {
|
|
|
843
873
|
};
|
|
844
874
|
Swap.prototype.sendTronTransaction = function () {
|
|
845
875
|
return __awaiter(this, void 0, void 0, function () {
|
|
846
|
-
var _a, inToken, outToken, inAmount, outAmount, minOutAmount, addresses, calldata, offsets, gasLimitsAndValues, abi, contract, _contract, swapParams,
|
|
876
|
+
var _a, inToken, outToken, inAmount, outAmount, minOutAmount, addresses, calldata, offsets, gasLimitsAndValues, abi, contract, _contract, swapParams, e_10;
|
|
847
877
|
var _this = this;
|
|
848
878
|
return __generator(this, function (_b) {
|
|
849
879
|
switch (_b.label) {
|
|
@@ -928,8 +958,8 @@ var Swap = /** @class */ (function () {
|
|
|
928
958
|
_b.sent();
|
|
929
959
|
return [3 /*break*/, 5];
|
|
930
960
|
case 4:
|
|
931
|
-
|
|
932
|
-
this.errorCallback(
|
|
961
|
+
e_10 = _b.sent();
|
|
962
|
+
this.errorCallback(e_10 || e_10.message);
|
|
933
963
|
return [3 /*break*/, 5];
|
|
934
964
|
case 5: return [2 /*return*/];
|
|
935
965
|
}
|
|
@@ -938,7 +968,7 @@ var Swap = /** @class */ (function () {
|
|
|
938
968
|
};
|
|
939
969
|
Swap.prototype.sendTerraTransaction = function () {
|
|
940
970
|
return __awaiter(this, void 0, void 0, function () {
|
|
941
|
-
var data, address, gasPrices, msg, _a, fee, accountInfo,
|
|
971
|
+
var data, address, gasPrices, msg, _a, fee, accountInfo, e_11;
|
|
942
972
|
var _this = this;
|
|
943
973
|
return __generator(this, function (_b) {
|
|
944
974
|
switch (_b.label) {
|
|
@@ -980,8 +1010,8 @@ var Swap = /** @class */ (function () {
|
|
|
980
1010
|
});
|
|
981
1011
|
return [3 /*break*/, 7];
|
|
982
1012
|
case 6:
|
|
983
|
-
|
|
984
|
-
this.errorCallback(
|
|
1013
|
+
e_11 = _b.sent();
|
|
1014
|
+
this.errorCallback(e_11.message || e_11);
|
|
985
1015
|
return [3 /*break*/, 7];
|
|
986
1016
|
case 7: return [2 /*return*/];
|
|
987
1017
|
}
|
|
@@ -990,7 +1020,7 @@ var Swap = /** @class */ (function () {
|
|
|
990
1020
|
};
|
|
991
1021
|
Swap.prototype.approveOnt = function (transaction, _amount, inToken) {
|
|
992
1022
|
return __awaiter(this, void 0, void 0, function () {
|
|
993
|
-
var scriptHash, operation, gasLimit, args, params, result,
|
|
1023
|
+
var scriptHash, operation, gasLimit, args, params, result, e_12;
|
|
994
1024
|
return __generator(this, function (_a) {
|
|
995
1025
|
switch (_a.label) {
|
|
996
1026
|
case 0:
|
|
@@ -1023,10 +1053,10 @@ var Swap = /** @class */ (function () {
|
|
|
1023
1053
|
this.sendOntTransactionSdk(transaction);
|
|
1024
1054
|
return [3 /*break*/, 3];
|
|
1025
1055
|
case 2:
|
|
1026
|
-
|
|
1056
|
+
e_12 = _a.sent();
|
|
1027
1057
|
// tslint:disable-next-line:no-console
|
|
1028
|
-
console.log("onScCall error:",
|
|
1029
|
-
this.errorCallback((
|
|
1058
|
+
console.log("onScCall error:", e_12);
|
|
1059
|
+
this.errorCallback((e_12 && e_12.message) || e_12);
|
|
1030
1060
|
return [3 /*break*/, 3];
|
|
1031
1061
|
case 3: return [2 /*return*/];
|
|
1032
1062
|
}
|
|
@@ -1035,7 +1065,7 @@ var Swap = /** @class */ (function () {
|
|
|
1035
1065
|
};
|
|
1036
1066
|
Swap.prototype.sendOntTransactionSdk = function (transaction) {
|
|
1037
1067
|
return __awaiter(this, void 0, void 0, function () {
|
|
1038
|
-
var scriptHash, operation, gasLimit, args, params, result,
|
|
1068
|
+
var scriptHash, operation, gasLimit, args, params, result, e_13;
|
|
1039
1069
|
return __generator(this, function (_a) {
|
|
1040
1070
|
switch (_a.label) {
|
|
1041
1071
|
case 0:
|
|
@@ -1066,8 +1096,8 @@ var Swap = /** @class */ (function () {
|
|
|
1066
1096
|
}
|
|
1067
1097
|
return [3 /*break*/, 3];
|
|
1068
1098
|
case 2:
|
|
1069
|
-
|
|
1070
|
-
this.errorCallback((
|
|
1099
|
+
e_13 = _a.sent();
|
|
1100
|
+
this.errorCallback((e_13 && e_13.message) || e_13);
|
|
1071
1101
|
return [3 /*break*/, 3];
|
|
1072
1102
|
case 3: return [2 /*return*/];
|
|
1073
1103
|
}
|
|
@@ -1076,7 +1106,7 @@ var Swap = /** @class */ (function () {
|
|
|
1076
1106
|
};
|
|
1077
1107
|
Swap.prototype.getTerraFee = function (address, msg, gasPrices) {
|
|
1078
1108
|
return __awaiter(this, void 0, void 0, function () {
|
|
1079
|
-
var terra, accountInfo, fee,
|
|
1109
|
+
var terra, accountInfo, fee, e_14;
|
|
1080
1110
|
return __generator(this, function (_a) {
|
|
1081
1111
|
switch (_a.label) {
|
|
1082
1112
|
case 0:
|
|
@@ -1106,7 +1136,7 @@ var Swap = /** @class */ (function () {
|
|
|
1106
1136
|
accountInfo: accountInfo,
|
|
1107
1137
|
}];
|
|
1108
1138
|
case 3:
|
|
1109
|
-
|
|
1139
|
+
e_14 = _a.sent();
|
|
1110
1140
|
return [2 /*return*/, null];
|
|
1111
1141
|
case 4: return [2 /*return*/];
|
|
1112
1142
|
}
|
|
@@ -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 = 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 =
|
|
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 =
|
|
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 =
|
|
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");
|
|
@@ -57,7 +57,7 @@ var providerEth = new ethers_1.ethers.providers.JsonRpcProvider({
|
|
|
57
57
|
});
|
|
58
58
|
function getBalance(account, tokenAddressOrSymbol, decimals, chainName, myWallet, customAddress) {
|
|
59
59
|
return __awaiter(this, void 0, void 0, function () {
|
|
60
|
-
var balanceObj, balance, contract, address, _a, data, _b, coin, _c, value, sum_1, _d, value, terra, result, _symbol, token, amount, res, e_1, balanceDecimals, e_2, _e, result, balance_1, response, response, e_3;
|
|
60
|
+
var balanceObj, balance, contract, address, _a, data, _b, coin, _c, value, sum_1, _d, value, terra, result, _symbol, token, amount, res, e_1, balanceDecimals, e_2, _e, result, balance_1, response, response, response, result, response, result, e_3;
|
|
61
61
|
return __generator(this, function (_f) {
|
|
62
62
|
switch (_f.label) {
|
|
63
63
|
case 0:
|
|
@@ -65,7 +65,8 @@ function getBalance(account, tokenAddressOrSymbol, decimals, chainName, myWallet
|
|
|
65
65
|
short: 0,
|
|
66
66
|
long: 0,
|
|
67
67
|
decimals: decimals,
|
|
68
|
-
tokenAddress: tokenAddressOrSymbol
|
|
68
|
+
tokenAddress: tokenAddressOrSymbol,
|
|
69
|
+
customAddress: customAddress
|
|
69
70
|
};
|
|
70
71
|
balance = 0;
|
|
71
72
|
contract = null;
|
|
@@ -77,7 +78,7 @@ function getBalance(account, tokenAddressOrSymbol, decimals, chainName, myWallet
|
|
|
77
78
|
balanceObj.short = balance.data[tokenAddressOrSymbol].balance;
|
|
78
79
|
balanceObj.long = balance.data[tokenAddressOrSymbol].balance * (Math.pow(10, decimals));
|
|
79
80
|
}
|
|
80
|
-
return [3 /*break*/,
|
|
81
|
+
return [3 /*break*/, 47];
|
|
81
82
|
case 2:
|
|
82
83
|
if (!(chainName === 'aptos')) return [3 /*break*/, 4];
|
|
83
84
|
address = customAddress ? customAddress : tokenAddressOrSymbol === "0x1" ? "".concat(tokenAddressOrSymbol, "::aptos_coin::AptosCoin") : "".concat(tokenAddressOrSymbol, "::coin::T}");
|
|
@@ -88,7 +89,7 @@ function getBalance(account, tokenAddressOrSymbol, decimals, chainName, myWallet
|
|
|
88
89
|
_c = coin.value, value = _c === void 0 ? 0 : _c;
|
|
89
90
|
balanceObj.long = value;
|
|
90
91
|
balanceObj.short = +utils_1.utils.toFixed(utils_1.utils.decimals2Amount(value, decimals), 6);
|
|
91
|
-
return [3 /*break*/,
|
|
92
|
+
return [3 /*break*/, 47];
|
|
92
93
|
case 4:
|
|
93
94
|
if (!(chainName === 'solana')) return [3 /*break*/, 9];
|
|
94
95
|
if (!(tokenAddressOrSymbol === "So11111111111111111111111111111111111111112")) return [3 /*break*/, 6];
|
|
@@ -117,7 +118,7 @@ function getBalance(account, tokenAddressOrSymbol, decimals, chainName, myWallet
|
|
|
117
118
|
case 8:
|
|
118
119
|
balanceObj.long = balance;
|
|
119
120
|
balanceObj.short = +utils_1.utils.toFixed(utils_1.utils.decimals2Amount(balance || 0, decimals), 6);
|
|
120
|
-
return [3 /*break*/,
|
|
121
|
+
return [3 /*break*/, 47];
|
|
121
122
|
case 9:
|
|
122
123
|
if (!(chainName === 'terra')) return [3 /*break*/, 15];
|
|
123
124
|
terra = new terra_js_1.LCDClient({
|
|
@@ -159,7 +160,7 @@ function getBalance(account, tokenAddressOrSymbol, decimals, chainName, myWallet
|
|
|
159
160
|
case 14:
|
|
160
161
|
balanceObj.long = amount;
|
|
161
162
|
balanceObj.short = +utils_1.utils.toFixed(utils_1.utils.decimals2Amount(amount || 0, decimals), 6);
|
|
162
|
-
return [3 /*break*/,
|
|
163
|
+
return [3 /*break*/, 47];
|
|
163
164
|
case 15:
|
|
164
165
|
if (!(chainName === 'tron')) return [3 /*break*/, 22];
|
|
165
166
|
if (!(tokenAddressOrSymbol.toLowerCase() === "t9yd14nj9j7xab4dbgeix9h8unkkhxuwwb")) return [3 /*break*/, 17];
|
|
@@ -187,7 +188,7 @@ function getBalance(account, tokenAddressOrSymbol, decimals, chainName, myWallet
|
|
|
187
188
|
e_2 = _f.sent();
|
|
188
189
|
console.log("triggerConfirmedConstantContract", e_2);
|
|
189
190
|
return [3 /*break*/, 21];
|
|
190
|
-
case 21: return [3 /*break*/,
|
|
191
|
+
case 21: return [3 /*break*/, 47];
|
|
191
192
|
case 22:
|
|
192
193
|
if (!(chainName === 'osmosis')) return [3 /*break*/, 24];
|
|
193
194
|
return [4 /*yield*/, myWallet.sdk.lcdClient.bank.balances(account)];
|
|
@@ -201,7 +202,7 @@ function getBalance(account, tokenAddressOrSymbol, decimals, chainName, myWallet
|
|
|
201
202
|
});
|
|
202
203
|
balanceObj.long = balance;
|
|
203
204
|
balanceObj.short = +utils_1.utils.toFixed(utils_1.utils.decimals2Amount(balance, decimals), 6);
|
|
204
|
-
return [3 /*break*/,
|
|
205
|
+
return [3 /*break*/, 47];
|
|
205
206
|
case 24:
|
|
206
207
|
if (!(chainName === 'near')) return [3 /*break*/, 29];
|
|
207
208
|
balance_1 = 0;
|
|
@@ -231,28 +232,76 @@ function getBalance(account, tokenAddressOrSymbol, decimals, chainName, myWallet
|
|
|
231
232
|
case 28:
|
|
232
233
|
balanceObj.long = balance_1;
|
|
233
234
|
balanceObj.short = +utils_1.utils.toFixed(utils_1.utils.decimals2Amount(balance_1, decimals), 6);
|
|
234
|
-
return [3 /*break*/,
|
|
235
|
+
return [3 /*break*/, 47];
|
|
235
236
|
case 29:
|
|
236
|
-
if (!
|
|
237
|
-
|
|
238
|
-
|
|
239
|
-
|
|
237
|
+
if (!(chainName === 'sui')) return [3 /*break*/, 36];
|
|
238
|
+
if (!(customAddress === "0x2::sui::SUI")) return [3 /*break*/, 32];
|
|
239
|
+
return [4 /*yield*/, fetch('https://fullnode.mainnet.sui.io/', {
|
|
240
|
+
method: 'POST',
|
|
241
|
+
headers: { 'Content-Type': 'application/json' },
|
|
242
|
+
body: JSON.stringify({
|
|
243
|
+
jsonrpc: '2.0',
|
|
244
|
+
id: 1,
|
|
245
|
+
method: 'suix_getBalance',
|
|
246
|
+
params: {
|
|
247
|
+
owner: account,
|
|
248
|
+
},
|
|
249
|
+
}),
|
|
250
|
+
})];
|
|
240
251
|
case 30:
|
|
241
|
-
|
|
242
|
-
return [
|
|
252
|
+
response = _f.sent();
|
|
253
|
+
return [4 /*yield*/, response.json()];
|
|
243
254
|
case 31:
|
|
244
|
-
|
|
245
|
-
|
|
246
|
-
|
|
247
|
-
balance = _f.sent();
|
|
255
|
+
result = _f.sent();
|
|
256
|
+
console.log('SUI Balance:', result.result);
|
|
257
|
+
balance = result.result.totalBalance;
|
|
248
258
|
return [3 /*break*/, 35];
|
|
249
|
-
case
|
|
259
|
+
case 32: return [4 /*yield*/, fetch('https://fullnode.mainnet.sui.io/', {
|
|
260
|
+
method: 'POST',
|
|
261
|
+
headers: { 'Content-Type': 'application/json' },
|
|
262
|
+
body: JSON.stringify({
|
|
263
|
+
jsonrpc: '2.0',
|
|
264
|
+
id: 1,
|
|
265
|
+
method: 'suix_getBalance',
|
|
266
|
+
params: {
|
|
267
|
+
owner: account,
|
|
268
|
+
coinType: customAddress,
|
|
269
|
+
},
|
|
270
|
+
}),
|
|
271
|
+
})];
|
|
272
|
+
case 33:
|
|
273
|
+
response = _f.sent();
|
|
274
|
+
return [4 /*yield*/, response.json()];
|
|
250
275
|
case 34:
|
|
251
|
-
|
|
276
|
+
result = _f.sent();
|
|
277
|
+
console.log("Token Balance (".concat(customAddress, "):"), result.result);
|
|
278
|
+
balance = result.result.totalBalance;
|
|
252
279
|
_f.label = 35;
|
|
253
|
-
case 35:
|
|
280
|
+
case 35:
|
|
281
|
+
balanceObj.long = +balance;
|
|
282
|
+
balanceObj.short = +utils_1.utils.toFixed(utils_1.utils.decimals2Amount(balance || 0, decimals), 6);
|
|
283
|
+
return [3 /*break*/, 47];
|
|
254
284
|
case 36:
|
|
255
|
-
|
|
285
|
+
if (!wallet_1.chainsObj.isNativeToken(chainName, tokenAddressOrSymbol)) return [3 /*break*/, 43];
|
|
286
|
+
console.log('myWallet', myWallet);
|
|
287
|
+
if (!(myWallet.key === "GnosisSafeWallet")) return [3 /*break*/, 38];
|
|
288
|
+
return [4 /*yield*/, myWallet.sdk.eth.getBalance([account, "latest"])];
|
|
289
|
+
case 37:
|
|
290
|
+
balance = _f.sent();
|
|
291
|
+
return [3 /*break*/, 42];
|
|
292
|
+
case 38:
|
|
293
|
+
if (!(myWallet.key === "LedgerWallet")) return [3 /*break*/, 40];
|
|
294
|
+
return [4 /*yield*/, providerEth.getBalance(account)];
|
|
295
|
+
case 39:
|
|
296
|
+
balance = _f.sent();
|
|
297
|
+
return [3 /*break*/, 42];
|
|
298
|
+
case 40: return [4 /*yield*/, myWallet.sdk.eth.getBalance(account)];
|
|
299
|
+
case 41:
|
|
300
|
+
balance = _f.sent();
|
|
301
|
+
_f.label = 42;
|
|
302
|
+
case 42: return [3 /*break*/, 46];
|
|
303
|
+
case 43:
|
|
304
|
+
_f.trys.push([43, 45, , 46]);
|
|
256
305
|
if (myWallet.key === "LedgerWallet") {
|
|
257
306
|
contract = new ethers_1.ethers.Contract(tokenAddressOrSymbol, config_1.ERC20_abi, providerEth);
|
|
258
307
|
}
|
|
@@ -260,21 +309,20 @@ function getBalance(account, tokenAddressOrSymbol, decimals, chainName, myWallet
|
|
|
260
309
|
contract = new myWallet.sdk.eth.Contract(config_1.ERC20_abi, tokenAddressOrSymbol);
|
|
261
310
|
}
|
|
262
311
|
return [4 /*yield*/, contract.methods.balanceOf(account).call()];
|
|
263
|
-
case
|
|
312
|
+
case 44:
|
|
264
313
|
balance = _f.sent();
|
|
265
|
-
return [3 /*break*/,
|
|
266
|
-
case
|
|
314
|
+
return [3 /*break*/, 46];
|
|
315
|
+
case 45:
|
|
267
316
|
e_3 = _f.sent();
|
|
268
|
-
return [3 /*break*/,
|
|
269
|
-
case
|
|
317
|
+
return [3 /*break*/, 46];
|
|
318
|
+
case 46:
|
|
270
319
|
if (balance) {
|
|
271
320
|
balanceObj.long = balance;
|
|
272
321
|
balanceObj.short = +utils_1.utils.toFixed(utils_1.utils.decimals2Amount(balance, decimals), 6);
|
|
273
322
|
}
|
|
274
|
-
_f.label =
|
|
275
|
-
case
|
|
323
|
+
_f.label = 47;
|
|
324
|
+
case 47: return [2 /*return*/, balanceObj];
|
|
276
325
|
}
|
|
277
326
|
});
|
|
278
327
|
});
|
|
279
328
|
}
|
|
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 = 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 =
|
|
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,14 +36,14 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
|
36
36
|
}
|
|
37
37
|
};
|
|
38
38
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
39
|
-
exports.transactionSenderAndConfirmationWaiter =
|
|
39
|
+
exports.transactionSenderAndConfirmationWaiter = transactionSenderAndConfirmationWaiter;
|
|
40
40
|
var sleep = function (time) {
|
|
41
41
|
return new Promise(function (resolve) { return setTimeout(resolve, time); });
|
|
42
42
|
};
|
|
43
43
|
function sendRawTransaction(connection, serializedTransaction, n) {
|
|
44
|
-
var _a;
|
|
45
44
|
return __awaiter(this, void 0, void 0, function () {
|
|
46
45
|
var txid, tx;
|
|
46
|
+
var _a;
|
|
47
47
|
return __generator(this, function (_b) {
|
|
48
48
|
switch (_b.label) {
|
|
49
49
|
case 0:
|
|
@@ -98,20 +98,20 @@ function getTransaction(connection, txid, n) {
|
|
|
98
98
|
});
|
|
99
99
|
}
|
|
100
100
|
function transactionSenderAndConfirmationWaiter(_a) {
|
|
101
|
-
|
|
102
|
-
return __awaiter(this, void 0, void 0, function () {
|
|
101
|
+
return __awaiter(this, arguments, void 0, function (_b) {
|
|
103
102
|
var txid, response;
|
|
104
|
-
|
|
105
|
-
|
|
103
|
+
var connection = _b.connection, serializedTransaction = _b.serializedTransaction;
|
|
104
|
+
return __generator(this, function (_c) {
|
|
105
|
+
switch (_c.label) {
|
|
106
106
|
case 0: return [4 /*yield*/, sendRawTransaction(connection, serializedTransaction, 0)];
|
|
107
107
|
case 1:
|
|
108
|
-
txid =
|
|
108
|
+
txid = _c.sent();
|
|
109
109
|
if (!txid) {
|
|
110
110
|
throw new Error('Transaction not confirmed.');
|
|
111
111
|
}
|
|
112
112
|
return [4 /*yield*/, getTransaction(connection, txid, 0)];
|
|
113
113
|
case 2:
|
|
114
|
-
response =
|
|
114
|
+
response = _c.sent();
|
|
115
115
|
if (!response) {
|
|
116
116
|
throw new Error('Transaction not confirmed.');
|
|
117
117
|
}
|
|
@@ -120,4 +120,3 @@ function transactionSenderAndConfirmationWaiter(_a) {
|
|
|
120
120
|
});
|
|
121
121
|
});
|
|
122
122
|
}
|
|
123
|
-
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 = 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.
|
|
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;
|
package/lib/utils/index.js
CHANGED
|
@@ -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.
|
|
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
|
|
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
|
{
|
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 = 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 = 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 = 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 = 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,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.
|
|
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'),
|
package/lib/v1/entities/trade.js
CHANGED
|
@@ -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 =
|
|
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 =
|
|
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 (
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
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 ((
|
|
97
|
-
|
|
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
|
-
|
|
105
|
+
_a = _c.sent();
|
|
106
106
|
_c.label = 3;
|
|
107
107
|
case 3:
|
|
108
|
-
parsedDecimals =
|
|
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 (
|
|
121
|
-
|
|
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.
|
|
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.
|
|
3
|
+
"version": "1.7.20",
|
|
4
4
|
"description": "Openocean sdk",
|
|
5
5
|
"main": "lib/index.js",
|
|
6
6
|
"scripts": {
|
|
@@ -23,10 +23,10 @@
|
|
|
23
23
|
"sdk"
|
|
24
24
|
],
|
|
25
25
|
"homepage": "",
|
|
26
|
-
|
|
27
26
|
"dependencies": {
|
|
28
27
|
"@ethersproject/bignumber": "^5.1.1",
|
|
29
28
|
"@looksrare/sdk": "^0.12.1",
|
|
29
|
+
"@mysten/sui": "^1.17.0",
|
|
30
30
|
"@openocean.finance/wallet": "^1.10.17",
|
|
31
31
|
"@terra-money/terra.js": "^3.1.10",
|
|
32
32
|
"@uniswap/v2-core": "^1.0.1",
|