@openocean.finance/openocean-sdk 1.7.65 → 1.7.67

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.
Files changed (2) hide show
  1. package/lib/swapSdk/Swap.js +60 -54
  2. package/package.json +2 -2
package/lib/swapSdk/Swap.js CHANGED
@@ -284,8 +284,7 @@ var Swap = /** @class */ (function () {
284
284
  };
285
285
  Swap.prototype.sendSolanaTransactionToBlockRust = function (res, serializedTransaction) {
286
286
  return __awaiter(this, void 0, void 0, function () {
287
- var headers, body, blockrushUrl, result, err_1;
288
- var _a;
287
+ var headers, body, blockrushUrl, data, _a, error, result, e_2;
289
288
  return __generator(this, function (_b) {
290
289
  switch (_b.label) {
291
290
  case 0:
@@ -310,12 +309,19 @@ var Swap = /** @class */ (function () {
310
309
  blockrushUrl = res.blockrushUrl;
311
310
  return [4 /*yield*/, axios_1.default.post(blockrushUrl || 'https://jp.rpc.blockrush.io', body, { headers: headers })];
312
311
  case 2:
313
- result = _b.sent();
312
+ data = (_b.sent()).data;
313
+ _a = data || {}, error = _a.error, result = _a.result;
314
314
  console.log('RPC Response:', result.data);
315
+ if (result) {
316
+ this.transactionHashCallback(result);
317
+ }
318
+ else {
319
+ this.errorCallback(error && error.message || 'server error');
320
+ }
315
321
  return [3 /*break*/, 4];
316
322
  case 3:
317
- err_1 = _b.sent();
318
- console.error('RPC Error:', ((_a = err_1.response) === null || _a === void 0 ? void 0 : _a.data) || err_1.message);
323
+ e_2 = _b.sent();
324
+ this.errorCallback(e_2.message);
319
325
  return [3 /*break*/, 4];
320
326
  case 4: return [2 /*return*/];
321
327
  }
@@ -324,7 +330,7 @@ var Swap = /** @class */ (function () {
324
330
  };
325
331
  Swap.prototype.sendSuiTransaction = function () {
326
332
  return __awaiter(this, void 0, void 0, function () {
327
- var transaction, tx, signature, e_2;
333
+ var transaction, tx, signature, e_3;
328
334
  return __generator(this, function (_a) {
329
335
  switch (_a.label) {
330
336
  case 0:
@@ -344,9 +350,9 @@ var Swap = /** @class */ (function () {
344
350
  this.transactionHashCallback(signature.digest);
345
351
  return [3 /*break*/, 3];
346
352
  case 2:
347
- e_2 = _a.sent();
348
- console.log('sendSuiTransaction 3', e_2);
349
- this.errorCallback(e_2.message);
353
+ e_3 = _a.sent();
354
+ console.log('sendSuiTransaction 3', e_3);
355
+ this.errorCallback(e_3.message);
350
356
  return [3 /*break*/, 3];
351
357
  case 3: return [2 /*return*/];
352
358
  }
@@ -355,7 +361,7 @@ var Swap = /** @class */ (function () {
355
361
  };
356
362
  Swap.prototype.sendStarknetTransaction = function () {
357
363
  return __awaiter(this, void 0, void 0, function () {
358
- var transaction, signature, transaction_hash, e_3;
364
+ var transaction, signature, transaction_hash, e_4;
359
365
  return __generator(this, function (_a) {
360
366
  switch (_a.label) {
361
367
  case 0:
@@ -370,8 +376,8 @@ var Swap = /** @class */ (function () {
370
376
  this.transactionHashCallback(transaction_hash);
371
377
  return [3 /*break*/, 3];
372
378
  case 2:
373
- e_3 = _a.sent();
374
- this.errorCallback(e_3.message);
379
+ e_4 = _a.sent();
380
+ this.errorCallback(e_4.message);
375
381
  return [3 /*break*/, 3];
376
382
  case 3: return [2 /*return*/];
377
383
  }
@@ -467,7 +473,7 @@ var Swap = /** @class */ (function () {
467
473
  };
468
474
  Swap.prototype.sendNearTransaction = function () {
469
475
  return __awaiter(this, void 0, void 0, function () {
470
- var transaction, wallet_2, transactions, currentTransactions, e_4, err, txResult, transaction_1, hash, error_2;
476
+ var transaction, wallet_2, transactions, currentTransactions, e_5, err, txResult, transaction_1, hash, error_2;
471
477
  var _this = this;
472
478
  return __generator(this, function (_a) {
473
479
  switch (_a.label) {
@@ -502,11 +508,11 @@ var Swap = /** @class */ (function () {
502
508
  _a.sent();
503
509
  return [3 /*break*/, 5];
504
510
  case 4:
505
- e_4 = _a.sent();
506
- err = e_4;
507
- console.warn(e_4);
508
- console.log("Error: " + e_4.message);
509
- this.errorCallback(e_4.message);
511
+ e_5 = _a.sent();
512
+ err = e_5;
513
+ console.warn(e_5);
514
+ console.log("Error: " + e_5.message);
515
+ this.errorCallback(e_5.message);
510
516
  return [3 /*break*/, 5];
511
517
  case 5: return [3 /*break*/, 8];
512
518
  case 6:
@@ -568,7 +574,7 @@ var Swap = /** @class */ (function () {
568
574
  };
569
575
  Swap.prototype.sendCosmosTransaction = function () {
570
576
  return __awaiter(this, void 0, void 0, function () {
571
- var _a, transaction, cosmosReceiver, wallet, transactions, result, e_5, err, error_3;
577
+ var _a, transaction, cosmosReceiver, wallet, transactions, result, e_6, err, error_3;
572
578
  return __generator(this, function (_b) {
573
579
  switch (_b.label) {
574
580
  case 0:
@@ -599,11 +605,11 @@ var Swap = /** @class */ (function () {
599
605
  }
600
606
  return [3 /*break*/, 4];
601
607
  case 3:
602
- e_5 = _b.sent();
603
- err = e_5;
604
- console.warn(e_5);
605
- console.log("Error: " + e_5.message);
606
- this.errorCallback(e_5.message);
608
+ e_6 = _b.sent();
609
+ err = e_6;
610
+ console.warn(e_6);
611
+ console.log("Error: " + e_6.message);
612
+ this.errorCallback(e_6.message);
607
613
  return [3 /*break*/, 4];
608
614
  case 4: return [3 /*break*/, 6];
609
615
  case 5:
@@ -672,7 +678,7 @@ var Swap = /** @class */ (function () {
672
678
  };
673
679
  Swap.prototype.sendEthTransactionNew = function () {
674
680
  return __awaiter(this, void 0, void 0, function () {
675
- var _a, inToken, inAmount, outAmount, outToken, data, to, ethGasPrice, gasPrice, gmxFee, myWallet, contract, invitee, path, amounts, swapAddr, swapExtraData, swapParams, gas, e_6, maxFeePerGas, maxPriorityFeePerGas;
681
+ var _a, inToken, inAmount, outAmount, outToken, data, to, ethGasPrice, gasPrice, gmxFee, myWallet, contract, invitee, path, amounts, swapAddr, swapExtraData, swapParams, gas, e_7, maxFeePerGas, maxPriorityFeePerGas;
676
682
  var _this = this;
677
683
  return __generator(this, function (_b) {
678
684
  switch (_b.label) {
@@ -700,11 +706,11 @@ var Swap = /** @class */ (function () {
700
706
  swapParams.gas = gas;
701
707
  return [3 /*break*/, 4];
702
708
  case 3:
703
- e_6 = _b.sent();
704
- if (e_6 && e_6.message.indexOf("JSON-RPC error.") != -1) {
705
- e_6 = JSON.parse(e_6.message.split("JSON-RPC error.")[1]);
709
+ e_7 = _b.sent();
710
+ if (e_7 && e_7.message.indexOf("JSON-RPC error.") != -1) {
711
+ e_7 = JSON.parse(e_7.message.split("JSON-RPC error.")[1]);
706
712
  }
707
- this.errorCallback((e_6 && e_6.message) || e_6);
713
+ this.errorCallback((e_7 && e_7.message) || e_7);
708
714
  return [2 /*return*/];
709
715
  case 4:
710
716
  if (ethGasPrice) {
@@ -745,7 +751,7 @@ var Swap = /** @class */ (function () {
745
751
  };
746
752
  Swap.prototype.sendEthTransaction = function () {
747
753
  return __awaiter(this, void 0, void 0, function () {
748
- var _a, inToken, inAmount, data, to, ethGasPrice, gasPrice, estimatedGas, gmxFee, swapParams, maxFeePerGas, maxPriorityFeePerGas, safeTxHash, e_7, gas, e_8;
754
+ var _a, inToken, inAmount, data, to, ethGasPrice, gasPrice, estimatedGas, gmxFee, swapParams, maxFeePerGas, maxPriorityFeePerGas, safeTxHash, e_8, gas, e_9;
749
755
  var _this = this;
750
756
  return __generator(this, function (_b) {
751
757
  switch (_b.label) {
@@ -792,8 +798,8 @@ var Swap = /** @class */ (function () {
792
798
  this.getGnosisSafeTransaction(safeTxHash);
793
799
  return [3 /*break*/, 4];
794
800
  case 3:
795
- e_7 = _b.sent();
796
- this.errorCallback((e_7 && e_7.message) || e_7);
801
+ e_8 = _b.sent();
802
+ this.errorCallback((e_8 && e_8.message) || e_8);
797
803
  return [3 /*break*/, 4];
798
804
  case 4: return [2 /*return*/];
799
805
  case 5:
@@ -812,11 +818,11 @@ var Swap = /** @class */ (function () {
812
818
  swapParams.gas = gas;
813
819
  return [3 /*break*/, 9];
814
820
  case 8:
815
- e_8 = _b.sent();
816
- if (e_8 && e_8.message.indexOf("JSON-RPC error.") != -1) {
817
- e_8 = JSON.parse(e_8.message.split("JSON-RPC error.")[1]);
821
+ e_9 = _b.sent();
822
+ if (e_9 && e_9.message.indexOf("JSON-RPC error.") != -1) {
823
+ e_9 = JSON.parse(e_9.message.split("JSON-RPC error.")[1]);
818
824
  }
819
- this.errorCallback((e_8 && e_8.message) || e_8);
825
+ this.errorCallback((e_9 && e_9.message) || e_9);
820
826
  return [2 /*return*/];
821
827
  case 9:
822
828
  console.log('sendEthTransaction swapParams', JSON.stringify(swapParams));
@@ -840,7 +846,7 @@ var Swap = /** @class */ (function () {
840
846
  };
841
847
  Swap.prototype.signEthTransactionByLedger = function (swapParams) {
842
848
  return __awaiter(this, void 0, void 0, function () {
843
- var account, myWallet, gasPrice, txParams, serializedTx, signature, signedTx, hash, e_9;
849
+ var account, myWallet, gasPrice, txParams, serializedTx, signature, signedTx, hash, e_10;
844
850
  var _a;
845
851
  return __generator(this, function (_b) {
846
852
  switch (_b.label) {
@@ -884,8 +890,8 @@ var Swap = /** @class */ (function () {
884
890
  this.transactionHashCallback(hash);
885
891
  return [3 /*break*/, 6];
886
892
  case 5:
887
- e_9 = _b.sent();
888
- this.errorCallback(e_9);
893
+ e_10 = _b.sent();
894
+ this.errorCallback(e_10);
889
895
  return [3 /*break*/, 6];
890
896
  case 6: return [2 /*return*/];
891
897
  }
@@ -924,7 +930,7 @@ var Swap = /** @class */ (function () {
924
930
  };
925
931
  Swap.prototype.sendTronTransaction = function () {
926
932
  return __awaiter(this, void 0, void 0, function () {
927
- var _a, inToken, outToken, inAmount, outAmount, minOutAmount, addresses, calldata, offsets, gasLimitsAndValues, abi, contract, _contract, swapParams, e_10;
933
+ var _a, inToken, outToken, inAmount, outAmount, minOutAmount, addresses, calldata, offsets, gasLimitsAndValues, abi, contract, _contract, swapParams, e_11;
928
934
  var _this = this;
929
935
  return __generator(this, function (_b) {
930
936
  switch (_b.label) {
@@ -1009,8 +1015,8 @@ var Swap = /** @class */ (function () {
1009
1015
  _b.sent();
1010
1016
  return [3 /*break*/, 5];
1011
1017
  case 4:
1012
- e_10 = _b.sent();
1013
- this.errorCallback(e_10 || e_10.message);
1018
+ e_11 = _b.sent();
1019
+ this.errorCallback(e_11 || e_11.message);
1014
1020
  return [3 /*break*/, 5];
1015
1021
  case 5: return [2 /*return*/];
1016
1022
  }
@@ -1019,7 +1025,7 @@ var Swap = /** @class */ (function () {
1019
1025
  };
1020
1026
  Swap.prototype.sendTerraTransaction = function () {
1021
1027
  return __awaiter(this, void 0, void 0, function () {
1022
- var data, address, gasPrices, msg, _a, fee, accountInfo, e_11;
1028
+ var data, address, gasPrices, msg, _a, fee, accountInfo, e_12;
1023
1029
  var _this = this;
1024
1030
  return __generator(this, function (_b) {
1025
1031
  switch (_b.label) {
@@ -1061,8 +1067,8 @@ var Swap = /** @class */ (function () {
1061
1067
  });
1062
1068
  return [3 /*break*/, 7];
1063
1069
  case 6:
1064
- e_11 = _b.sent();
1065
- this.errorCallback(e_11.message || e_11);
1070
+ e_12 = _b.sent();
1071
+ this.errorCallback(e_12.message || e_12);
1066
1072
  return [3 /*break*/, 7];
1067
1073
  case 7: return [2 /*return*/];
1068
1074
  }
@@ -1071,7 +1077,7 @@ var Swap = /** @class */ (function () {
1071
1077
  };
1072
1078
  Swap.prototype.approveOnt = function (transaction, _amount, inToken) {
1073
1079
  return __awaiter(this, void 0, void 0, function () {
1074
- var scriptHash, operation, gasLimit, args, params, result, e_12;
1080
+ var scriptHash, operation, gasLimit, args, params, result, e_13;
1075
1081
  return __generator(this, function (_a) {
1076
1082
  switch (_a.label) {
1077
1083
  case 0:
@@ -1104,10 +1110,10 @@ var Swap = /** @class */ (function () {
1104
1110
  this.sendOntTransactionSdk(transaction);
1105
1111
  return [3 /*break*/, 3];
1106
1112
  case 2:
1107
- e_12 = _a.sent();
1113
+ e_13 = _a.sent();
1108
1114
  // tslint:disable-next-line:no-console
1109
- console.log("onScCall error:", e_12);
1110
- this.errorCallback((e_12 && e_12.message) || e_12);
1115
+ console.log("onScCall error:", e_13);
1116
+ this.errorCallback((e_13 && e_13.message) || e_13);
1111
1117
  return [3 /*break*/, 3];
1112
1118
  case 3: return [2 /*return*/];
1113
1119
  }
@@ -1116,7 +1122,7 @@ var Swap = /** @class */ (function () {
1116
1122
  };
1117
1123
  Swap.prototype.sendOntTransactionSdk = function (transaction) {
1118
1124
  return __awaiter(this, void 0, void 0, function () {
1119
- var scriptHash, operation, gasLimit, args, params, result, e_13;
1125
+ var scriptHash, operation, gasLimit, args, params, result, e_14;
1120
1126
  return __generator(this, function (_a) {
1121
1127
  switch (_a.label) {
1122
1128
  case 0:
@@ -1147,8 +1153,8 @@ var Swap = /** @class */ (function () {
1147
1153
  }
1148
1154
  return [3 /*break*/, 3];
1149
1155
  case 2:
1150
- e_13 = _a.sent();
1151
- this.errorCallback((e_13 && e_13.message) || e_13);
1156
+ e_14 = _a.sent();
1157
+ this.errorCallback((e_14 && e_14.message) || e_14);
1152
1158
  return [3 /*break*/, 3];
1153
1159
  case 3: return [2 /*return*/];
1154
1160
  }
@@ -1157,7 +1163,7 @@ var Swap = /** @class */ (function () {
1157
1163
  };
1158
1164
  Swap.prototype.getTerraFee = function (address, msg, gasPrices) {
1159
1165
  return __awaiter(this, void 0, void 0, function () {
1160
- var terra, accountInfo, fee, e_14;
1166
+ var terra, accountInfo, fee, e_15;
1161
1167
  return __generator(this, function (_a) {
1162
1168
  switch (_a.label) {
1163
1169
  case 0:
@@ -1187,7 +1193,7 @@ var Swap = /** @class */ (function () {
1187
1193
  accountInfo: accountInfo,
1188
1194
  }];
1189
1195
  case 3:
1190
- e_14 = _a.sent();
1196
+ e_15 = _a.sent();
1191
1197
  return [2 /*return*/, null];
1192
1198
  case 4: return [2 /*return*/];
1193
1199
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@openocean.finance/openocean-sdk",
3
- "version": "1.7.65",
3
+ "version": "1.7.67",
4
4
  "description": "Openocean sdk",
5
5
  "main": "lib/index.js",
6
6
  "scripts": {
@@ -28,7 +28,7 @@
28
28
  "@looksrare/sdk": "^0.12.1",
29
29
  "@mysten/sui": "^1.17.0",
30
30
  "@ont-dev/ontology-dapi": "^0.7.3",
31
- "@openocean.finance/wallet": "^1.10.59",
31
+ "@openocean.finance/wallet": "^1.10.60",
32
32
  "@solana/web3.js": "^1.98.0",
33
33
  "@terra-money/terra.js": "^3.1.10",
34
34
  "@uniswap/v2-core": "^1.0.1",