@openocean.finance/openocean-sdk 1.2.80 → 1.2.82
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/swapSdk/Swap.js +24 -12
- package/package.json +2 -2
package/lib/swapSdk/Swap.js
CHANGED
|
@@ -321,11 +321,11 @@ var Swap = /** @class */ (function () {
|
|
|
321
321
|
};
|
|
322
322
|
Swap.prototype.sendAptosTransaction = function () {
|
|
323
323
|
return __awaiter(this, void 0, void 0, function () {
|
|
324
|
-
var data, transaction, hash, _a, result, hash, pendingTransaction, client_1, txn, hash, error_1;
|
|
324
|
+
var data, transaction, hash, _a, result, hash, rawTransaction, txHash, pendingTransaction, client_1, txn, hash, error_1;
|
|
325
325
|
return __generator(this, function (_b) {
|
|
326
326
|
switch (_b.label) {
|
|
327
327
|
case 0:
|
|
328
|
-
_b.trys.push([0,
|
|
328
|
+
_b.trys.push([0, 12, , 13]);
|
|
329
329
|
data = this.res.data;
|
|
330
330
|
console.log("sendAptosTransaction", data, this.wallet.key);
|
|
331
331
|
if (!(this.wallet.key === "MartianWallet")) return [3 /*break*/, 3];
|
|
@@ -336,7 +336,7 @@ var Swap = /** @class */ (function () {
|
|
|
336
336
|
case 2:
|
|
337
337
|
hash = _b.sent();
|
|
338
338
|
this.transactionHashCallback(hash);
|
|
339
|
-
return [3 /*break*/,
|
|
339
|
+
return [3 /*break*/, 11];
|
|
340
340
|
case 3:
|
|
341
341
|
if (!(this.wallet.key === "PontemWallet")) return [3 /*break*/, 5];
|
|
342
342
|
return [4 /*yield*/, this.wallet.sdk.signAndSubmit(data)];
|
|
@@ -345,25 +345,36 @@ var Swap = /** @class */ (function () {
|
|
|
345
345
|
hash = result.hash;
|
|
346
346
|
console.log("sendAptosTransaction PontemWallet", hash);
|
|
347
347
|
this.transactionHashCallback(hash);
|
|
348
|
-
return [3 /*break*/,
|
|
349
|
-
case 5:
|
|
348
|
+
return [3 /*break*/, 11];
|
|
349
|
+
case 5:
|
|
350
|
+
if (!(this.wallet.key === "Fewcha")) return [3 /*break*/, 8];
|
|
351
|
+
return [4 /*yield*/, this.wallet.sdk.aptos.generateTransaction(data)];
|
|
350
352
|
case 6:
|
|
353
|
+
rawTransaction = (_b.sent()).data;
|
|
354
|
+
return [4 /*yield*/, this.wallet.sdk.aptos.signAndSubmitTransaction(rawTransaction)];
|
|
355
|
+
case 7:
|
|
356
|
+
txHash = (_b.sent()).txHash;
|
|
357
|
+
console.log("sendAptosTransaction Fewcha", txHash);
|
|
358
|
+
this.transactionHashCallback(txHash);
|
|
359
|
+
return [3 /*break*/, 11];
|
|
360
|
+
case 8: return [4 /*yield*/, this.wallet.sdk.signAndSubmitTransaction(data)];
|
|
361
|
+
case 9:
|
|
351
362
|
pendingTransaction = _b.sent();
|
|
352
363
|
client_1 = new aptos_1.AptosClient("https://fullnode.mainnet.aptoslabs.com/v1");
|
|
353
364
|
return [4 /*yield*/, client_1.waitForTransactionWithResult(pendingTransaction.hash)];
|
|
354
|
-
case
|
|
365
|
+
case 10:
|
|
355
366
|
txn = _b.sent();
|
|
356
367
|
console.log("sendAptosTransaction", txn);
|
|
357
368
|
hash = txn.hash;
|
|
358
369
|
this.transactionHashCallback(hash);
|
|
359
|
-
_b.label =
|
|
360
|
-
case
|
|
361
|
-
case
|
|
370
|
+
_b.label = 11;
|
|
371
|
+
case 11: return [3 /*break*/, 13];
|
|
372
|
+
case 12:
|
|
362
373
|
error_1 = _b.sent();
|
|
363
374
|
// see "Errors"
|
|
364
375
|
this.errorCallback(error_1);
|
|
365
|
-
return [3 /*break*/,
|
|
366
|
-
case
|
|
376
|
+
return [3 /*break*/, 13];
|
|
377
|
+
case 13: return [2 /*return*/];
|
|
367
378
|
}
|
|
368
379
|
});
|
|
369
380
|
});
|
|
@@ -441,7 +452,8 @@ var Swap = /** @class */ (function () {
|
|
|
441
452
|
case 5: return [3 /*break*/, 8];
|
|
442
453
|
case 6:
|
|
443
454
|
if (!(wallet_2.key === "MeteorWallet" || wallet_2.key === "SenderWallet")) return [3 /*break*/, 8];
|
|
444
|
-
return [4 /*yield*/, wallet_2.sdk.signAndSendTransactions({
|
|
455
|
+
return [4 /*yield*/, wallet_2.sdk.signAndSendTransactions({
|
|
456
|
+
transactions: transactions.map(function (t, i) {
|
|
445
457
|
return {
|
|
446
458
|
receiverId: t.receiverId,
|
|
447
459
|
nonceOffset: i + 1,
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@openocean.finance/openocean-sdk",
|
|
3
|
-
"version": "1.2.
|
|
3
|
+
"version": "1.2.82",
|
|
4
4
|
"description": "Openocean sdk",
|
|
5
5
|
"main": "lib/index.js",
|
|
6
6
|
"scripts": {
|
|
@@ -48,7 +48,7 @@
|
|
|
48
48
|
"dependencies": {
|
|
49
49
|
"@ethersproject/bignumber": "^5.1.1",
|
|
50
50
|
"@looksrare/sdk": "^0.12.1",
|
|
51
|
-
"@openocean.finance/wallet": "^1.5.
|
|
51
|
+
"@openocean.finance/wallet": "^1.5.50",
|
|
52
52
|
"@solana/web3.js": "1.31.0",
|
|
53
53
|
"@uniswap/v2-core": "^1.0.1",
|
|
54
54
|
"@walletconnect/web3-provider": "^1.7.8",
|