@openocean.finance/wallet 1.7.8 → 1.8.0

package/lib/TryWalletConnect/index.d.ts

@@ -18,4 +18,5 @@ interface ConnectObj {
     localRpcUrl: any;
 }
 declare function tryWalletConnect(reqConnectWalletVo: ReqConnectWalletVo): Promise<ConnectObj>;
-export { tryWalletConnect, ReqConnectWalletVo };
+declare function getSidName(wallet: any): Promise<any>;
+export { getSidName, tryWalletConnect, ReqConnectWalletVo };

package/lib/TryWalletConnect/index.js

@@ -39,7 +39,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.tryWalletConnect = void 0;
+exports.tryWalletConnect = exports.getSidName = void 0;
 var axios = require('axios');
 var NotoMobile_1 = require("./NotoMobile");
 var web3_js_1 = require("@solana/web3.js");
@@ -329,7 +329,7 @@ function linkAddOrSwitch(wallet, chain) {
 }
 function tryWalletConnect(reqConnectWalletVo) {
     return __awaiter(this, void 0, void 0, function () {
-        var chain, wallet, sdk, account, chainId, localProvider, localRpcUrl, sid, name_1, error_2;
+        var chain, wallet, sdk, account, chainId, localProvider, localRpcUrl;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
@@ -363,7 +363,7 @@ function tryWalletConnect(reqConnectWalletVo) {
                 case 5:
                     localProvider = '';
                     localRpcUrl = '';
-                    if (!wallet) return [3 /*break*/, 9];
+                    if (!wallet) return [3 /*break*/, 7];
                     if (reqConnectWalletVo.localRpcUrl) {
                         localProvider = new web3_1.default(new web3_1.default.providers.HttpProvider(reqConnectWalletVo.localRpcUrl));
                         localRpcUrl = reqConnectWalletVo.localRpcUrl;
@@ -386,30 +386,46 @@ function tryWalletConnect(reqConnectWalletVo) {
                             }
                         }
                     }
-                    wallet.sidName = null;
-                    if (!(wallet.chainId == 1 || wallet.chainId == 56 || wallet.chainId == 42161)) return [3 /*break*/, 9];
-                    _a.label = 6;
+                    return [4 /*yield*/, getSidName(wallet)];
                 case 6:
-                    _a.trys.push([6, 8, , 9]);
+                    _a.sent();
+                    _a.label = 7;
+                case 7: return [2 /*return*/, {
+                        wallet: wallet,
+                        chain: chain,
+                        localProvider: localProvider,
+                        localRpcUrl: localRpcUrl
+                    }];
+            }
+        });
+    });
+}
+exports.tryWalletConnect = tryWalletConnect;
+function getSidName(wallet) {
+    return __awaiter(this, void 0, void 0, function () {
+        var sid, name_1, error_2;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    wallet.sidName = null;
+                    if (!(wallet.chainId == 1 || wallet.chainId == 56 || wallet.chainId == 42161)) return [3 /*break*/, 4];
+                    _a.label = 1;
+                case 1:
+                    _a.trys.push([1, 3, , 4]);
                     sid = new SID({ provider: wallet.sdk.currentProvider, sidAddress: SIDfunctions.getSidAddress(wallet.chainId) });
                     return [4 /*yield*/, sid.getName(wallet.address)];
-                case 7:
+                case 2:
                     name_1 = _a.sent();
                     if (name_1.name)
                         wallet.sidName = name_1.name;
-                    return [3 /*break*/, 9];
-                case 8:
+                    return [3 /*break*/, 4];
+                case 3:
                     error_2 = _a.sent();
                     console.error(error_2);
-                    return [3 /*break*/, 9];
-                case 9: return [2 /*return*/, {
-                        wallet: wallet,
-                        chain: chain,
-                        localProvider: localProvider,
-                        localRpcUrl: localRpcUrl
-                    }];
+                    return [3 /*break*/, 4];
+                case 4: return [2 /*return*/, wallet];
             }
         });
     });
 }
-exports.tryWalletConnect = tryWalletConnect;
+exports.getSidName = getSidName;

package/lib/Wallets/Coin98.js

@@ -76,18 +76,18 @@ var Coin98 = /** @class */ (function (_super) {
             types_1.EnumChains.ETH,
             types_1.EnumChains.BSC,
             types_1.EnumChains.Polygon,
-            types_1.EnumChains.HECO,
-            types_1.EnumChains.XDai,
-            types_1.EnumChains.Fantom,
+            // EnumChains.HECO,
+            // EnumChains.XDai,
+            // EnumChains.Fantom,
             types_1.EnumChains.Avalanche,
-            types_1.EnumChains.Arbitrum,
-            types_1.EnumChains.OKEX,
-            types_1.EnumChains.Aurora,
-            types_1.EnumChains.Scroll,
-            types_1.EnumChains.Base,
-            types_1.EnumChains.OpBNB,
-            types_1.EnumChains.Mantle,
-            types_1.EnumChains.Manta
+            // EnumChains.Arbitrum,
+            // EnumChains.OKEX,
+            // EnumChains.Aurora,
+            // EnumChains.Scroll,
+            // EnumChains.Base,
+            // EnumChains.OpBNB,
+            // EnumChains.Mantle,
+            // EnumChains.Manta
         ];
         _this.type = types_1.EnumWalletType.Extension;
         _this.sdk = null;

package/lib/Wallets/RabbyWallet.js

@@ -62,6 +62,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
  */
 // @ts-ignore
 var rabby_svg_1 = __importDefault(require("../assets/rabby.svg"));
+var helper_1 = require("../helper");
 var types_1 = require("../types");
 var BaseWallet_1 = __importDefault(require("./BaseWallet"));
 var web3_1 = __importDefault(require("web3"));
@@ -94,19 +95,23 @@ var RabbyWallet = /** @class */ (function (_super) {
      */
     RabbyWallet.prototype.requestConnect = function (chainId) {
         return __awaiter(this, void 0, void 0, function () {
-            var address, currentChainId;
+            var result, address, currentChainId;
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0:
-                        if (!(window.ethereum || (web3_1.default && web3_1.default.givenProvider))) {
+                    case 0: return [4 /*yield*/, (0, helper_1.autoWalletCheck)(function () {
+                            return window.rabby;
+                        }, 3000)];
+                    case 1:
+                        result = _a.sent();
+                        if (!result) {
                             throw new Error(types_1.EnumErrors.NoRabbyWallet);
                         }
-                        this.sdk = new web3_1.default(web3_1.default.givenProvider || window.ethereum);
+                        this.sdk = new web3_1.default(window.rabby);
                         return [4 /*yield*/, this.sdk.eth.requestAccounts()];
-                    case 1:
+                    case 2:
                         address = (_a.sent())[0];
                         return [4 /*yield*/, this.sdk.eth.getChainId()];
-                    case 2:
+                    case 3:
                         currentChainId = _a.sent();
                         if (chainId && currentChainId !== chainId) {
                             throw new Error(types_1.EnumErrors.ChainIdNotMath);

package/lib/index.d.ts

@@ -46,7 +46,7 @@ import Risewallet from './Wallets/Risewallet';
 import Fewcha from './Wallets/Fewcha';
 import ZerionWallet from './Wallets/ZerionWallet';
 import { EnumChains, EnumWalletName } from "./types";
-import { tryWalletConnect, ReqConnectWalletVo } from "./TryWalletConnect";
+import { getSidName, tryWalletConnect, ReqConnectWalletVo } from "./TryWalletConnect";
 import { chainsObj, Chains, Chain } from "./Chains";
 import { walletsObj, Wallets } from "./Wallets/index";
-export { chainsObj, Chains, Chain, walletsObj, Wallets, ReqConnectWalletVo, tryWalletConnect, EnumChains, EnumWalletName, BaseWallet, MetaMask, BscWallet, Cyano, TronLink, Sollet, SolletIo, OntoMobile, WalletConnect, MathWallet, OntoWallet, SafePalWallet, TokenPocket, TrustWallet, Coin98, Phantom, TerraStation, CoinbaseWallet, CloverWallet, XDEFIWallet, SolflareWallet, OKXWallet, KeplrWallet, BraveWallet, CryptoCom, BitgetWallet, GnosisSafeWallet, PetraWallet, MartianWallet, PontemWallet, UnstoppableDomains, MyNearWallet, MeteorWallet, SenderWallet, LedgerWallet, LedgerEmbedWallet, PlenaWallet, Krystal, Risewallet, Fewcha, ZerionWallet, };
+export { chainsObj, Chains, Chain, walletsObj, Wallets, ReqConnectWalletVo, tryWalletConnect, getSidName, EnumChains, EnumWalletName, BaseWallet, MetaMask, BscWallet, Cyano, TronLink, Sollet, SolletIo, OntoMobile, WalletConnect, MathWallet, OntoWallet, SafePalWallet, TokenPocket, TrustWallet, Coin98, Phantom, TerraStation, CoinbaseWallet, CloverWallet, XDEFIWallet, SolflareWallet, OKXWallet, KeplrWallet, BraveWallet, CryptoCom, BitgetWallet, GnosisSafeWallet, PetraWallet, MartianWallet, PontemWallet, UnstoppableDomains, MyNearWallet, MeteorWallet, SenderWallet, LedgerWallet, LedgerEmbedWallet, PlenaWallet, Krystal, Risewallet, Fewcha, ZerionWallet, };

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.ZerionWallet = exports.Fewcha = exports.Risewallet = exports.Krystal = exports.PlenaWallet = exports.LedgerEmbedWallet = exports.LedgerWallet = exports.SenderWallet = exports.MeteorWallet = exports.MyNearWallet = exports.UnstoppableDomains = exports.PontemWallet = exports.MartianWallet = exports.PetraWallet = exports.GnosisSafeWallet = exports.BitgetWallet = exports.CryptoCom = exports.BraveWallet = exports.KeplrWallet = exports.OKXWallet = exports.SolflareWallet = exports.XDEFIWallet = exports.CloverWallet = exports.CoinbaseWallet = exports.TerraStation = exports.Phantom = exports.Coin98 = exports.TrustWallet = exports.TokenPocket = exports.SafePalWallet = exports.OntoWallet = exports.MathWallet = exports.WalletConnect = exports.OntoMobile = exports.SolletIo = exports.Sollet = exports.TronLink = exports.Cyano = exports.BscWallet = exports.MetaMask = exports.BaseWallet = exports.EnumWalletName = exports.EnumChains = exports.tryWalletConnect = exports.Wallets = exports.walletsObj = exports.Chains = exports.chainsObj = void 0;
+exports.ZerionWallet = exports.Fewcha = exports.Risewallet = exports.Krystal = exports.PlenaWallet = exports.LedgerEmbedWallet = exports.LedgerWallet = exports.SenderWallet = exports.MeteorWallet = exports.MyNearWallet = exports.UnstoppableDomains = exports.PontemWallet = exports.MartianWallet = exports.PetraWallet = exports.GnosisSafeWallet = exports.BitgetWallet = exports.CryptoCom = exports.BraveWallet = exports.KeplrWallet = exports.OKXWallet = exports.SolflareWallet = exports.XDEFIWallet = exports.CloverWallet = exports.CoinbaseWallet = exports.TerraStation = exports.Phantom = exports.Coin98 = exports.TrustWallet = exports.TokenPocket = exports.SafePalWallet = exports.OntoWallet = exports.MathWallet = exports.WalletConnect = exports.OntoMobile = exports.SolletIo = exports.Sollet = exports.TronLink = exports.Cyano = exports.BscWallet = exports.MetaMask = exports.BaseWallet = exports.EnumWalletName = exports.EnumChains = exports.getSidName = exports.tryWalletConnect = exports.Wallets = exports.walletsObj = exports.Chains = exports.chainsObj = void 0;
 /**
  * wallets-manager entry
  * @author openocean
@@ -100,6 +100,7 @@ var types_1 = require("./types");
 Object.defineProperty(exports, "EnumChains", { enumerable: true, get: function () { return types_1.EnumChains; } });
 Object.defineProperty(exports, "EnumWalletName", { enumerable: true, get: function () { return types_1.EnumWalletName; } });
 var TryWalletConnect_1 = require("./TryWalletConnect");
+Object.defineProperty(exports, "getSidName", { enumerable: true, get: function () { return TryWalletConnect_1.getSidName; } });
 Object.defineProperty(exports, "tryWalletConnect", { enumerable: true, get: function () { return TryWalletConnect_1.tryWalletConnect; } });
 var Chains_1 = require("./Chains");
 Object.defineProperty(exports, "chainsObj", { enumerable: true, get: function () { return Chains_1.chainsObj; } });

package/package.json

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