@openocean.finance/wallet 1.5.53 → 1.5.57

package/lib/Wallets/HaHaWallet.d.ts

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

package/lib/Wallets/HaHaWallet.js

@@ -0,0 +1,136 @@
+"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 (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 });
+/**
+ * @name HaHaWallet
+ * @author openocean
+ * @date 2021/4/21
+ * @desc
+ */
+// @ts-ignore
+var haha_svg_1 = __importDefault(require("../assets/haha.svg"));
+var types_1 = require("../types");
+var BaseWallet_1 = __importDefault(require("./BaseWallet"));
+var web3_1 = __importDefault(require("web3"));
+var ethereum_provider_1 = require("@walletconnect/ethereum-provider");
+var HaHaWallet = /** @class */ (function (_super) {
+    __extends(HaHaWallet, _super);
+    function HaHaWallet() {
+        var _this = _super !== null && _super.apply(this, arguments) || this;
+        _this.name = types_1.EnumWalletName.HaHaWallet;
+        _this.icon = haha_svg_1.default;
+        _this.supportChains = [
+            types_1.EnumChains.ETH,
+            types_1.EnumChains.Polygon
+        ];
+        _this.type = types_1.EnumWalletType.WalletConnect;
+        _this.sdk = null;
+        return _this;
+    }
+    /**
+     * connect metamask and get wallet address
+     * @param chainId specific chainId,throw error when not match
+     * @param config
+     */
+    HaHaWallet.prototype.requestConnect = function (chainId, config) {
+        if (chainId === void 0) { chainId = 1; }
+        return __awaiter(this, void 0, void 0, function () {
+            var qrModalOptions, provider, currentChainId, address;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        // if (!this.infuraId) {
+                        //   throw new Error("infuraId not set");
+                        // }
+                        console.log('chainId', chainId);
+                        qrModalOptions = {
+                            themeVariables: {
+                                '--wcm-z-index': '99999',
+                            }
+                        };
+                        return [4 /*yield*/, ethereum_provider_1.EthereumProvider.init({
+                                projectId: config && config.projectId ? config.projectId : 'c1ca7adc83e89c7e7848440702f28f38',
+                                chains: [chainId],
+                                showQrModal: true,
+                                qrModalOptions: qrModalOptions
+                            })];
+                    case 1:
+                        provider = _a.sent();
+                        console.log('provider', provider);
+                        return [4 /*yield*/, provider.enable()];
+                    case 2:
+                        _a.sent();
+                        console.log('provider', provider);
+                        this.sdk = new web3_1.default(provider);
+                        return [4 /*yield*/, this.sdk.eth.getChainId()];
+                    case 3:
+                        currentChainId = _a.sent();
+                        if (chainId && currentChainId != chainId) {
+                            throw new Error(types_1.EnumErrors.ChainIdNotMath);
+                        }
+                        return [4 /*yield*/, this.sdk.eth.getAccounts()];
+                    case 4:
+                        address = (_a.sent())[0];
+                        this.address = address;
+                        this.chainId = currentChainId;
+                        return [2 /*return*/, address];
+                }
+            });
+        });
+    };
+    return HaHaWallet;
+}(BaseWallet_1.default));
+exports.default = HaHaWallet;

package/lib/Wallets/LedgerWallet.js

@@ -67,11 +67,6 @@ var BaseWallet_1 = __importDefault(require("./BaseWallet"));
 var logs_1 = require("@ledgerhq/logs");
 var hw_app_eth_1 = __importDefault(require("@ledgerhq/hw-app-eth"));
 var hw_transport_webusb_1 = __importDefault(require("@ledgerhq/hw-transport-webusb"));
-// import ProviderEngine from 'web3-provider-engine';
-// import createLedgerSubprovider from '@ledgerhq/web3-subprovider';
-// import FetchSubprovider from 'web3-provider-engine/subproviders/fetch';
-// import VmSubprovider from 'web3-provider-engine/subproviders/vm';
-// import Web3 from "web3";
 var LedgerWallet = /** @class */ (function (_super) {
     __extends(LedgerWallet, _super);
     function LedgerWallet() {

package/lib/Wallets/index.js

@@ -8,7 +8,8 @@ var MetaMask_1 = __importDefault(require("./MetaMask"));
 var BscWallet_1 = __importDefault(require("./BscWallet"));
 var Cyano_1 = __importDefault(require("./Cyano"));
 var TronLink_1 = __importDefault(require("./TronLink"));
-var Sollet_1 = __importDefault(require("./Sollet"));
+// import Sollet from './Sollet';
+// import SolletIo from './SolletIo';
 var OntoMobile_1 = __importDefault(require("./OntoMobile"));
 var WalletConnect_1 = __importDefault(require("./WalletConnect"));
 var MathWallet_1 = __importDefault(require("./MathWallet"));
@@ -50,6 +51,7 @@ var Krystal_1 = __importDefault(require("./Krystal"));
 var Risewallet_1 = __importDefault(require("./Risewallet"));
 var Fewcha_1 = __importDefault(require("./Fewcha"));
 var BlockWallet_1 = __importDefault(require("./BlockWallet"));
+var HaHaWallet_1 = __importDefault(require("./HaHaWallet"));
 var WalletObj = {
     MetaMask: new MetaMask_1.default(),
     BscWallet: new BscWallet_1.default(),
@@ -78,7 +80,7 @@ var WalletObj = {
     Cyano: new Cyano_1.default(),
     OntoMobile: new OntoMobile_1.default(),
     TronLink: new TronLink_1.default(),
-    Sollet: new Sollet_1.default(),
+    // Sollet: new Sollet(),
     SolflareWallet: new SolflareWallet_1.default(),
     Phantom: new Phantom_1.default(),
     TerraStation: new TerraStation_1.default(),
@@ -97,6 +99,7 @@ var WalletObj = {
     Risewallet: new Risewallet_1.default(),
     Fewcha: new Fewcha_1.default(),
     BlockWallet: new BlockWallet_1.default(),
+    HaHaWallet: new HaHaWallet_1.default()
 };
 var Wallets = /** @class */ (function () {
     function Wallets() {

package/lib/assets/haha.svg

@@ -0,0 +1,18 @@
+<svg width="96.000000" height="96.000000" viewBox="0 0 96 96" fill="none" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+	<desc>
+			Created with Pixso.
+	</desc>
+	<defs>
+		<linearGradient id="paint_linear_2_2_0" x1="16.000008" y1="79.999191" x2="79.999199" y2="16.000004" gradientUnits="userSpaceOnUse">
+			<stop stop-color="#11A9FF"/>
+			<stop offset="1.000000" stop-color="#FC65FF"/>
+		</linearGradient>
+	</defs>
+	<path id="svg_1" d="M96 48C96 21.4903 74.5097 0 48 0C21.4903 0 0 21.4903 0 48C0 74.5097 21.4903 96 48 96C74.5097 96 96 74.5097 96 48Z" fill-rule="nonzero" fill="#FFFFFF"/>
+	<rect id="rect" x="16.000000" y="16.000000" rx="14.400000" width="63.999191" height="63.999191" fill="url(#paint_linear_2_2_0)"/>
+	<path id="path" d="M60.7989 29.8657L60.7989 66.1319" stroke="#FFFFFF" stroke-width="16.000000" stroke-linejoin="round"/>
+	<path id="path" d="M35.2003 29.8657L35.2003 66.1319" stroke="#FFFFFF" stroke-width="16.000000" stroke-linejoin="round"/>
+	<path id="path" d="M66.1319 37.725L29.8657 47.4425L29.8657 58.4852L66.1319 48.7678L66.1319 37.725Z" fill-rule="nonzero" fill="#FFFFFF"/>
+	<path id="path" d="M80 45.0602L80 56.103L66.1335 59.8185L66.1335 48.7757L80 45.0602Z" fill-rule="nonzero" fill="#FFFFFF"/>
+	<path id="path" d="M16 51.1506L16 40.1078L29.8665 36.3923L29.8665 47.4351L16 51.1506Z" fill-rule="nonzero" fill="#FFFFFF"/>
+</svg>

package/lib/types.d.ts

@@ -107,7 +107,8 @@ export declare enum EnumWalletName {
     Krystal = "Krystal",
     Risewallet = "Rise Wallet",
     Fewcha = "Fewcha",
-    BlockWallet = "BlockWallet"
+    BlockWallet = "BlockWallet",
+    HaHaWallet = "HaHa Wallet"
 }
 export declare enum EnumErrors {
     NotMetamask = "40001",

package/lib/types.js

@@ -52,14 +52,14 @@ var EnumChains;
     EnumChains["OpBNB"] = "opbnb";
     EnumChains["Mantle"] = "mantle";
     EnumChains["Manta"] = "manta";
-})(EnumChains || (exports.EnumChains = EnumChains = {}));
+})(EnumChains = exports.EnumChains || (exports.EnumChains = {}));
 var EnumWalletType;
 (function (EnumWalletType) {
     EnumWalletType["Extension"] = "Extension";
     EnumWalletType["WalletConnect"] = "WalletConnect";
     EnumWalletType["Web"] = "Web";
     EnumWalletType["Mobile"] = "Mobile";
-})(EnumWalletType || (exports.EnumWalletType = EnumWalletType = {}));
+})(EnumWalletType = exports.EnumWalletType || (exports.EnumWalletType = {}));
 var EnumWalletName;
 (function (EnumWalletName) {
     EnumWalletName["NearWallet"] = "NearWallet";
@@ -110,7 +110,8 @@ var EnumWalletName;
     EnumWalletName["Risewallet"] = "Rise Wallet";
     EnumWalletName["Fewcha"] = "Fewcha";
     EnumWalletName["BlockWallet"] = "BlockWallet";
-})(EnumWalletName || (exports.EnumWalletName = EnumWalletName = {}));
+    EnumWalletName["HaHaWallet"] = "HaHa Wallet";
+})(EnumWalletName = exports.EnumWalletName || (exports.EnumWalletName = {}));
 var EnumErrors;
 (function (EnumErrors) {
     EnumErrors["NotMetamask"] = "40001";
@@ -157,4 +158,4 @@ var EnumErrors;
     EnumErrors["NoRisewallet"] = "40044";
     EnumErrors["NoFewcha"] = "40045";
     EnumErrors["NoBlockWallet"] = "40046";
-})(EnumErrors || (exports.EnumErrors = EnumErrors = {}));
+})(EnumErrors = exports.EnumErrors || (exports.EnumErrors = {}));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openocean.finance/wallet",
-  "version": "1.5.53",
+  "version": "1.5.57",
   "description": "A multi-chain wallets manager",
   "main": "lib/index.js",
   "scripts": {
@@ -57,7 +57,7 @@
     "@ont-dev/ontology-dapi": "^0.5.7",
     "@project-serum/sol-wallet-adapter": "0.2.0",
     "@siddomains/sidjs": "^0.1.22",
-    "@solana/web3.js": "1.31.0",
+    "@solana/web3.js": "^1.87.6",
     "@terra-money/terra.js": "3.0.8",
     "@uauth/js": "^2.4.0",
     "@walletconnect/ethereum-provider": "^2.10.4",
@@ -69,8 +69,7 @@
     "path-browserify": "^1.0.1",
     "starknet": "^4.22.0",
     "web3": "^1.7.4",
-    "web3-ledgerhq-frame-connector": "^1.1.0",
-    "web3-provider-engine": "^16.0.5"
+    "web3-ledgerhq-frame-connector": "^1.1.0"
   },
   "eslintConfig": {
     "root": true,