@openocean.finance/wallet 0.4.30 → 0.4.31

package/lib/Wallets/BloctoWallet.d.ts

@@ -1,15 +1,30 @@
 import { EnumChains, EnumWalletName, EnumWalletType } from "../types";
 import BaseWallet from "./BaseWallet";
+import Web3 from "web3";
 declare class BloctoWallet extends BaseWallet {
     name: EnumWalletName;
     icon: any;
     supportChains: EnumChains[];
     type: EnumWalletType;
-    sdk: any;
+    sdk: Web3 | null;
     /**
      * connect metamask and get wallet address
      * @param chainId specific chainId,throw error when not match
      */
     requestConnect(chainId?: number): Promise<string>;
+    /**
+     * connect metamask and get wallet address
+     */
+    requestTronConnect(): Promise<string>;
+    /**
+     * connect metamask and get wallet address
+     * @param chainId specific chainId,throw error when not match
+     */
+    requestSolanaConnect(chainId?: number): Promise<string>;
+    /**
+     * connect metamask and get wallet address
+     * @param chainId specific chainId,throw error when not match
+     */
+    requestFlowConnect(chainId?: number): Promise<string>;
 }
 export default BloctoWallet;

package/lib/Wallets/BloctoWallet.js

@@ -87,6 +87,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 var blocto_svg_1 = __importDefault(require("../assets/blocto.svg"));
 var types_1 = require("../types");
 var BaseWallet_1 = __importDefault(require("./BaseWallet"));
+var web3_1 = __importDefault(require("web3"));
 var fcl = __importStar(require("@onflow/fcl"));
 var BloctoWallet = /** @class */ (function (_super) {
     __extends(BloctoWallet, _super);
@@ -94,8 +95,15 @@ var BloctoWallet = /** @class */ (function (_super) {
         var _this = _super !== null && _super.apply(this, arguments) || this;
         _this.name = types_1.EnumWalletName.BloctoWallet;
         _this.icon = blocto_svg_1.default;
-        _this.supportChains = [types_1.EnumChains.Flow];
-        _this.type = types_1.EnumWalletType.Extension;
+        _this.supportChains = [
+            types_1.EnumChains.ETH,
+            types_1.EnumChains.BSC,
+            types_1.EnumChains.Polygon,
+            types_1.EnumChains.Avalanche,
+            // EnumChains.TRON,
+            types_1.EnumChains.Solana
+        ];
+        _this.type = types_1.EnumWalletType.Mobile;
         _this.sdk = null;
         return _this;
     }
@@ -104,6 +112,96 @@ var BloctoWallet = /** @class */ (function (_super) {
      * @param chainId specific chainId,throw error when not match
      */
     BloctoWallet.prototype.requestConnect = function (chainId) {
+        return __awaiter(this, void 0, void 0, function () {
+            var address, currentChainId;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        if (!(navigator.userAgent.match(/(phone|pad|pod|iPhone|iPod|ios|iPad|Android|Mobile|BlackBerry|IEMobile|MQQBrowser|JUC|Fennec|wOSBrowser|BrowserNG|WebOS|Symbian|Windows Phone)/i))) {
+                            throw new Error(types_1.EnumErrors.NoBlocto);
+                        }
+                        if (!((window.ethereum && window.ethereum.isBlocto) || (web3_1.default && web3_1.default.givenProvider))) {
+                            throw new Error(types_1.EnumErrors.NoBlocto);
+                        }
+                        this.sdk = new web3_1.default(window.ethereum || web3_1.default.givenProvider);
+                        return [4 /*yield*/, this.sdk.eth.requestAccounts()];
+                    case 1:
+                        address = (_a.sent())[0];
+                        return [4 /*yield*/, this.sdk.eth.getChainId()];
+                    case 2:
+                        currentChainId = _a.sent();
+                        if (chainId && currentChainId !== chainId) {
+                            throw new Error(types_1.EnumErrors.ChainIdNotMath);
+                        }
+                        this.address = address;
+                        this.chainId = currentChainId;
+                        return [2 /*return*/, address];
+                }
+            });
+        });
+    };
+    /**
+     * connect metamask and get wallet address
+     */
+    BloctoWallet.prototype.requestTronConnect = function () {
+        return __awaiter(this, void 0, void 0, function () {
+            var _this = this;
+            return __generator(this, function (_a) {
+                return [2 /*return*/, new Promise(function (res) {
+                        if (!window.tron) {
+                            throw new Error(types_1.EnumErrors.NoBlocto);
+                        }
+                        var account = window.tron.defaultAddress.base58;
+                        if (!account) {
+                            setTimeout(function () {
+                                account = window.tron.defaultAddress.base58;
+                                if (!account) {
+                                    throw new Error(types_1.EnumErrors.NoBloctoAccount);
+                                }
+                                else {
+                                    _this.sdk = window.tron;
+                                    _this.address = account;
+                                    _this.chainId = ''; // todo tron chainId
+                                    res(account);
+                                }
+                            }, 1000);
+                        }
+                        else {
+                            _this.sdk = window.tron;
+                            _this.address = account;
+                            _this.chainId = ''; // todo tron chainId
+                            res(account);
+                        }
+                    })];
+            });
+        });
+    };
+    /**
+     * connect metamask and get wallet address
+     * @param chainId specific chainId,throw error when not match
+     */
+    BloctoWallet.prototype.requestSolanaConnect = function (chainId) {
+        var _this = this;
+        return new Promise(function (res) {
+            if (!((window.solana && window.solana.isBlocto) || (window.parent && window.parent.solana))) {
+                throw new Error(types_1.EnumErrors.NoPhantom);
+            }
+            var wallet = window.parent && window.parent.solana ? window.parent.solana : window.solana;
+            _this.sdk = wallet;
+            wallet.on('connect', function (publicKey) {
+                var address = wallet.publicKey.toString();
+                _this.address = address;
+                _this.chainId = ''; // todo sollet chainId
+                res(address);
+            });
+            wallet.connect();
+        });
+    };
+    /**
+     * connect metamask and get wallet address
+     * @param chainId specific chainId,throw error when not match
+     */
+    BloctoWallet.prototype.requestFlowConnect = function (chainId) {
         return __awaiter(this, void 0, void 0, function () {
             var _this = this;
             return __generator(this, function (_a) {

package/lib/Wallets/BscWallet.js

@@ -90,15 +90,10 @@ var BscWallet = /** @class */ (function (_super) {
                             // go2 download page
                             throw new Error(types_1.EnumErrors.NotBinance);
                         }
-                        console.log('BinanceChain-1');
-                        console.log(window.BinanceChain);
                         this.sdk = new web3_1.default(window.BinanceChain);
-                        console.log('BinanceChain-2');
-                        console.log(this.sdk);
                         return [4 /*yield*/, this.sdk.eth.requestAccounts()];
                     case 1:
                         account = (_a.sent())[0];
-                        console.log('BinanceChain-3');
                         return [4 /*yield*/, this.sdk.eth.getChainId()];
                     case 2:
                         currentChainId = _a.sent();

package/lib/Wallets/ImTokenWallet.js

@@ -72,7 +72,7 @@ var ImTokenWallet = /** @class */ (function (_super) {
         _this.name = types_1.EnumWalletName.ImTokenWallet;
         _this.icon = imtoken_svg_1.default;
         _this.supportChains = [types_1.EnumChains.ETH, types_1.EnumChains.BSC, types_1.EnumChains.Polygon, types_1.EnumChains.OKEX, types_1.EnumChains.XDai, types_1.EnumChains.HECO, types_1.EnumChains.Fantom, types_1.EnumChains.Avalanche];
-        _this.type = types_1.EnumWalletType.Extension;
+        _this.type = types_1.EnumWalletType.Mobile;
         _this.sdk = null;
         return _this;
     }
@@ -86,8 +86,8 @@ var ImTokenWallet = /** @class */ (function (_super) {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        if (!(window.ethereum && window.ethereum.isMetaMask)) {
-                            throw new Error(types_1.EnumErrors.NotMetamask);
+                        if (!window.ethereum) {
+                            throw new Error(types_1.EnumErrors.NoImToken);
                         }
                         this.sdk = new web3_1.default(window.ethereum);
                         return [4 /*yield*/, this.sdk.eth.requestAccounts()];

package/lib/Wallets/OntoMobile.js

@@ -86,8 +86,8 @@ var OntoMobile = /** @class */ (function (_super) {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        if (!(window.ethereum && window.ethereum.isMetaMask)) {
-                            throw new Error(types_1.EnumErrors.NotMetamask);
+                        if (!(window.ethereum && window.ethereum.isONTO)) {
+                            throw new Error(types_1.EnumErrors.NoOnto);
                         }
                         this.sdk = new web3_1.default(window.ethereum);
                         return [4 /*yield*/, this.sdk.eth.getChainId()];

package/lib/Wallets/SolflareWallet.js

@@ -84,9 +84,9 @@ var SolflareWallet = /** @class */ (function (_super) {
             var _this = this;
             return __generator(this, function (_a) {
                 return [2 /*return*/, new Promise(function (res) {
-                        // if (!(window.solflare && window.solflare.isSolflare)) {
-                        //   throw new Error(EnumErrors.NoPhantom);
-                        // }
+                        if (!(window.solflare && window.solflare.isSolflare)) {
+                            throw new Error(types_1.EnumErrors.NoSolflare);
+                        }
                         var wallet = window.parent && window.parent.solflare ? window.parent.solflare : window.solflare;
                         // const wallet = window.solflare;
                         _this.sdk = wallet;

package/lib/Wallets/TokenPocket.js

@@ -86,8 +86,8 @@ var TokenPocket = /** @class */ (function (_super) {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        if (!(window.ethereum && window.ethereum.isMetaMask)) {
-                            throw new Error(types_1.EnumErrors.NotMetamask);
+                        if (!(window.ethereum && window.ethereum.isTokenPocket)) {
+                            throw new Error(types_1.EnumErrors.NoTokenPocket);
                         }
                         this.sdk = new web3_1.default(window.ethereum);
                         return [4 /*yield*/, this.sdk.eth.requestAccounts()];

package/lib/Wallets/TronLink.d.ts

@@ -10,6 +10,6 @@ declare class TronLink extends BaseWallet {
     /**
      * connect metamask and get wallet address
      */
-    requestConnect(): Promise<any>;
+    requestTronConnect(): Promise<string>;
 }
 export default TronLink;

package/lib/Wallets/TronLink.js

@@ -78,21 +78,36 @@ var TronLink = /** @class */ (function (_super) {
     /**
      * connect metamask and get wallet address
      */
-    TronLink.prototype.requestConnect = function () {
+    TronLink.prototype.requestTronConnect = function () {
         return __awaiter(this, void 0, void 0, function () {
-            var account;
+            var _this = this;
             return __generator(this, function (_a) {
-                if (!window.tronWeb) {
-                    throw new Error(types_1.EnumErrors.NoTronLink);
-                }
-                account = window.tronWeb.defaultAddress.base58;
-                if (!account) {
-                    throw new Error(types_1.EnumErrors.NoTronLinkAccount);
-                }
-                this.sdk = window.tronWeb;
-                this.address = account;
-                this.chainId = ''; // todo tron chainId
-                return [2 /*return*/, account];
+                return [2 /*return*/, new Promise(function (res) {
+                        if (!window.tronWeb) {
+                            throw new Error(types_1.EnumErrors.NoTronLink);
+                        }
+                        var account = window.tronWeb.defaultAddress.base58;
+                        if (!account) {
+                            setTimeout(function () {
+                                account = window.tronWeb.defaultAddress.base58;
+                                if (!account) {
+                                    throw new Error(types_1.EnumErrors.NoTronLinkAccount);
+                                }
+                                else {
+                                    _this.sdk = window.tronWeb;
+                                    _this.address = account;
+                                    _this.chainId = ''; // todo tron chainId
+                                    res(account);
+                                }
+                            }, 1000);
+                        }
+                        else {
+                            _this.sdk = window.tronWeb;
+                            _this.address = account;
+                            _this.chainId = ''; // todo tron chainId
+                            res(account);
+                        }
+                    })];
             });
         });
     };

package/lib/index.d.ts

@@ -4,7 +4,6 @@
  * @date 2021/4/20
  * @desc
  */
-import WalletManager from "./WalletManager";
 import MetaMask from "./Wallets/MetaMask";
 import BscWallet from "./Wallets/BscWallet";
 import Cyano from "./Wallets/Cyano";
@@ -37,5 +36,4 @@ import BitKeepWallet from './Wallets/BitKeepWallet';
 import GnosisSafeWallet from './Wallets/GnosisSafeWallet';
 import BloctoWallet from './Wallets/BloctoWallet';
 import { EnumChains } from "./types";
-export default WalletManager;
-export { WalletManager, MetaMask, BscWallet, Cyano, TronLink, EnumChains, Sollet, SolletIo, OntoMobile, WalletConnect, MathWallet, OntoWallet, SafePalWallet, ImTokenWallet, TokenPocket, TrustWallet, Coin98, Phantom, OKExWallet, TerraStation, CoinbaseWallet, CloverWallet, XDEFIWallet, SlopeWallet, SolflareWallet, MetaXWallet, KeplrWallet, BraveWallet, CryptoCom, NearWallet, BitKeepWallet, GnosisSafeWallet, BloctoWallet };
+export { MetaMask, BscWallet, Cyano, TronLink, EnumChains, Sollet, SolletIo, OntoMobile, WalletConnect, MathWallet, OntoWallet, SafePalWallet, ImTokenWallet, TokenPocket, TrustWallet, Coin98, Phantom, OKExWallet, TerraStation, CoinbaseWallet, CloverWallet, XDEFIWallet, SlopeWallet, SolflareWallet, MetaXWallet, KeplrWallet, BraveWallet, CryptoCom, NearWallet, BitKeepWallet, GnosisSafeWallet, BloctoWallet };

package/lib/index.js

@@ -3,15 +3,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.BloctoWallet = exports.GnosisSafeWallet = exports.BitKeepWallet = exports.NearWallet = exports.CryptoCom = exports.BraveWallet = exports.KeplrWallet = exports.MetaXWallet = exports.SolflareWallet = exports.SlopeWallet = exports.XDEFIWallet = exports.CloverWallet = exports.CoinbaseWallet = exports.TerraStation = exports.OKExWallet = exports.Phantom = exports.Coin98 = exports.TrustWallet = exports.TokenPocket = exports.ImTokenWallet = exports.SafePalWallet = exports.OntoWallet = exports.MathWallet = exports.WalletConnect = exports.OntoMobile = exports.SolletIo = exports.Sollet = exports.EnumChains = exports.TronLink = exports.Cyano = exports.BscWallet = exports.MetaMask = exports.WalletManager = void 0;
+exports.BloctoWallet = exports.GnosisSafeWallet = exports.BitKeepWallet = exports.NearWallet = exports.CryptoCom = exports.BraveWallet = exports.KeplrWallet = exports.MetaXWallet = exports.SolflareWallet = exports.SlopeWallet = exports.XDEFIWallet = exports.CloverWallet = exports.CoinbaseWallet = exports.TerraStation = exports.OKExWallet = exports.Phantom = exports.Coin98 = exports.TrustWallet = exports.TokenPocket = exports.ImTokenWallet = exports.SafePalWallet = exports.OntoWallet = exports.MathWallet = exports.WalletConnect = exports.OntoMobile = exports.SolletIo = exports.Sollet = exports.EnumChains = exports.TronLink = exports.Cyano = exports.BscWallet = exports.MetaMask = void 0;
 /**
  * wallets-manager entry
  * @author openocean
  * @date 2021/4/20
  * @desc
  */
-var WalletManager_1 = __importDefault(require("./WalletManager"));
-exports.WalletManager = WalletManager_1.default;
 var MetaMask_1 = __importDefault(require("./Wallets/MetaMask"));
 exports.MetaMask = MetaMask_1.default;
 var BscWallet_1 = __importDefault(require("./Wallets/BscWallet"));
@@ -77,4 +75,3 @@ exports.BloctoWallet = BloctoWallet_1.default;
 var types_1 = require("./types");
 Object.defineProperty(exports, "EnumChains", { enumerable: true, get: function () { return types_1.EnumChains; } });
 var process = {};
-exports.default = WalletManager_1.default;

package/lib/types.d.ts

@@ -103,9 +103,12 @@ export declare enum EnumErrors {
     NoBrave = "40025",
     NoCryptoCom = "40026",
     NoBitKeep = "40027",
-    NoBlocto = "40028",
     NoSafePal = "40028",
-    NoTrustWallet = "40029"
+    NoTrustWallet = "40029",
+    NoTokenPocket = "40030",
+    NoImToken = "40031",
+    NoBlocto = "40032",
+    NoBloctoAccount = "40033"
 }
 export interface ConnectResult {
     chain: EnumChains;

package/lib/types.js

@@ -106,7 +106,10 @@ var EnumErrors;
     EnumErrors["NoBrave"] = "40025";
     EnumErrors["NoCryptoCom"] = "40026";
     EnumErrors["NoBitKeep"] = "40027";
-    EnumErrors["NoBlocto"] = "40028";
     EnumErrors["NoSafePal"] = "40028";
     EnumErrors["NoTrustWallet"] = "40029";
+    EnumErrors["NoTokenPocket"] = "40030";
+    EnumErrors["NoImToken"] = "40031";
+    EnumErrors["NoBlocto"] = "40032";
+    EnumErrors["NoBloctoAccount"] = "40033";
 })(EnumErrors = exports.EnumErrors || (exports.EnumErrors = {}));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openocean.finance/wallet",
-  "version": "0.4.30",
+  "version": "0.4.31",
   "description": "A multi-chain wallets manager",
   "main": "lib/index.js",
   "scripts": {

package/lib/WalletManager.d.ts

@@ -1,20 +0,0 @@
-import EthChain from "./Chains/EthChain";
-import { EnumChains, SelectConnect } from "./types";
-interface Props {
-    selectConnect: SelectConnect;
-}
-declare class WalletManager {
-    supportChains: EnumChains[];
-    eth: EthChain;
-    selectConnect: SelectConnect;
-    constructor({ selectConnect }: Props);
-    /**
-     * show connect modal and connect
-     */
-    connect(): Promise<any>;
-    /**
-     * todo set up with local connection state
-     */
-    useCache(): void;
-}
-export default WalletManager;

package/lib/WalletManager.js

@@ -1,117 +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 };
-    }
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-/**
- * @name WalletManager
- * @author openocean
- * @date 2021/4/20
- * @desc
- */
-var BscWallet_1 = __importDefault(require("./Wallets/BscWallet"));
-var Cyano_1 = __importDefault(require("./Wallets/Cyano"));
-var MetaMask_1 = __importDefault(require("./Wallets/MetaMask"));
-var TronLink_1 = __importDefault(require("./Wallets/TronLink"));
-var EthChain_1 = __importDefault(require("./Chains/EthChain"));
-var types_1 = require("./types");
-var WalletManager = /** @class */ (function () {
-    function WalletManager(_a) {
-        var selectConnect = _a.selectConnect;
-        this.supportChains = [types_1.EnumChains.ETH, types_1.EnumChains.BSC, types_1.EnumChains.ONT, types_1.EnumChains.TRON];
-        this.eth = new EthChain_1.default();
-        this.selectConnect = selectConnect;
-    }
-    /**
-     * show connect modal and connect
-     */
-    WalletManager.prototype.connect = function () {
-        return __awaiter(this, void 0, void 0, function () {
-            var _a, chain, walletName, onSuccess, onError, walletMap, Wallet, chainIns, result, e_1;
-            var _b;
-            return __generator(this, function (_c) {
-                switch (_c.label) {
-                    case 0: return [4 /*yield*/, this.selectConnect()];
-                    case 1:
-                        _a = _c.sent(), chain = _a.chain, walletName = _a.walletName, onSuccess = _a.onSuccess, onError = _a.onError;
-                        walletMap = (_b = {},
-                            _b[types_1.EnumWalletName.MetaMask] = MetaMask_1.default,
-                            _b[types_1.EnumWalletName.BscWallet] = BscWallet_1.default,
-                            _b[types_1.EnumWalletName.Cyano] = Cyano_1.default,
-                            _b[types_1.EnumWalletName.TronLink] = TronLink_1.default,
-                            _b);
-                        Wallet = walletMap[walletName];
-                        if (!Wallet) {
-                            throw new Error('Unsupported wallet');
-                        }
-                        if (!this.supportChains.includes(chain)) {
-                            throw new Error('Unsupported chain');
-                        }
-                        _c.label = 2;
-                    case 2:
-                        _c.trys.push([2, 4, , 5]);
-                        chainIns = this[chain];
-                        chainIns.wallet = new Wallet();
-                        chainIns.wallet.chain = chain;
-                        return [4 /*yield*/, chainIns.wallet.requestConnect()];
-                    case 3:
-                        result = _c.sent();
-                        if (onSuccess) {
-                            onSuccess();
-                        }
-                        return [2 /*return*/, result];
-                    case 4:
-                        e_1 = _c.sent();
-                        if (onError) {
-                            onError(e_1);
-                        }
-                        throw new Error(e_1);
-                    case 5: return [2 /*return*/];
-                }
-            });
-        });
-    };
-    /**
-     * todo set up with local connection state
-     */
-    WalletManager.prototype.useCache = function () {
-    };
-    return WalletManager;
-}());
-exports.default = WalletManager;