@openocean.finance/wallet 0.4.63 → 0.4.65

package/lib/Wallets/NearWallet.d.ts

@@ -1,7 +1,7 @@
 import { EnumChains, EnumWalletName, EnumWalletType } from "../types";
 import BaseWallet from "./BaseWallet";
 import { WalletConnection, utils } from "near-api-js";
-import { createTransaction, functionCall } from "near-api-js/lib/transaction";
+import { createTransaction, functionCall } from 'near-api-js/lib/transaction';
 declare class NearWallet extends BaseWallet {
     name: EnumWalletName;
     icon: any;
@@ -12,10 +12,12 @@ declare class NearWallet extends BaseWallet {
     functionCall: typeof functionCall;
     PublicKey: typeof utils.key_pair.PublicKey;
     utils: typeof utils;
+    init(): Promise<void>;
     /**
      * connect metamask and get wallet address
      * @param chainId specific chainId,throw error when not match
      */
     requestConnect(): Promise<string>;
+    constructor();
 }
 export default NearWallet;

package/lib/Wallets/NearWallet.js

@@ -67,53 +67,91 @@ var BaseWallet_1 = __importDefault(require("./BaseWallet"));
 var near_api_js_1 = require("near-api-js");
 var transaction_1 = require("near-api-js/lib/transaction");
 var utils_1 = require("near-api-js/lib/utils");
-var core_1 = require("@near-wallet-selector/core");
-var near_wallet_1 = require("@near-wallet-selector/near-wallet");
+var helper_1 = require("../helper");
 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 = near_svg_1.default;
-        _this.supportChains = [types_1.EnumChains.NEAR];
+        _this.supportChains = [
+            types_1.EnumChains.NEAR
+        ];
         _this.type = types_1.EnumWalletType.Extension;
         _this.sdk = null;
         _this.createTransaction = transaction_1.createTransaction;
         _this.functionCall = transaction_1.functionCall;
         _this.PublicKey = utils_1.PublicKey;
         _this.utils = near_api_js_1.utils;
+        _this.init();
         return _this;
     }
+    NearWallet.prototype.init = function () {
+        return __awaiter(this, void 0, void 0, function () {
+            var account_id, query, vars, i, pair;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        if (window.localStorage.getItem('connectwallet') !== this.name) {
+                            return [2 /*return*/];
+                        }
+                        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];
+                        return [4 /*yield*/, this.requestConnect()];
+                    case 1:
+                        _a.sent();
+                        _a.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 nearWallet, selector, wallet, accounts;
+            var wallet, account;
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0:
-                        nearWallet = (0, near_wallet_1.setupNearWallet)();
-                        return [4 /*yield*/, (0, core_1.setupWalletSelector)({
-                                network: "mainnet",
-                                debug: true,
-                                modules: [nearWallet],
-                            })];
+                    case 0: return [4 /*yield*/, (0, helper_1.sleep)(1000)];
                     case 1:
-                        selector = _a.sent();
-                        return [4 /*yield*/, selector.wallet("near-wallet")];
+                        _a.sent();
+                        window.localStorage.setItem('connectwallet', this.name);
+                        return [4 /*yield*/, (0, near_api_js_1.connect)({
+                                networkId: "mainnet",
+                                keyStore: new near_api_js_1.keyStores.BrowserLocalStorageKeyStore(),
+                                nodeUrl: "https://rpc.mainnet.near.org",
+                                walletUrl: "https://wallet.mainnet.near.org",
+                                helperUrl: "https://helper.mainnet.near.org",
+                                headers: {}
+                                // explorerUrl: "https://explorer.mainnet.near.org",
+                            })];
                     case 2:
                         wallet = _a.sent();
-                        return [4 /*yield*/, wallet.signIn({
-                                contractId: "a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48.factory.bridge.near",
-                                accounts: []
+                        this.sdk = new near_api_js_1.WalletConnection(wallet, 'OpenOcean');
+                        account = this.sdk.account();
+                        if (!!account.accountId) return [3 /*break*/, 4];
+                        return [4 /*yield*/, this.sdk.requestSignIn({
+                                contractId: 'a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48.factory.bridge.near',
+                                methodNames: [], // optional
                             })];
                     case 3:
-                        accounts = _a.sent();
-                        this.sdk = wallet;
-                        this.address = accounts && accounts[0] && accounts[0].accountId || "";
-                        return [2 /*return*/, this.address || ""];
+                        _a.sent();
+                        _a.label = 4;
+                    case 4:
+                        account = this.sdk.account();
+                        this.address = account.accountId;
+                        return [2 /*return*/, this.address || ''];
                 }
             });
         });

package/lib/Wallets/SenderWallet.js

@@ -94,6 +94,9 @@ var SenderWallet = /** @class */ (function (_super) {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
+                        if (!window.near || !window.near.isSender) {
+                            throw new Error(types_1.EnumErrors.NoSender);
+                        }
                         sender = (0, sender_1.setupSender)();
                         return [4 /*yield*/, (0, core_1.setupWalletSelector)({
                                 network: "mainnet",

package/package.json

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