@openocean.finance/wallet 0.4.47 → 0.4.49

package/lib/Wallets/MetaMask.js

@@ -89,7 +89,8 @@ var MetaMask = /** @class */ (function (_super) {
             types_1.EnumChains.Moonriver,
             types_1.EnumChains.Aurora,
             types_1.EnumChains.Cronos,
-            types_1.EnumChains.Harmony
+            types_1.EnumChains.Harmony,
+            types_1.EnumChains.ONTEVM
         ];
         _this.type = types_1.EnumWalletType.Extension;
         _this.sdk = null;

package/lib/Wallets/NearWallet.d.ts

@@ -1,19 +1,23 @@
 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';
 declare class NearWallet extends BaseWallet {
     name: EnumWalletName;
     icon: any;
     supportChains: EnumChains[];
     type: EnumWalletType;
-    sdk: any | null;
-    private keyStore;
-    private config;
+    sdk: WalletConnection | null;
+    createTransaction: typeof createTransaction;
+    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<any>;
+    requestConnect(): Promise<string>;
     constructor();
 }
 export default NearWallet;

package/lib/Wallets/NearWallet.js

@@ -65,6 +65,8 @@ 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 transaction_1 = require("near-api-js/lib/transaction");
+var utils_1 = require("near-api-js/lib/utils");
 var NearWallet = /** @class */ (function (_super) {
     __extends(NearWallet, _super);
     function NearWallet() {
@@ -76,23 +78,18 @@ var NearWallet = /** @class */ (function (_super) {
         ];
         _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.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, _a;
-            return __generator(this, function (_b) {
-                switch (_b.label) {
+            var account_id, query, vars, i, pair;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
                     case 0:
                         account_id = '';
                         query = window.location.search.substring(1);
@@ -104,11 +101,10 @@ 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*/, this.requestConnect()];
                     case 1:
-                        new (_a.apply(near_api_js_1.WalletConnection, [void 0, _b.sent(), 'openOcen']))();
-                        _b.label = 2;
+                        _a.sent();
+                        _a.label = 2;
                     case 2: return [2 /*return*/];
                 }
             });
@@ -120,25 +116,34 @@ var NearWallet = /** @class */ (function (_super) {
      */
     NearWallet.prototype.requestConnect = function () {
         return __awaiter(this, void 0, void 0, function () {
-            var near, account, address;
+            var wallet, account;
             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*/, (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 1:
-                        near = _a.sent();
-                        this.sdk = new near_api_js_1.WalletConnection(near, 'openOcen');
-                        if (!this.sdk._authData.accountId) {
-                            this.sdk.requestSignIn({
-                                contractId: 'v2.ref-farming.near',
+                        wallet = _a.sent();
+                        this.sdk = new near_api_js_1.WalletConnection(wallet, 'openOcen');
+                        account = this.sdk.account();
+                        if (!!account.accountId) return [3 /*break*/, 3];
+                        return [4 /*yield*/, this.sdk.requestSignIn({
+                                contractId: 'a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48.factory.bridge.near',
                                 methodNames: [], // optional
-                                // successUrl: 'http://localhost:12345/', // optional
-                                // failureUrl: 'http://localhost:12345?key=error' // optional
-                            });
-                        }
+                            })];
+                    case 2:
+                        _a.sent();
+                        _a.label = 3;
+                    case 3:
                         account = this.sdk.account();
-                        address = account.accountId;
-                        this.address = address;
-                        return [2 /*return*/, address];
+                        this.address = account.accountId;
+                        return [2 /*return*/, this.address || ''];
                 }
             });
         });

package/lib/Wallets/OntoWallet.js

@@ -71,7 +71,7 @@ var OntoWallet = /** @class */ (function (_super) {
         var _this = _super !== null && _super.apply(this, arguments) || this;
         _this.name = types_1.EnumWalletName.OntoWallet;
         _this.icon = onto_svg_1.default;
-        _this.supportChains = [types_1.EnumChains.ETH, types_1.EnumChains.BSC, types_1.EnumChains.OKEX, types_1.EnumChains.Polygon, types_1.EnumChains.HECO, types_1.EnumChains.Arbitrum, types_1.EnumChains.Avalanche];
+        _this.supportChains = [types_1.EnumChains.ETH, types_1.EnumChains.BSC, types_1.EnumChains.OKEX, types_1.EnumChains.Polygon, types_1.EnumChains.HECO, types_1.EnumChains.Arbitrum, types_1.EnumChains.Avalanche, types_1.EnumChains.ONTEVM];
         _this.type = types_1.EnumWalletType.Extension;
         _this.sdk = null;
         _this.installUrl = "https://chrome.google.com/webstore/detail/onto-wallet/ifckdpamphokdglkkdomedpdegcjhjdp";

package/lib/types.d.ts

@@ -14,6 +14,7 @@ export declare enum EnumChains {
     ROPSTEN = "ropsten",
     RINKEBY = "rinkeby",
     ONT = "ont",
+    ONTEVM = "ontevm",
     BSC = "bsc",
     BSCTEST = "bsctest",
     TRON = "tron",

package/lib/types.js

@@ -14,6 +14,7 @@ var EnumChains;
     EnumChains["ROPSTEN"] = "ropsten";
     EnumChains["RINKEBY"] = "rinkeby";
     EnumChains["ONT"] = "ont";
+    EnumChains["ONTEVM"] = "ontevm";
     EnumChains["BSC"] = "bsc";
     EnumChains["BSCTEST"] = "bsctest";
     EnumChains["TRON"] = "tron";

package/package.json

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