@openocean.finance/wallet 0.4.20 → 0.4.23

package/lib/Wallets/GnosisSafeWallet.d.ts

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

package/lib/Wallets/GnosisSafeWallet.js

@@ -0,0 +1,119 @@
+"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 __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 GnosisSafe
+ * @author openocean
+ * @date 2021/4/21
+ * @desc
+ */
+// @ts-ignore
+var metamask_svg_1 = __importDefault(require("../assets/metamask.svg"));
+var types_1 = require("../types");
+var BaseWallet_1 = __importDefault(require("./BaseWallet"));
+var web3_1 = __importDefault(require("web3"));
+var safe_apps_sdk_1 = __importDefault(require("@gnosis.pm/safe-apps-sdk"));
+var safe_apps_provider_1 = require("@gnosis.pm/safe-apps-provider");
+var GnosisSafeWallet = /** @class */ (function (_super) {
+    __extends(GnosisSafeWallet, _super);
+    function GnosisSafeWallet() {
+        var _this = _super !== null && _super.apply(this, arguments) || this;
+        _this.name = types_1.EnumWalletName.GnosisSafeWallet;
+        _this.icon = metamask_svg_1.default;
+        _this.supportChains = [];
+        _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
+     */
+    GnosisSafeWallet.prototype.requestConnect = function (chainId) {
+        return __awaiter(this, void 0, void 0, function () {
+            var opts, sdk, safe, provider, address, currentChainId;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        opts = {
+                            allowedDomains: [/gnosis-safe.io/],
+                            debug: true
+                        };
+                        sdk = new safe_apps_sdk_1.default(opts);
+                        return [4 /*yield*/, sdk.safe.getInfo()];
+                    case 1:
+                        safe = _a.sent();
+                        provider = new safe_apps_provider_1.SafeAppProvider(safe, sdk);
+                        this.sdk = new web3_1.default(provider);
+                        return [4 /*yield*/, this.sdk.eth.requestAccounts()];
+                    case 2:
+                        address = (_a.sent())[0];
+                        return [4 /*yield*/, this.sdk.eth.getChainId()];
+                    case 3:
+                        currentChainId = _a.sent();
+                        if (chainId && currentChainId !== chainId) {
+                            throw new Error(types_1.EnumErrors.ChainIdNotMath);
+                        }
+                        this.address = address;
+                        this.chainId = currentChainId;
+                        return [2 /*return*/, address];
+                }
+            });
+        });
+    };
+    return GnosisSafeWallet;
+}(BaseWallet_1.default));
+exports.default = GnosisSafeWallet;

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*/, (0, near_api_js_1.connect)(this.config)];
+                        return [4 /*yield*/, 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*/, (0, near_api_js_1.connect)(this.config)];
+                    case 0: return [4 /*yield*/, 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.d.ts

@@ -1,6 +1,5 @@
 import { EnumChains, EnumWalletName, EnumWalletType } from "../types";
 import BaseWallet from "./BaseWallet";
-import WalletConnectProvider from "@walletconnect/web3-provider";
 declare class WalletConnect extends BaseWallet {
     name: EnumWalletName;
     icon: any;
@@ -8,8 +7,6 @@ declare class WalletConnect extends BaseWallet {
     type: EnumWalletType;
     sdk: any;
     infuraId?: string;
-    provider: WalletConnectProvider;
-    disconnect(): Promise<boolean>;
     /**
      * connect metamask and get wallet address
      * @param chainId specific chainId,throw error when not match

package/lib/Wallets/WalletConnect.js

@@ -102,43 +102,8 @@ var WalletConnect = /** @class */ (function (_super) {
         ];
         _this.type = types_1.EnumWalletType.WalletConnect;
         _this.sdk = null;
-        _this.provider = new web3_provider_1.default({
-            infuraId: '2c7c4d86c2c746c89de722551b606119',
-            chainId: 1,
-            rpc: {
-                69: "https://kovan.optimism.io",
-                420: "https://goerli.optimism.io",
-                10: "https://rpc.ankr.com/optimism",
-                25: "https://evm.cronos.org",
-                56: "https://bsc-dataseed1.binance.org",
-                66: "https://exchainrpc.okex.org",
-                100: "https://rpc.xdaichain.com",
-                128: "https://http-mainnet.hecochain.com",
-                137: "https://rpc-mainnet.maticvigil.com",
-                250: "https://rpcapi.fantom.network",
-                288: "https://mainnet.boba.network",
-                1285: "https://rpc.moonriver.moonbeam.network",
-                42161: "https://arb1.arbitrum.io/rpc",
-                421611: "https://rinkeby.arbitrum.io/rpc",
-                43114: "https://api.avax.network/ext/bc/C/rpc",
-                1313161554: "https://mainnet.aurora.dev",
-                1666600000: "https://api.s0.t.hmny.io",
-            }
-        });
         return _this;
     }
-    WalletConnect.prototype.disconnect = function () {
-        return __awaiter(this, void 0, void 0, function () {
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.provider.disconnect()];
-                    case 1:
-                        _a.sent();
-                        return [2 /*return*/, true];
-                }
-            });
-        });
-    };
     /**
      * connect metamask and get wallet address
      * @param chainId specific chainId,throw error when not match
@@ -147,27 +112,42 @@ var WalletConnect = /** @class */ (function (_super) {
     WalletConnect.prototype.requestConnect = function (chainId, config) {
         if (chainId === void 0) { chainId = 1; }
         return __awaiter(this, void 0, void 0, function () {
-            var currentChainId, address;
+            var provider, currentChainId, address;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        // this.provider.infuraId = this.infuraId
-                        // await this.provider.disconnect()
-                        // await new Promise(r => {
-                        //   setTimeout(r, 200);
-                        // })
-                        this.provider.chainId = chainId;
-                        this.provider.updateRpcUrl(chainId);
-                        return [4 /*yield*/, this.provider.enable()];
+                        if (!this.infuraId) {
+                            throw new Error("infuraId not set");
+                        }
+                        provider = new web3_provider_1.default(__assign({ infuraId: this.infuraId, chainId: chainId, rpc: {
+                                69: "https://kovan.optimism.io",
+                                420: "https://goerli.optimism.io",
+                                10: "https://rpc.ankr.com/optimism",
+                                25: "https://evm.cronos.org",
+                                56: "https://bsc-dataseed1.binance.org",
+                                66: "https://exchainrpc.okex.org",
+                                100: "https://rpc.xdaichain.com",
+                                128: "https://http-mainnet.hecochain.com",
+                                137: "https://rpc-mainnet.maticvigil.com",
+                                250: "https://rpcapi.fantom.network",
+                                288: "https://mainnet.boba.network",
+                                1285: "https://rpc.moonriver.moonbeam.network",
+                                42161: "https://arb1.arbitrum.io/rpc",
+                                421611: "https://rinkeby.arbitrum.io/rpc",
+                                43114: "https://api.avax.network/ext/bc/C/rpc",
+                                1313161554: "https://mainnet.aurora.dev",
+                                1666600000: "https://api.s0.t.hmny.io",
+                            } }, config));
+                        return [4 /*yield*/, provider.enable()];
                     case 1:
                         _a.sent();
-                        this.sdk = new web3_1.default(this.provider);
+                        this.sdk = new web3_1.default(provider);
                         return [4 /*yield*/, this.sdk.eth.getChainId()];
                     case 2:
                         currentChainId = _a.sent();
                         if (!(chainId && currentChainId != chainId)) return [3 /*break*/, 6];
-                        if (!(!config || !config.isTow)) return [3 /*break*/, 6];
-                        return [4 /*yield*/, this.provider.disconnect()];
+                        if (!(!config || !config.isSecond)) return [3 /*break*/, 6];
+                        return [4 /*yield*/, provider.disconnect()];
                     case 3:
                         _a.sent();
                         return [4 /*yield*/, new Promise(function (r) {
@@ -175,7 +155,7 @@ var WalletConnect = /** @class */ (function (_super) {
                             })];
                     case 4:
                         _a.sent();
-                        return [4 /*yield*/, this.requestConnect(chainId, __assign({ isTow: true }, config))];
+                        return [4 /*yield*/, this.requestConnect(chainId, __assign({ isSecond: true }, config))];
                     case 5: return [2 /*return*/, _a.sent()];
                     case 6:
                         if (chainId && currentChainId != chainId) {

package/lib/index.d.ts

@@ -34,6 +34,7 @@ import BraveWallet from "./Wallets/BraveWallet";
 import CryptoCom from './Wallets/CryptoCom';
 import NearWallet from './Wallets/NearWallet';
 import BitKeepWallet from './Wallets/BitKeepWallet';
+import GnosisSafeWallet from './Wallets/GnosisSafeWallet';
 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 };
+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 };

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.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.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
@@ -70,6 +70,8 @@ var NearWallet_1 = __importDefault(require("./Wallets/NearWallet"));
 exports.NearWallet = NearWallet_1.default;
 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 types_1 = require("./types");
 Object.defineProperty(exports, "EnumChains", { enumerable: true, get: function () { return types_1.EnumChains; } });
 var process = {};

package/lib/types.d.ts

@@ -71,7 +71,8 @@ export declare enum EnumWalletName {
     keplrWallet = "Keplr Wallet",
     BraveWallet = "Brave Wallet",
     CryptoCom = "Crypto.com DeFi Wallet",
-    BitKeepWallet = "BitKeep Wallet"
+    BitKeepWallet = "BitKeep Wallet",
+    GnosisSafeWallet = "GnosisSafe Wallet"
 }
 export declare enum EnumErrors {
     NotMetamask = "40001",

package/lib/types.js

@@ -74,6 +74,7 @@ var EnumWalletName;
     EnumWalletName["BraveWallet"] = "Brave Wallet";
     EnumWalletName["CryptoCom"] = "Crypto.com DeFi Wallet";
     EnumWalletName["BitKeepWallet"] = "BitKeep Wallet";
+    EnumWalletName["GnosisSafeWallet"] = "GnosisSafe Wallet";
 })(EnumWalletName = exports.EnumWalletName || (exports.EnumWalletName = {}));
 var EnumErrors;
 (function (EnumErrors) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openocean.finance/wallet",
-  "version": "0.4.20",
+  "version": "0.4.23",
   "description": "A multi-chain wallets manager",
   "main": "lib/index.js",
   "scripts": {
@@ -42,6 +42,8 @@
   "dependencies": {
     "@cosmjs/launchpad": "^0.27.1",
     "@cosmjs/stargate": "^0.28.4",
+    "@gnosis.pm/safe-apps-provider": "^0.11.3",
+    "@gnosis.pm/safe-apps-sdk": "^7.5.0",
     "@ont-dev/ontology-dapi": "^0.5.7",
     "@project-serum/sol-wallet-adapter": "0.2.0",
     "@solana/web3.js": "1.31.0",