@openocean.finance/openocean-sdk 0.1.56 → 0.1.59

package/lib/api/index.js

@@ -19,11 +19,9 @@ var Api = /** @class */ (function () {
         if (baseUrl)
             this.baseUrl = baseUrl;
     }
-    // 获取nft contract 列表
     Api.prototype.collections = function (option) {
         return (0, ajx_1.get)("".concat(this.baseUrlNft, "/").concat(option.chain, "/").concat(option.market, "/collections"), option, RequestVo_1.CollectionsVo);
     };
-    // 获取nft contract 列表
     Api.prototype.assets = function (option) {
         return (0, ajx_1.get)("".concat(this.baseUrlNft, "/").concat(option.chain, "/").concat(option.market, "/assets"), option, RequestVo_1.AssetsVo);
     };
@@ -36,7 +34,6 @@ var Api = /** @class */ (function () {
     Api.prototype.sign = function (option) {
         return (0, ajx_1.post)("".concat(this.baseUrlNft, "/").concat(option.chain, "/").concat(option.market, "/sign"), option, RequestVo_1.NftSignVo);
     };
-    // nft---------------------end----
     Api.prototype.quote = function (option) {
         return (0, ajx_1.get)("".concat(this.baseUrl, "/").concat(option.chain, "/quote"), option, RequestVo_1.ReqQuoteVo);
     };

package/lib/config/Chains.js

@@ -50,6 +50,10 @@ var chainObj = {
         compiler: 'SOL',
         chainName: "Solana Mainnet", blockExplorerUrl: "https://solscan.io/tx/", popularToken: ["SOL", "SNY", "USDT", "USDC", "RAY", "STEP"], rpcUrls: null
     },
+    "flow": {
+        compiler: 'FLOW',
+        chainName: "Flow Mainnet", blockExplorerUrl: "https://flowscan.org/transaction/", popularToken: ["SOL", "SNY", "USDT", "USDC", "RAY", "STEP"], rpcUrls: null
+    },
     "polygon": {
         compiler: 'EVM',
         chainName: "Polygon Mainnet", chainId: 137, blockExplorerUrl: "https://polygonscan.com/tx/", popularToken: ["USDT", "USDC", "MATIC", "AAVE", "DINO", "ADDY", "MIMATIC"], nativeCurrency: { name: "MATIC", symbol: "matic", decimals: 18, address: "0x0000000000000000000000000000000000001010" }, rpcUrls: ["https://rpc-mainnet.maticvigil.com"]

package/lib/config/Wallets.d.ts

@@ -25,7 +25,8 @@ export declare enum WalletNames {
     'XDEFIWallet' = 23,
     'MetaXWallet' = 24,
     'SlopeWallet' = 25,
-    'KeplrWallet' = 26
+    'KeplrWallet' = 26,
+    'BloctoWallet' = 27
 }
 export declare class Wallets {
     walletObj: any;

package/lib/config/Wallets.js

@@ -31,6 +31,7 @@ var WalletNames;
     WalletNames[WalletNames["MetaXWallet"] = 24] = "MetaXWallet";
     WalletNames[WalletNames["SlopeWallet"] = 25] = "SlopeWallet";
     WalletNames[WalletNames["KeplrWallet"] = 26] = "KeplrWallet";
+    WalletNames[WalletNames["BloctoWallet"] = 27] = "BloctoWallet";
 })(WalletNames = exports.WalletNames || (exports.WalletNames = {}));
 var WalletObj = {
     MetaMask: new wallet_1.MetaMask(),
@@ -60,6 +61,7 @@ var WalletObj = {
     GnosisSafeWallet: new wallet_1.GnosisSafeWallet(),
     SlopeWallet: new wallet_1.SlopeWallet(),
     KeplrWallet: new wallet_1.KeplrWallet(),
+    BloctoWallet: new wallet_1.BloctoWallet()
 };
 var Wallets = /** @class */ (function () {
     function Wallets() {

package/lib/index.js

@@ -18,3 +18,4 @@ var OpenoceanSdk = /** @class */ (function () {
     return OpenoceanSdk;
 }());
 exports.OpenoceanSdk = OpenoceanSdk;
+console.log('--------0.1.57------');

package/lib/swapSdk/Approve.js

@@ -135,44 +135,34 @@ var Approve = /** @class */ (function () {
                     case 11:
                         json = {
                             from: address,
-                            // gas: gasAmount
                         };
                         if (reqApproveVo.gasPrice) {
                             json.gasPrice = reqApproveVo.gasPrice;
                         }
-                        console.log('准备授权');
                         try {
                             this.contract.methods.approve(this.contractAddress, this.amount)
                                 .send(json, function (err, data) {
                                 if (err) {
-                                    console.log('回调1error');
                                 }
                                 else {
-                                    console.log('data1----');
                                 }
                             })
                                 .on('error', function (error) {
-                                console.log('回调2error');
                                 _this.errorCallback(error);
                             })
                                 .on('transactionHash', function (transactionHash) {
-                                console.log('hash----');
                                 _this.transactionHashCallback(transactionHash);
                             })
                                 .on('receipt', function (receipt) {
-                                console.log('receipt1----');
                                 _this.receiptCallback(receipt);
                                 _this.getSuccess();
                             })
                                 .then(function (receipt) {
-                                console.log('receipt2----');
                             })
                                 .catch(function (err) {
-                                console.log('catch----' + err);
                             });
                         }
                         catch (error) {
-                            console.log('catch-error----');
                             this.errorCallback(error);
                         }
                         _b.label = 12;
@@ -183,7 +173,6 @@ var Approve = /** @class */ (function () {
     };
     Approve.prototype.on = function (events, callback) {
         if (events === 'error') {
-            // alert('成功绑定回调方法')
             this.errorCallback = callback;
         }
         else if (events === 'transactionHash') {
@@ -206,8 +195,6 @@ var Approve = /** @class */ (function () {
                     case 0: return [4 /*yield*/, this.contract.methods.allowance(this.account, this.contractAddress).call()];
                     case 1:
                         balance = _a.sent();
-                        // const decimals = await this.contract.methods.decimals().call()
-                        // Number(formatUnits(balance, decimals))
                         this.key++;
                         if (this.key > 20)
                             return [2 /*return*/];

package/lib/swapSdk/ConnectWallet.js

@@ -61,12 +61,10 @@ var ConnectWallet = /** @class */ (function () {
                         wallet.chainId = chainId;
                         return [2 /*return*/, true];
                     case 2:
-                        if (!(key < 10)) return [3 /*break*/, 4];
+                        if (!(key < 3)) return [3 /*break*/, 4];
                         return [4 /*yield*/, this.isChainIdEq(wallet, chainId, utilsEht, key + 1)];
-                    case 3: 
-                    // console.log('获取chainId是否改变')
-                    return [2 /*return*/, _a.sent()];
-                    case 4: throw new Error('Link error.');
+                    case 3: return [2 /*return*/, _a.sent()];
+                    case 4: throw new Error('User rejected the request.');
                 }
             });
         });
@@ -90,9 +88,7 @@ var ConnectWallet = /** @class */ (function () {
                         _c.trys.push([1, 23, , 27]);
                         if (!(wallet.type === 'WalletConnect')) return [3 /*break*/, 3];
                         wallet.infuraId = '2c7c4d86c2c746c89de722551b606119';
-                        return [4 /*yield*/, wallet.requestConnect(chainId)
-                            // this.connect(wallet);
-                        ];
+                        return [4 /*yield*/, wallet.requestConnect(chainId)];
                     case 2:
                         _c.sent();
                         return [3 /*break*/, 22];

package/lib/swapSdk/NotoMobile.js

@@ -25,10 +25,6 @@ var NotoMobile = /** @class */ (function () {
                 _this.close('success', action, account);
                 _this.cancel();
             }
-            // else if (state === '1') {
-            //   this.close('error', action, account)
-            //   this.cancel()
-            // } 
             else {
                 _this.time++;
                 if (_this.time > 120) {
@@ -75,10 +71,8 @@ var NotoMobile = /** @class */ (function () {
     };
     NotoMobile.prototype.show = function () {
         var _this = this;
-        // 获取整个页面的宽和高
         var page_width = document.documentElement.scrollWidth;
         var page_height = document.documentElement.scrollHeight;
-        // 获取浏览器的宽和高
         var b_width = document.documentElement.clientWidth;
         var b_height = document.documentElement.clientHeight;
         this.mask = document.createElement("div");

package/lib/swapSdk/Swap.js

@@ -44,7 +44,6 @@ var Chains_1 = require("../config/Chains");
 var web3_js_1 = require("@solana/web3.js");
 var terra_js_1 = require("@terra-money/terra.js");
 var ontology_ts_sdk_1 = require("ontology-ts-sdk");
-// import { jupiterDex } from "./jupiterDex";
 var ontology_dapi_1 = require("@ont-dev/ontology-dapi");
 var NotoMobile_1 = require("./NotoMobile");
 var axios = require('axios');
@@ -60,10 +59,6 @@ var Swap = /** @class */ (function () {
         this.res = res;
         this.wallet = wallet;
         this.chain = chain;
-        // this.isNew = isNew || false
-        // if (!isNew && chains.getIsNewChain().indexOf(chain.key) !== -1) {
-        //   this.isNew = true
-        // }
     }
     Swap.prototype.send = function () {
         var _this = this;
@@ -183,7 +178,6 @@ var Swap = /** @class */ (function () {
                             transaction.recentBlockhash = recentBlock_1.blockhash;
                             return transaction;
                         });
-                        console.log('总共（sendRawTransaction）次数：' + list.length + '----------');
                         return [4 /*yield*/, this.wallet.sdk.signAllTransactions(transactions)];
                     case 3: return [4 /*yield*/, _c.sent()];
                     case 4:
@@ -195,18 +189,15 @@ var Swap = /** @class */ (function () {
                         if (!(_i < transactions_1.length)) return [3 /*break*/, 10];
                         transaction_1 = transactions_1[_i];
                         i++;
-                        console.log(i + '----------');
                         return [4 /*yield*/, this.wallet.connection.sendRawTransaction(transaction_1.serialize({ requireAllSignatures: false }))];
                     case 6:
                         txid = _c.sent();
-                        console.log("https://solscan.io/tx/".concat(txid));
                         if (!(i < list.length)) return [3 /*break*/, 8];
                         return [4 /*yield*/, this.wallet.connection.confirmTransaction(txid)];
                     case 7:
                         _c.sent();
                         return [3 /*break*/, 9];
                     case 8:
-                        console.log('完成交易----------');
                         this.transactionHashCallback(txid);
                         _c.label = 9;
                     case 9:
@@ -424,7 +415,7 @@ var Swap = /** @class */ (function () {
                                 swapParams.maxPriorityFeePerGas = +maxPriorityFeePerGas;
                             }
                         }
-                        else {
+                        else if (gasPrice) {
                             swapParams.gasPrice = +gasPrice;
                         }
                         this.wallet.sdk.eth.sendTransaction(swapParams)

package/lib/swapSdk/getBalance.js

@@ -201,7 +201,6 @@ function getBalance(account, tokenAddressOrSymbol, decimals, chainName, myWallet
                     contract = new myWallet.sdk.eth.Contract(config_1.ERC20_abi, tokenAddressOrSymbol);
                     return [4 /*yield*/, contract.methods.balanceOf(account).call()];
                 case 28:
-                    // 查看某个账号的代币余额
                     balance = _c.sent();
                     return [3 /*break*/, 30];
                 case 29:

package/lib/swapSdk/index.js

@@ -81,10 +81,6 @@ var SwapSdk = /** @class */ (function () {
         }, 200);
         return swap;
     };
-    // public swapLocal(swapData: any) {
-    //   let swap = new Swap(swapData, this.wallet, this.chain, true)
-    //   return swap.send()
-    // }
     SwapSdk.prototype.fastSwap = function (swapData) {
         var _this = this;
         return new Promise(function (resolve, reject) {
@@ -93,13 +89,6 @@ var SwapSdk = /** @class */ (function () {
                 .on('error', reject);
         });
     };
-    // public fastSwapLocal(swapData: any) {
-    //   return new Promise((resolve, reject) => {
-    //     this.swapLocal(swapData)
-    //       .on('transactionHash', resolve)
-    //       .on('error', reject);
-    //   })
-    // }
     SwapSdk.prototype.getGas = function (swapData) {
         var swap = new Swap_1.Swap(swapData, this.wallet, this.chain);
         return swap.getGas();

package/lib/utils/index.js

@@ -57,7 +57,6 @@ var Utils = /** @class */ (function () {
         }
         return new bignumber_js_1.default(numStr).decimalPlaces(fixed).toString();
     };
-    // 保留有效小数，位数不够加0，z为boolean，默认0去掉
     Utils.prototype.toFixed = function (n, k, z) {
         if (isNaN(n)) {
             return 0;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openocean.finance/openocean-sdk",
-  "version": "0.1.56",
+  "version": "0.1.59",
   "description": "Openocean sdk",
   "main": "lib/index.js",
   "scripts": {
@@ -46,7 +46,7 @@
   },
   "dependencies": {
     "@jup-ag/core": "^1.0.0-beta.27",
-    "@openocean.finance/wallet": "^0.4.26",
+    "@openocean.finance/wallet": "^0.4.27",
     "@solana/buffer-layout": "^4.0.0",
     "@walletconnect/web3-provider": "^1.7.8",
     "bs58": "^4.0.1",

package/lib/swapSdk/jupiterDex.d.ts

@@ -1 +0,0 @@
-export declare const jupiterDex: (collection: any, customPublicKey: any, res: any) => Promise<any>;

package/lib/swapSdk/jupiterDex.js

@@ -1,97 +0,0 @@
-"use strict";
-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 (_) 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 };
-    }
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.jupiterDex = void 0;
-var web3_js_1 = require("@solana/web3.js");
-var core_1 = require("@jup-ag/core");
-// index.ts
-var jupiterDex = function (collection, customPublicKey, res) { return __awaiter(void 0, void 0, void 0, function () {
-    var jupiter, routes, bestRoute, execute, swapResult;
-    return __generator(this, function (_a) {
-        switch (_a.label) {
-            case 0:
-                debugger;
-                console.log(res);
-                console.log('准备交易-----------------');
-                console.log(collection);
-                console.log(customPublicKey);
-                return [4 /*yield*/, core_1.Jupiter.load({
-                        connection: collection,
-                        cluster: 'mainnet-beta',
-                        user: customPublicKey, // or public key
-                    })];
-            case 1:
-                jupiter = _a.sent();
-                console.log('jupiter-----------------');
-                console.log(jupiter);
-                debugger;
-                return [4 /*yield*/, jupiter.computeRoutes({
-                        inputMint: new web3_js_1.PublicKey(res.inToken.address),
-                        outputMint: new web3_js_1.PublicKey(res.outToken.address),
-                        inputAmount: res.inAmount,
-                        slippage: 3 // 1 = 1%
-                    })];
-            case 2:
-                routes = _a.sent();
-                console.log('路由-----------------');
-                console.log(routes);
-                debugger;
-                bestRoute = routes.routesInfos[0];
-                return [4 /*yield*/, jupiter.exchange({
-                        routeInfo: bestRoute
-                    })];
-            case 3:
-                execute = (_a.sent()).execute;
-                debugger;
-                return [4 /*yield*/, execute()];
-            case 4:
-                swapResult = _a.sent();
-                console.log('交易-----------------');
-                console.log(swapResult);
-                debugger;
-                if (swapResult.error) {
-                    throw new Error(swapResult.error);
-                }
-                else {
-                    return [2 /*return*/, swapResult.txid];
-                }
-                return [2 /*return*/];
-        }
-    });
-}); };
-exports.jupiterDex = jupiterDex;