@openocean.finance/openocean-sdk 1.4.7 → 1.4.9

package/lib/swapSdk/Swap.js

@@ -55,6 +55,7 @@ var ontology_dapi_1 = require("@ont-dev/ontology-dapi");
 var NotoMobile_1 = require("./NotoMobile");
 var web3_1 = __importDefault(require("web3"));
 var config_1 = require("./../config");
+var solanaTransactionSender_1 = require("./solanaTransactionSender");
 var axios_1 = __importDefault(require("axios"));
 // import bs58 from "bs58";
 var bs58 = require("bs58");
@@ -190,15 +191,16 @@ var Swap = /** @class */ (function () {
         });
     };
     Swap.prototype.sendSolanaTransaction = function () {
+        var _a, _b;
         return __awaiter(this, void 0, void 0, function () {
-            var res, transaction, signed, result, bytes, _a, msg, data, bytes, connection, txId, e_1;
-            return __generator(this, function (_b) {
-                switch (_b.label) {
+            var res, transaction, signed, result, bytes, _c, msg, data, bytes, serializedTransaction, transactionResponse, txId, e_1;
+            return __generator(this, function (_d) {
+                switch (_d.label) {
                     case 0:
                         res = this.res;
-                        _b.label = 1;
+                        _d.label = 1;
                     case 1:
-                        _b.trys.push([1, 9, , 10]);
+                        _d.trys.push([1, 12, , 13]);
                         transaction = '';
                         if (res.dexId == 6 || res.dexId == 7) {
                             transaction = web3_js_1.VersionedTransaction.deserialize(Buffer.from(res.transaction, 'hex'));
@@ -213,7 +215,7 @@ var Swap = /** @class */ (function () {
                                 params: [transaction],
                             })];
                     case 2:
-                        result = _b.sent();
+                        result = _d.sent();
                         console.log("Got signature, submitting transaction");
                         bytes = bs58.decode(result.signature);
                         transaction.signatures[0].signature = bytes;
@@ -224,7 +226,7 @@ var Swap = /** @class */ (function () {
                         if (!this.wallet.sdk.isSlopeWallet) return [3 /*break*/, 5];
                         return [4 /*yield*/, this.wallet.sdk.signTransaction(bs58.encode(transaction.serializeMessage ? transaction.serializeMessage() : transaction.message.serialize()))];
                     case 4:
-                        _a = _b.sent(), msg = _a.msg, data = _a.data;
+                        _c = _d.sent(), msg = _c.msg, data = _c.data;
                         if (msg !== "ok")
                             return [2 /*return*/];
                         bytes = bs58.decode(data.signature);
@@ -234,29 +236,52 @@ var Swap = /** @class */ (function () {
                         return [3 /*break*/, 7];
                     case 5: return [4 /*yield*/, this.wallet.sdk.signTransaction(transaction)];
                     case 6:
-                        signed = _b.sent();
-                        _b.label = 7;
+                        signed = _d.sent();
+                        _d.label = 7;
                     case 7:
-                        connection = new web3_js_1.Connection("https://solana-mainnet.rpc.grove.city/v1/77cfcdf5");
-                        return [4 /*yield*/, connection.sendRawTransaction(
-                            // let txId = await this.wallet.connection.sendRawTransaction(
-                            signed.serialize({
-                                verifySignatures: false,
-                                requireAllSignatures: false
-                            }), {
-                                skipPreflight: true,
-                                preflightCommitment: "confirmed",
+                        serializedTransaction = signed.serialize({
+                            verifySignatures: false,
+                            requireAllSignatures: false
+                        });
+                        if (!(res.dexId == 6)) return [3 /*break*/, 9];
+                        return [4 /*yield*/, (0, solanaTransactionSender_1.transactionSenderAndConfirmationWaiter)({
+                                connection: this.wallet.connection,
+                                // connection,
+                                serializedTransaction: serializedTransaction,
+                                blockhashWithExpiryBlockHeight: {
+                                    blockhash: transaction.message.recentBlockhash,
+                                    lastValidBlockHeight: res.lastValidBlockHeight,
+                                },
                             })];
                     case 8:
-                        txId = _b.sent();
+                        transactionResponse = _d.sent();
+                        if (transactionResponse && transactionResponse.response) {
+                            if ((_a = transactionResponse.response.meta) === null || _a === void 0 ? void 0 : _a.err) {
+                                this.errorCallback((_b = transactionResponse.response.meta) === null || _b === void 0 ? void 0 : _b.err);
+                            }
+                            else {
+                                this.transactionHashCallback(transactionResponse.txId);
+                            }
+                        }
+                        else {
+                            this.errorCallback('Transaction not confirmed.');
+                        }
+                        return [3 /*break*/, 11];
+                    case 9: return [4 /*yield*/, this.wallet.connection.sendRawTransaction(serializedTransaction, {
+                            skipPreflight: true,
+                            preflightCommitment: "confirmed",
+                        })];
+                    case 10:
+                        txId = _d.sent();
                         // this.receiptCallback(signature)
                         this.transactionHashCallback(txId);
-                        return [3 /*break*/, 10];
-                    case 9:
-                        e_1 = _b.sent();
+                        _d.label = 11;
+                    case 11: return [3 /*break*/, 13];
+                    case 12:
+                        e_1 = _d.sent();
                         this.errorCallback(e_1.message);
-                        return [3 /*break*/, 10];
-                    case 10: return [2 /*return*/];
+                        return [3 /*break*/, 13];
+                    case 13: return [2 /*return*/];
                 }
             });
         });

package/lib/swapSdk/solanaTransactionSender.d.ts

@@ -0,0 +1,9 @@
+/// <reference types="node" />
+import { BlockhashWithExpiryBlockHeight, Connection } from "@solana/web3.js";
+type TransactionSenderAndConfirmationWaiterArgs = {
+    connection: Connection;
+    serializedTransaction: Buffer;
+    blockhashWithExpiryBlockHeight: BlockhashWithExpiryBlockHeight;
+};
+export declare function transactionSenderAndConfirmationWaiter({ connection, serializedTransaction, blockhashWithExpiryBlockHeight, }: TransactionSenderAndConfirmationWaiterArgs): Promise<any>;
+export {};

package/lib/swapSdk/solanaTransactionSender.js

@@ -0,0 +1,182 @@
+"use strict";
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.transactionSenderAndConfirmationWaiter = void 0;
+var web3_js_1 = require("@solana/web3.js");
+var promise_retry_1 = __importDefault(require("promise-retry"));
+var wait = function (time) {
+    return new Promise(function (resolve) { return setTimeout(resolve, time); });
+};
+function transactionSenderAndConfirmationWaiter(_a) {
+    var connection = _a.connection, serializedTransaction = _a.serializedTransaction, blockhashWithExpiryBlockHeight = _a.blockhashWithExpiryBlockHeight;
+    return __awaiter(this, void 0, void 0, function () {
+        var txid, controller, abortSignal, abortableResender, lastValidBlockHeight, e_1, response;
+        var _this = this;
+        return __generator(this, function (_b) {
+            switch (_b.label) {
+                case 0: return [4 /*yield*/, connection.sendRawTransaction(serializedTransaction, {
+                        skipPreflight: true,
+                        preflightCommitment: "confirmed",
+                    })];
+                case 1:
+                    txid = _b.sent();
+                    console.log('txid', txid);
+                    controller = new AbortController();
+                    abortSignal = controller.signal;
+                    abortableResender = function () { return __awaiter(_this, void 0, void 0, function () {
+                        var e_2;
+                        return __generator(this, function (_a) {
+                            switch (_a.label) {
+                                case 0:
+                                    if (!true) return [3 /*break*/, 6];
+                                    return [4 /*yield*/, wait(2000)];
+                                case 1:
+                                    _a.sent();
+                                    if (abortSignal.aborted)
+                                        return [2 /*return*/];
+                                    _a.label = 2;
+                                case 2:
+                                    _a.trys.push([2, 4, , 5]);
+                                    return [4 /*yield*/, connection.sendRawTransaction(serializedTransaction, {
+                                            skipPreflight: true,
+                                            preflightCommitment: "confirmed",
+                                        })];
+                                case 3:
+                                    _a.sent();
+                                    console.log('Resender-------------');
+                                    return [3 /*break*/, 5];
+                                case 4:
+                                    e_2 = _a.sent();
+                                    console.warn("Failed to resend transaction: ".concat(e_2));
+                                    return [3 /*break*/, 5];
+                                case 5: return [3 /*break*/, 0];
+                                case 6: return [2 /*return*/];
+                            }
+                        });
+                    }); };
+                    _b.label = 2;
+                case 2:
+                    _b.trys.push([2, 4, 5, 6]);
+                    abortableResender();
+                    lastValidBlockHeight = blockhashWithExpiryBlockHeight.lastValidBlockHeight - 150;
+                    // this would throw TransactionExpiredBlockheightExceededError
+                    return [4 /*yield*/, Promise.race([
+                            connection.confirmTransaction(__assign(__assign({}, blockhashWithExpiryBlockHeight), { lastValidBlockHeight: lastValidBlockHeight, signature: txid, abortSignal: abortSignal }), "confirmed"),
+                            new Promise(function (resolve) { return __awaiter(_this, void 0, void 0, function () {
+                                var tx;
+                                var _a;
+                                return __generator(this, function (_b) {
+                                    switch (_b.label) {
+                                        case 0:
+                                            if (!!abortSignal.aborted) return [3 /*break*/, 3];
+                                            return [4 /*yield*/, wait(2000)];
+                                        case 1:
+                                            _b.sent();
+                                            return [4 /*yield*/, connection.getSignatureStatus(txid, {
+                                                    searchTransactionHistory: false,
+                                                })];
+                                        case 2:
+                                            tx = _b.sent();
+                                            if (((_a = tx === null || tx === void 0 ? void 0 : tx.value) === null || _a === void 0 ? void 0 : _a.confirmationStatus) === "confirmed") {
+                                                resolve(tx);
+                                            }
+                                            return [3 /*break*/, 0];
+                                        case 3: return [2 /*return*/];
+                                    }
+                                });
+                            }); }),
+                        ])];
+                case 3:
+                    // this would throw TransactionExpiredBlockheightExceededError
+                    _b.sent();
+                    return [3 /*break*/, 6];
+                case 4:
+                    e_1 = _b.sent();
+                    if (e_1 instanceof web3_js_1.TransactionExpiredBlockheightExceededError) {
+                        // we consume this error and getTransaction would return null
+                        return [2 /*return*/, null];
+                    }
+                    else {
+                        // invalid state from web3.js
+                        throw e_1;
+                    }
+                    return [3 /*break*/, 6];
+                case 5:
+                    controller.abort();
+                    return [7 /*endfinally*/];
+                case 6:
+                    response = (0, promise_retry_1.default)(function (retry) { return __awaiter(_this, void 0, void 0, function () {
+                        var response;
+                        return __generator(this, function (_a) {
+                            switch (_a.label) {
+                                case 0: return [4 /*yield*/, connection.getTransaction(txid, {
+                                        commitment: "confirmed",
+                                        maxSupportedTransactionVersion: 0,
+                                    })];
+                                case 1:
+                                    response = _a.sent();
+                                    if (!response) {
+                                        retry(response);
+                                    }
+                                    return [2 /*return*/, response];
+                            }
+                        });
+                    }); }, {
+                        retries: 5,
+                        minTimeout: 1e3,
+                    });
+                    return [2 /*return*/, { response: response, txid: txid }];
+            }
+        });
+    });
+}
+exports.transactionSenderAndConfirmationWaiter = transactionSenderAndConfirmationWaiter;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openocean.finance/openocean-sdk",
-  "version": "1.4.7",
+  "version": "1.4.9",
   "description": "Openocean sdk",
   "main": "lib/index.js",
   "scripts": {
@@ -26,6 +26,7 @@
   "devDependencies": {
     "@types/big.js": "^4.0.5",
     "@types/jest": "^27.4.1",
+    "@types/promise-retry": "^1.1.6",
     "assert": "^2.0.0",
     "babel-jest": "^27.5.1",
     "clean-webpack-plugin": "^4.0.0-alpha.0",
@@ -48,7 +49,7 @@
   "dependencies": {
     "@ethersproject/bignumber": "^5.1.1",
     "@looksrare/sdk": "^0.12.1",
-    "@openocean.finance/wallet": "^1.7.8",
+    "@openocean.finance/wallet": "^1.7.9",
     "@uniswap/v2-core": "^1.0.1",
     "@walletconnect/web3-provider": "^1.7.8",
     "aptos": "^1.3.17",
@@ -69,6 +70,7 @@
     "node-polyfill-webpack-plugin": "^1.1.4",
     "ontology-ts-sdk": "^1.1.16",
     "path-browserify": "^1.0.1",
+    "promise-retry": "^2.0.1",
     "prompts": "^2.4.1",
     "reflect-metadata": "^0.1.13",
     "tiny-invariant": "^1.3.1",