@openocean.finance/wallet 1.7.9 → 1.8.0

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.
@@ -62,6 +62,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
62
62
  */
63
63
  // @ts-ignore
64
64
  var rabby_svg_1 = __importDefault(require("../assets/rabby.svg"));
65
+ var helper_1 = require("../helper");
65
66
  var types_1 = require("../types");
66
67
  var BaseWallet_1 = __importDefault(require("./BaseWallet"));
67
68
  var web3_1 = __importDefault(require("web3"));
@@ -94,19 +95,23 @@ var RabbyWallet = /** @class */ (function (_super) {
94
95
  */
95
96
  RabbyWallet.prototype.requestConnect = function (chainId) {
96
97
  return __awaiter(this, void 0, void 0, function () {
97
- var address, currentChainId;
98
+ var result, address, currentChainId;
98
99
  return __generator(this, function (_a) {
99
100
  switch (_a.label) {
100
- case 0:
101
- if (!(window.ethereum || (web3_1.default && web3_1.default.givenProvider))) {
101
+ case 0: return [4 /*yield*/, (0, helper_1.autoWalletCheck)(function () {
102
+ return window.rabby;
103
+ }, 3000)];
104
+ case 1:
105
+ result = _a.sent();
106
+ if (!result) {
102
107
  throw new Error(types_1.EnumErrors.NoRabbyWallet);
103
108
  }
104
- this.sdk = new web3_1.default(web3_1.default.givenProvider || window.ethereum);
109
+ this.sdk = new web3_1.default(window.rabby);
105
110
  return [4 /*yield*/, this.sdk.eth.requestAccounts()];
106
- case 1:
111
+ case 2:
107
112
  address = (_a.sent())[0];
108
113
  return [4 /*yield*/, this.sdk.eth.getChainId()];
109
- case 2:
114
+ case 3:
110
115
  currentChainId = _a.sent();
111
116
  if (chainId && currentChainId !== chainId) {
112
117
  throw new Error(types_1.EnumErrors.ChainIdNotMath);
Binary file
package/lib/types.js CHANGED
@@ -58,14 +58,14 @@ var EnumChains;
58
58
  EnumChains["PulseChain"] = "pulse";
59
59
  EnumChains["MerlinChain"] = "merlin";
60
60
  EnumChains["Rootstock"] = "rootstock";
61
- })(EnumChains = exports.EnumChains || (exports.EnumChains = {}));
61
+ })(EnumChains || (exports.EnumChains = EnumChains = {}));
62
62
  var EnumWalletType;
63
63
  (function (EnumWalletType) {
64
64
  EnumWalletType["Extension"] = "Extension";
65
65
  EnumWalletType["WalletConnect"] = "WalletConnect";
66
66
  EnumWalletType["Web"] = "Web";
67
67
  EnumWalletType["Mobile"] = "Mobile";
68
- })(EnumWalletType = exports.EnumWalletType || (exports.EnumWalletType = {}));
68
+ })(EnumWalletType || (exports.EnumWalletType = EnumWalletType = {}));
69
69
  var EnumWalletName;
70
70
  (function (EnumWalletName) {
71
71
  EnumWalletName["NearWallet"] = "NearWallet";
@@ -118,7 +118,7 @@ var EnumWalletName;
118
118
  EnumWalletName["BlockWallet"] = "BlockWallet";
119
119
  EnumWalletName["HaHaWallet"] = "HaHa Wallet";
120
120
  EnumWalletName["ZerionWallet"] = "Zerion Wallet";
121
- })(EnumWalletName = exports.EnumWalletName || (exports.EnumWalletName = {}));
121
+ })(EnumWalletName || (exports.EnumWalletName = EnumWalletName = {}));
122
122
  var EnumErrors;
123
123
  (function (EnumErrors) {
124
124
  EnumErrors["NotMetamask"] = "40001";
@@ -166,4 +166,4 @@ var EnumErrors;
166
166
  EnumErrors["NoFewcha"] = "40045";
167
167
  EnumErrors["NoBlockWallet"] = "40046";
168
168
  EnumErrors["NotZerion"] = "40047";
169
- })(EnumErrors = exports.EnumErrors || (exports.EnumErrors = {}));
169
+ })(EnumErrors || (exports.EnumErrors = EnumErrors = {}));
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@openocean.finance/wallet",
3
- "version": "1.7.9",
3
+ "version": "1.8.0",
4
4
  "description": "A multi-chain wallets manager",
5
5
  "main": "lib/index.js",
6
6
  "scripts": {