@openocean.finance/wallet 0.4.24 → 0.4.27

package/lib/Wallets/BitKeepWallet.js

@@ -73,10 +73,7 @@ var BitKeepWallet = /** @class */ (function (_super) {
         _this.icon = bitkeep_svg_1.default;
         _this.supportChains = [
             types_1.EnumChains.ETH,
-            types_1.EnumChains.ROPSTEN,
-            types_1.EnumChains.RINKEBY,
             types_1.EnumChains.BSC,
-            types_1.EnumChains.BSCTEST,
             types_1.EnumChains.Polygon,
             types_1.EnumChains.OKEX,
             types_1.EnumChains.XDai,
@@ -85,11 +82,11 @@ var BitKeepWallet = /** @class */ (function (_super) {
             types_1.EnumChains.Avalanche,
             types_1.EnumChains.Arbitrum,
             types_1.EnumChains.Optimism,
-            types_1.EnumChains.Boba,
-            types_1.EnumChains.Moonriver,
-            types_1.EnumChains.Aurora,
-            types_1.EnumChains.Cronos,
-            types_1.EnumChains.Harmony
+            // EnumChains.Boba,
+            // EnumChains.Moonriver,
+            // EnumChains.Aurora,
+            // EnumChains.Cronos,
+            // EnumChains.Harmony
         ];
         _this.type = types_1.EnumWalletType.Extension;
         _this.sdk = null;

package/lib/Wallets/BloctoWallet.d.ts

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

package/lib/Wallets/BloctoWallet.js

@@ -0,0 +1,130 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    };
+    return function (d, b) {
+        if (typeof b !== "function" && b !== null)
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+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 Sollet
+ * @author openocean
+ * @date 2021/4/21
+ * @desc
+ */
+// @ts-ignore
+var blocto_svg_1 = __importDefault(require("../assets/blocto.svg"));
+var types_1 = require("../types");
+var BaseWallet_1 = __importDefault(require("./BaseWallet"));
+var fcl = __importStar(require("@onflow/fcl"));
+var BloctoWallet = /** @class */ (function (_super) {
+    __extends(BloctoWallet, _super);
+    function BloctoWallet() {
+        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.sdk = null;
+        return _this;
+    }
+    /**
+     * 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 currentUser;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        fcl.config()
+                            .put("challenge.scope", "email") // request for Email
+                            .put("accessNode.api", "https://rest-mainnet.onflow.org") // Flow mainnet
+                            .put("discovery.wallet", "https://flow-wallet.blocto.app/authn") // Blocto wallet
+                            .put("service.OpenID.scopes", "email!");
+                        this.sdk = fcl;
+                        return [4 /*yield*/, fcl.currentUser.snapshot()];
+                    case 1:
+                        currentUser = _a.sent();
+                        this.address = currentUser;
+                        this.chainId = ''; // todo sollet chainId
+                        return [2 /*return*/];
+                }
+            });
+        });
+    };
+    return BloctoWallet;
+}(BaseWallet_1.default));
+exports.default = BloctoWallet;

package/lib/Wallets/BscWallet.js

@@ -90,10 +90,15 @@ 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/GnosisSafeWallet.d.ts

@@ -1,12 +1,11 @@
-import { EnumWalletName, EnumWalletType } from "../types";
+import { EnumChains, EnumWalletName, EnumWalletType } from "../types";
 import BaseWallet from "./BaseWallet";
-import Web3 from "web3";
 declare class GnosisSafeWallet extends BaseWallet {
     name: EnumWalletName;
     icon: any;
-    supportChains: never[];
+    supportChains: EnumChains[];
     type: EnumWalletType;
-    sdk: Web3 | null;
+    sdk: any;
     /**
      * connect metamask and get wallet address
      * @param chainId specific chainId,throw error when not match

package/lib/Wallets/GnosisSafeWallet.js

@@ -73,9 +73,8 @@ var GnosisSafeWallet = /** @class */ (function (_super) {
         var _this = _super !== null && _super.apply(this, arguments) || this;
         _this.name = types_1.EnumWalletName.GnosisSafeWallet;
         _this.icon = metamask_svg_1.default;
-        _this.supportChains = [];
+        _this.supportChains = [types_1.EnumChains.RINKEBY];
         _this.type = types_1.EnumWalletType.Extension;
-        _this.sdk = null;
         return _this;
     }
     /**
@@ -97,7 +96,8 @@ var GnosisSafeWallet = /** @class */ (function (_super) {
                     case 1:
                         safe = _a.sent();
                         provider = new safe_apps_provider_1.SafeAppProvider(safe, sdk);
-                        this.sdk = new web3_1.default(provider);
+                        this.sdk = new web3_1.default(provider).currentProvider.sdk;
+                        console.log('sdk', this.sdk);
                         currentChainId = safe.chainId;
                         if (chainId && currentChainId !== chainId) {
                             throw new Error(types_1.EnumErrors.ChainIdNotMath);

package/lib/Wallets/NearWallet.js

@@ -105,7 +105,7 @@ var NearWallet = /** @class */ (function (_super) {
                         }
                         if (!account_id) return [3 /*break*/, 2];
                         _a = near_api_js_1.WalletConnection.bind;
-                        return [4 /*yield*/, near_api_js_1.connect(this.config)];
+                        return [4 /*yield*/, (0, near_api_js_1.connect)(this.config)];
                     case 1:
                         new (_a.apply(near_api_js_1.WalletConnection, [void 0, _b.sent(), 'openOcen']))();
                         _b.label = 2;
@@ -123,7 +123,7 @@ var NearWallet = /** @class */ (function (_super) {
             var near, account, address;
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, near_api_js_1.connect(this.config)];
+                    case 0: return [4 /*yield*/, (0, near_api_js_1.connect)(this.config)];
                     case 1:
                         near = _a.sent();
                         this.sdk = new near_api_js_1.WalletConnection(near, 'openOcen');

package/lib/Wallets/WalletConnect.js

@@ -145,24 +145,23 @@ var WalletConnect = /** @class */ (function (_super) {
                         return [4 /*yield*/, this.sdk.eth.getChainId()];
                     case 2:
                         currentChainId = _a.sent();
-                        if (!(chainId && currentChainId != chainId)) return [3 /*break*/, 6];
-                        if (!(!config || !config.isSecond)) return [3 /*break*/, 6];
-                        return [4 /*yield*/, provider.disconnect()];
-                    case 3:
-                        _a.sent();
-                        return [4 /*yield*/, new Promise(function (r) {
-                                setTimeout(r, 500);
-                            })];
-                    case 4:
-                        _a.sent();
-                        return [4 /*yield*/, this.requestConnect(chainId, __assign({ isSecond: true }, config))];
-                    case 5: return [2 /*return*/, _a.sent()];
-                    case 6:
+                        // if (chainId && currentChainId != chainId) {
+                        //   if (!config || !config.isSecond) {
+                        //     await provider.disconnect()
+                        //     await new Promise(r => {
+                        //       setTimeout(r, 500);
+                        //     })
+                        //     return await this.requestConnect(chainId, {
+                        //       isSecond: true,
+                        //       ...config
+                        //     })
+                        //   }
+                        // }
                         if (chainId && currentChainId != chainId) {
                             throw new Error(types_1.EnumErrors.ChainIdNotMath);
                         }
                         return [4 /*yield*/, this.sdk.eth.getAccounts()];
-                    case 7:
+                    case 3:
                         address = (_a.sent())[0];
                         this.address = address;
                         this.chainId = currentChainId;

package/lib/index.d.ts

@@ -35,6 +35,7 @@ import CryptoCom from './Wallets/CryptoCom';
 import NearWallet from './Wallets/NearWallet';
 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 };
+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 };

package/lib/index.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-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 = exports.WalletManager = void 0;
 /**
  * wallets-manager entry
  * @author openocean
@@ -72,6 +72,8 @@ var BitKeepWallet_1 = __importDefault(require("./Wallets/BitKeepWallet"));
 exports.BitKeepWallet = BitKeepWallet_1.default;
 var GnosisSafeWallet_1 = __importDefault(require("./Wallets/GnosisSafeWallet"));
 exports.GnosisSafeWallet = GnosisSafeWallet_1.default;
+var BloctoWallet_1 = __importDefault(require("./Wallets/BloctoWallet"));
+exports.BloctoWallet = BloctoWallet_1.default;
 var types_1 = require("./types");
 Object.defineProperty(exports, "EnumChains", { enumerable: true, get: function () { return types_1.EnumChains; } });
 var process = {};

package/lib/types.d.ts

@@ -33,7 +33,8 @@ export declare enum EnumChains {
     Cronos = "cronos",
     Harmony = "harmony",
     Osmosis = "osmosis",
-    Sifchain = "sifchain"
+    Sifchain = "sifchain",
+    Flow = "flow"
 }
 export declare enum EnumWalletType {
     Extension = "Extension",
@@ -72,7 +73,8 @@ export declare enum EnumWalletName {
     BraveWallet = "Brave Wallet",
     CryptoCom = "Crypto.com DeFi Wallet",
     BitKeepWallet = "BitKeep Wallet",
-    GnosisSafeWallet = "GnosisSafe Wallet"
+    GnosisSafeWallet = "GnosisSafe Wallet",
+    BloctoWallet = "Blocto Wallet"
 }
 export declare enum EnumErrors {
     NotMetamask = "40001",
@@ -100,7 +102,8 @@ export declare enum EnumErrors {
     NoKeplr = "40024",
     NoBrave = "40025",
     NoCryptoCom = "40026",
-    NoBitKeep = "40027"
+    NoBitKeep = "40027",
+    NoBlocto = "40028"
 }
 export interface ConnectResult {
     chain: EnumChains;

package/lib/types.js

@@ -34,6 +34,7 @@ var EnumChains;
     EnumChains["Harmony"] = "harmony";
     EnumChains["Osmosis"] = "osmosis";
     EnumChains["Sifchain"] = "sifchain";
+    EnumChains["Flow"] = "flow";
 })(EnumChains = exports.EnumChains || (exports.EnumChains = {}));
 var EnumWalletType;
 (function (EnumWalletType) {
@@ -75,6 +76,7 @@ var EnumWalletName;
     EnumWalletName["CryptoCom"] = "Crypto.com DeFi Wallet";
     EnumWalletName["BitKeepWallet"] = "BitKeep Wallet";
     EnumWalletName["GnosisSafeWallet"] = "GnosisSafe Wallet";
+    EnumWalletName["BloctoWallet"] = "Blocto Wallet";
 })(EnumWalletName = exports.EnumWalletName || (exports.EnumWalletName = {}));
 var EnumErrors;
 (function (EnumErrors) {
@@ -104,4 +106,5 @@ var EnumErrors;
     EnumErrors["NoBrave"] = "40025";
     EnumErrors["NoCryptoCom"] = "40026";
     EnumErrors["NoBitKeep"] = "40027";
+    EnumErrors["NoBlocto"] = "40028";
 })(EnumErrors = exports.EnumErrors || (exports.EnumErrors = {}));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openocean.finance/wallet",
-  "version": "0.4.24",
+  "version": "0.4.27",
   "description": "A multi-chain wallets manager",
   "main": "lib/index.js",
   "scripts": {
@@ -44,6 +44,7 @@
     "@cosmjs/stargate": "^0.28.4",
     "@gnosis.pm/safe-apps-provider": "^0.11.3",
     "@gnosis.pm/safe-apps-sdk": "^7.5.0",
+    "@onflow/fcl": "^0.0.71",
     "@ont-dev/ontology-dapi": "^0.5.7",
     "@project-serum/sol-wallet-adapter": "0.2.0",
     "@solana/web3.js": "1.31.0",