npm - @openocean.finance/wallet - Versions diffs - 0.4.7 → 0.4.10 - Mend

@openocean.finance/wallet 0.4.7 → 0.4.10

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (7) hide show

package/lib/Wallets/MetaMask.js +1 -0
package/lib/Wallets/NearWallet.d.ts +4 -0
package/lib/Wallets/NearWallet.js +42 -16
package/lib/assets/near.svg +10 -0
package/lib/types.d.ts +1 -0
package/lib/types.js +1 -0
package/package.json +1 -1

package/lib/Wallets/MetaMask.js CHANGED Viewed

@@ -74,6 +74,7 @@ var MetaMask = /** @class */ (function (_super) {
         _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,

package/lib/Wallets/NearWallet.d.ts CHANGED Viewed

@@ -6,10 +6,14 @@ declare class NearWallet extends BaseWallet {
     supportChains: EnumChains[];
     type: EnumWalletType;
     sdk: any | null;
+    private keyStore;
+    private config;
+    init(): Promise<void>;
     /**
      * connect metamask and get wallet address
      * @param chainId specific chainId,throw error when not match
      */
     requestConnect(): Promise<any>;
+    constructor();
 }
 export default NearWallet;

package/lib/Wallets/NearWallet.js CHANGED Viewed

@@ -61,46 +61,72 @@ Object.defineProperty(exports, "__esModule", { value: true });
  * @desc
  */
 // @ts-ignore
-var metamask_svg_1 = __importDefault(require("../assets/metamask.svg"));
+var near_svg_1 = __importDefault(require("../assets/near.svg"));
 var types_1 = require("../types");
 var BaseWallet_1 = __importDefault(require("./BaseWallet"));
 var near_api_js_1 = require("near-api-js");
 var NearWallet = /** @class */ (function (_super) {
     __extends(NearWallet, _super);
     function NearWallet() {
-        var _this = _super !== null && _super.apply(this, arguments) || this;
+        var _this = _super.call(this) || this;
         _this.name = types_1.EnumWalletName.NearWallet;
-        _this.icon = metamask_svg_1.default;
+        _this.icon = near_svg_1.default;
         _this.supportChains = [
             types_1.EnumChains.NEAR
         ];
         _this.type = types_1.EnumWalletType.Extension;
         _this.sdk = null;
+        _this.keyStore = new near_api_js_1.keyStores.BrowserLocalStorageKeyStore();
+        _this.config = {
+            networkId: "mainnet",
+            keyStore: _this.keyStore,
+            nodeUrl: "https://public-rpc.blockpi.io/http/near",
+            walletUrl: "https://wallet.mainnet.near.org",
+            helperUrl: "https://helper.mainnet.near.org",
+            explorerUrl: "https://explorer.mainnet.near.org",
+        };
+        _this.init();
         return _this;
     }
+    NearWallet.prototype.init = function () {
+        return __awaiter(this, void 0, void 0, function () {
+            var account_id, query, vars, i, pair, _a;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        account_id = '';
+                        query = window.location.search.substring(1);
+                        vars = query.split("&");
+                        for (i = 0; i < vars.length; i++) {
+                            pair = vars[i].split("=");
+                            if (pair[0] == 'account_id') {
+                                account_id = pair[1];
+                            }
+                        }
+                        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)];
+                    case 1:
+                        new (_a.apply(near_api_js_1.WalletConnection, [void 0, _b.sent(), 'openOcen']))();
+                        _b.label = 2;
+                    case 2: return [2 /*return*/];
+                }
+            });
+        });
+    };
     /**
      * connect metamask and get wallet address
      * @param chainId specific chainId,throw error when not match
      */
     NearWallet.prototype.requestConnect = function () {
         return __awaiter(this, void 0, void 0, function () {
-            var keyStore, config, near, account, address;
+            var near, account, address;
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0:
-                        keyStore = new near_api_js_1.keyStores.BrowserLocalStorageKeyStore();
-                        config = {
-                            networkId: "mainnet",
-                            keyStore: keyStore,
-                            nodeUrl: "https://public-rpc.blockpi.io/http/near",
-                            walletUrl: "https://wallet.mainnet.near.org",
-                            helperUrl: "https://helper.mainnet.near.org",
-                            explorerUrl: "https://explorer.mainnet.near.org",
-                        };
-                        return [4 /*yield*/, (0, near_api_js_1.connect)(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, null);
+                        this.sdk = new near_api_js_1.WalletConnection(near, 'openOcen');
                         if (!this.sdk._authData.accountId) {
                             this.sdk.requestSignIn({
                                 contractId: 'v2.ref-farming.near',

package/lib/assets/near.svg ADDED Viewed

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="32px" height="32px" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>near</title>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="near" fill-rule="nonzero">
+            <circle id="Oval" fill="#FFFFFF" cx="16" cy="16" r="16"></circle>
+            <path d="M22.0444,7.02222 L17.8667,13.22222 C17.5778,13.64444 18.1333,14.15556 18.5333,13.8 L22.6444,10.22222 C22.7556,10.13333 22.9111,10.2 22.9111,10.35556 L22.9111,21.5333 C22.9111,21.6889 22.7111,21.7556 22.6222,21.6444 L10.17778,6.755556 C9.77778,6.266667 9.2,6 8.55556,6 L8.11111,6 C6.955556,6 6,6.955556 6,8.13333 L6,23.8667 C6,25.0444 6.955556,26 8.13333,26 C8.86667,26 9.55556,25.6222 9.95556,24.9778 L14.13333,18.7778 C14.42222,18.3556 13.86667,17.8444 13.46667,18.2 L9.35556,21.7556 C9.24444,21.8444 9.08889,21.7778 9.08889,21.6222 L9.08889,10.46667 C9.08889,10.31111 9.28889,10.24444 9.37778,10.35556 L21.8222,25.2444 C22.2222,25.7333 22.8222,26 23.4444,26 L23.8889,26 C25.0667,26 26.0222,25.0444 26.0222,23.8667 L26.0222,8.13333 C26,6.955556 25.0444,6 23.8667,6 C23.1333,6 22.4444,6.377778 22.0444,7.02222 Z" id="Path" fill="#000000"></path>
+        </g>
+    </g>
+</svg>

package/lib/types.d.ts CHANGED Viewed

@@ -12,6 +12,7 @@ export declare enum EnumChains {
     NEAR = "near",
     ETH = "eth",
     ROPSTEN = "ropsten",
+    RINKEBY = "rinkeby",
     ONT = "ont",
     BSC = "bsc",
     BSCTEST = "bsctest",

package/lib/types.js CHANGED Viewed

@@ -12,6 +12,7 @@ var EnumChains;
     EnumChains["NEAR"] = "near";
     EnumChains["ETH"] = "eth";
     EnumChains["ROPSTEN"] = "ropsten";
+    EnumChains["RINKEBY"] = "rinkeby";
     EnumChains["ONT"] = "ont";
     EnumChains["BSC"] = "bsc";
     EnumChains["BSCTEST"] = "bsctest";

package/package.json CHANGED Viewed

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