@openocean.finance/wallet 1.10.61 → 1.10.62

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 (13) hide show
  1. package/lib/Wallets/BlockWallet.js +5 -3
  2. package/lib/Wallets/Coin98.js +6 -7
  3. package/lib/Wallets/MathWallet.js +5 -3
  4. package/lib/Wallets/MetaMask.js +1 -1
  5. package/lib/Wallets/OntoMobile.js +2 -2
  6. package/lib/Wallets/TokenPocket.js +5 -3
  7. package/lib/Wallets/ZerionWallet.js +5 -3
  8. package/lib/Wallets/index.js +4 -4
  9. package/lib/index.d.ts +1 -2
  10. package/lib/index.js +3 -4
  11. package/lib/injectedTargets.d.ts +1 -1
  12. package/lib/injectedTargets.js +15 -3
  13. package/package.json +1 -1
package/lib/Wallets/BlockWallet.js CHANGED
@@ -65,6 +65,7 @@ var blockwallet_png_1 = __importDefault(require("../assets/blockwallet.png"));
65
65
  var types_1 = require("../types");
66
66
  var BaseWallet_1 = __importDefault(require("./BaseWallet"));
67
67
  var web3_1 = __importDefault(require("web3"));
68
+ var injectedTargets_1 = require("../injectedTargets");
68
69
  var BlockWallet = /** @class */ (function (_super) {
69
70
  __extends(BlockWallet, _super);
70
71
  function BlockWallet() {
@@ -96,14 +97,15 @@ var BlockWallet = /** @class */ (function (_super) {
96
97
  */
97
98
  BlockWallet.prototype.requestConnect = function (chainId) {
98
99
  return __awaiter(this, void 0, void 0, function () {
99
- var address, currentChainId;
100
+ var provider, address, currentChainId;
100
101
  return __generator(this, function (_a) {
101
102
  switch (_a.label) {
102
103
  case 0:
103
- if (!(window.ethereum && window.ethereum.isBlockWallet)) {
104
+ provider = (0, injectedTargets_1.getEthereumProvider)('blockwallet');
105
+ if (!provider) {
104
106
  throw new Error(types_1.EnumErrors.NoBlockWallet);
105
107
  }
106
- this.sdk = new web3_1.default(window.ethereum);
108
+ this.sdk = new web3_1.default(provider);
107
109
  return [4 /*yield*/, this.sdk.eth.requestAccounts()];
108
110
  case 1:
109
111
  address = (_a.sent())[0];
package/lib/Wallets/Coin98.js CHANGED
@@ -66,6 +66,7 @@ var types_1 = require("../types");
66
66
  var BaseWallet_1 = __importDefault(require("./BaseWallet"));
67
67
  var web3_1 = __importDefault(require("web3"));
68
68
  var helper_1 = require("../helper");
69
+ var injectedTargets_1 = require("../injectedTargets");
69
70
  var Coin98 = /** @class */ (function (_super) {
70
71
  __extends(Coin98, _super);
71
72
  function Coin98() {
@@ -100,16 +101,15 @@ var Coin98 = /** @class */ (function (_super) {
100
101
  */
101
102
  Coin98.prototype.requestConnect = function (chainId) {
102
103
  return __awaiter(this, void 0, void 0, function () {
103
- var address, currentChainId;
104
+ var provider, address, currentChainId;
104
105
  return __generator(this, function (_a) {
105
106
  switch (_a.label) {
106
107
  case 0:
107
- if (!(window.ethereum.isCoin98 || window.coin98)) {
108
- // go2 download page
108
+ provider = (0, injectedTargets_1.getEthereumProvider)('coin98');
109
+ if (!provider) {
109
110
  throw new Error(types_1.EnumErrors.NoCoin98);
110
111
  }
111
- // this.sdk = new Web3(window.coin98.provider);
112
- this.sdk = new web3_1.default(window.ethereum);
112
+ this.sdk = new web3_1.default(provider);
113
113
  return [4 /*yield*/, this.sdk.eth.requestAccounts()];
114
114
  case 1:
115
115
  address = (_a.sent())[0];
@@ -136,8 +136,7 @@ var Coin98 = /** @class */ (function (_super) {
136
136
  return __generator(this, function (_a) {
137
137
  switch (_a.label) {
138
138
  case 0: return [4 /*yield*/, (0, helper_1.autoWalletCheck)(function () {
139
- return ((window.ethereum && window.ethereum.isCoin98) ||
140
- (window.coin98 && window.coin98.sol));
139
+ return window.coin98 && window.coin98.sol;
141
140
  }, 3000)];
142
141
  case 1:
143
142
  result = _a.sent();
package/lib/Wallets/MathWallet.js CHANGED
@@ -65,6 +65,7 @@ var math_svg_1 = __importDefault(require("../assets/math.svg"));
65
65
  var types_1 = require("../types");
66
66
  var BaseWallet_1 = __importDefault(require("./BaseWallet"));
67
67
  var web3_1 = __importDefault(require("web3"));
68
+ var injectedTargets_1 = require("../injectedTargets");
68
69
  var MathWallet = /** @class */ (function (_super) {
69
70
  __extends(MathWallet, _super);
70
71
  function MathWallet() {
@@ -93,14 +94,15 @@ var MathWallet = /** @class */ (function (_super) {
93
94
  */
94
95
  MathWallet.prototype.requestConnect = function (chainId) {
95
96
  return __awaiter(this, void 0, void 0, function () {
96
- var address, currentChainId;
97
+ var provider, address, currentChainId;
97
98
  return __generator(this, function (_a) {
98
99
  switch (_a.label) {
99
100
  case 0:
100
- if (!(window.ethereum && window.ethereum.isMathWallet)) {
101
+ provider = (0, injectedTargets_1.getEthereumProvider)('mathwallet');
102
+ if (!provider) {
101
103
  throw new Error(types_1.EnumErrors.NoMath);
102
104
  }
103
- this.sdk = new web3_1.default(window.ethereum);
105
+ this.sdk = new web3_1.default(provider);
104
106
  return [4 /*yield*/, this.sdk.eth.requestAccounts()];
105
107
  case 1:
106
108
  address = (_a.sent())[0];
package/lib/Wallets/MetaMask.js CHANGED
@@ -143,7 +143,7 @@ var MetaMask = /** @class */ (function (_super) {
143
143
  return __generator(this, function (_a) {
144
144
  switch (_a.label) {
145
145
  case 0:
146
- provider = (0, injectedTargets_1.getMetaMaskProvider)();
146
+ provider = (0, injectedTargets_1.getEthereumProvider)('metamask');
147
147
  if (!provider) {
148
148
  throw new Error(types_1.EnumErrors.NotMetamask);
149
149
  }
package/lib/Wallets/OntoMobile.js CHANGED
@@ -86,10 +86,10 @@ var OntoMobile = /** @class */ (function (_super) {
86
86
  return __generator(this, function (_a) {
87
87
  switch (_a.label) {
88
88
  case 0:
89
- if (!(window.ethereum && window.ethereum.isONTO)) {
89
+ if (!window.onto) {
90
90
  throw new Error(types_1.EnumErrors.NoOnto);
91
91
  }
92
- this.sdk = new web3_1.default(window.ethereum);
92
+ this.sdk = new web3_1.default(window.onto);
93
93
  return [4 /*yield*/, this.sdk.eth.getChainId()];
94
94
  case 1:
95
95
  currentChainId = _a.sent();
package/lib/Wallets/TokenPocket.js CHANGED
@@ -65,6 +65,7 @@ var tokenpocket_svg_1 = __importDefault(require("../assets/tokenpocket.svg"));
65
65
  var types_1 = require("../types");
66
66
  var BaseWallet_1 = __importDefault(require("./BaseWallet"));
67
67
  var web3_1 = __importDefault(require("web3"));
68
+ var injectedTargets_1 = require("../injectedTargets");
68
69
  var TokenPocket = /** @class */ (function (_super) {
69
70
  __extends(TokenPocket, _super);
70
71
  function TokenPocket() {
@@ -83,14 +84,15 @@ var TokenPocket = /** @class */ (function (_super) {
83
84
  */
84
85
  TokenPocket.prototype.requestConnect = function (chainId) {
85
86
  return __awaiter(this, void 0, void 0, function () {
86
- var address, currentChainId;
87
+ var provider, address, currentChainId;
87
88
  return __generator(this, function (_a) {
88
89
  switch (_a.label) {
89
90
  case 0:
90
- if (!(window.ethereum && window.ethereum.isTokenPocket)) {
91
+ provider = (0, injectedTargets_1.getEthereumProvider)('tokenpocket');
92
+ if (!provider) {
91
93
  throw new Error(types_1.EnumErrors.NoTokenPocket);
92
94
  }
93
- this.sdk = new web3_1.default(window.ethereum);
95
+ this.sdk = new web3_1.default(provider);
94
96
  return [4 /*yield*/, this.sdk.eth.requestAccounts()];
95
97
  case 1:
96
98
  address = (_a.sent())[0];
package/lib/Wallets/ZerionWallet.js CHANGED
@@ -65,6 +65,7 @@ var zerionWallet_png_1 = __importDefault(require("../assets/zerionWallet.png"));
65
65
  var types_1 = require("../types");
66
66
  var BaseWallet_1 = __importDefault(require("./BaseWallet"));
67
67
  var web3_1 = __importDefault(require("web3"));
68
+ var injectedTargets_1 = require("../injectedTargets");
68
69
  var ZerionWallet = /** @class */ (function (_super) {
69
70
  __extends(ZerionWallet, _super);
70
71
  function ZerionWallet() {
@@ -99,14 +100,15 @@ var ZerionWallet = /** @class */ (function (_super) {
99
100
  */
100
101
  ZerionWallet.prototype.requestConnect = function (chainId) {
101
102
  return __awaiter(this, void 0, void 0, function () {
102
- var address, currentChainId;
103
+ var provider, address, currentChainId;
103
104
  return __generator(this, function (_a) {
104
105
  switch (_a.label) {
105
106
  case 0:
106
- if (!window.ethereum || !(window.ethereum.isZerion || window.ethereum.isZerion === undefined)) {
107
+ provider = (0, injectedTargets_1.getEthereumProvider)('zerion');
108
+ if (!provider) {
107
109
  throw new Error(types_1.EnumErrors.NoZerion);
108
110
  }
109
- this.sdk = new web3_1.default(window.ethereum);
111
+ this.sdk = new web3_1.default(provider);
110
112
  return [4 /*yield*/, this.sdk.eth.requestAccounts()];
111
113
  case 1:
112
114
  address = (_a.sent())[0];
package/lib/Wallets/index.js CHANGED
@@ -33,7 +33,7 @@ var CryptoCom_1 = __importDefault(require("./CryptoCom"));
33
33
  // import NearWallet from './NearWallet';
34
34
  var BitgetWallet_1 = __importDefault(require("./BitgetWallet"));
35
35
  var GnosisSafeWallet_1 = __importDefault(require("./GnosisSafeWallet"));
36
- var BloctoWallet_1 = __importDefault(require("./BloctoWallet"));
36
+ // import BloctoWallet from './BloctoWallet';
37
37
  var PetraWallet_1 = __importDefault(require("./PetraWallet"));
38
38
  var MartianWallet_1 = __importDefault(require("./MartianWallet"));
39
39
  var PontemWallet_1 = __importDefault(require("./PontemWallet"));
@@ -47,7 +47,7 @@ var RabbyWallet_1 = __importDefault(require("./RabbyWallet"));
47
47
  var ArgentX_1 = __importDefault(require("./ArgentX"));
48
48
  var Braavos_1 = __importDefault(require("./Braavos"));
49
49
  var PlenaWallet_1 = __importDefault(require("./PlenaWallet"));
50
- var Krystal_1 = __importDefault(require("./Krystal"));
50
+ // import Krystal from './Krystal';
51
51
  var Risewallet_1 = __importDefault(require("./Risewallet"));
52
52
  var Fewcha_1 = __importDefault(require("./Fewcha"));
53
53
  var BlockWallet_1 = __importDefault(require("./BlockWallet"));
@@ -94,7 +94,7 @@ var WalletObj = {
94
94
  GnosisSafeWallet: new GnosisSafeWallet_1.default(),
95
95
  // SlopeWallet: new SlopeWallet(),
96
96
  KeplrWallet: new KeplrWallet_1.default(),
97
- BloctoWallet: new BloctoWallet_1.default(),
97
+ // BloctoWallet: new BloctoWallet(),
98
98
  PetraWallet: new PetraWallet_1.default(),
99
99
  MartianWallet: new MartianWallet_1.default(),
100
100
  PontemWallet: new PontemWallet_1.default(),
@@ -102,7 +102,7 @@ var WalletObj = {
102
102
  MyNearWallet: new MyNearWallet_1.default(),
103
103
  MeteorWallet: new MeteorWallet_1.default(),
104
104
  SenderWallet: new SenderWallet_1.default(),
105
- Krystal: new Krystal_1.default(),
105
+ // Krystal: new Krystal(),
106
106
  Risewallet: new Risewallet_1.default(),
107
107
  Fewcha: new Fewcha_1.default(),
108
108
  BlockWallet: new BlockWallet_1.default(),
package/lib/index.d.ts CHANGED
@@ -39,7 +39,6 @@ import MeteorWallet from "./Wallets/MeteorWallet";
39
39
  import SenderWallet from "./Wallets/SenderWallet";
40
40
  import LedgerWallet from "./Wallets/LedgerWallet";
41
41
  import LedgerEmbedWallet from "./Wallets/LedgerEmbedWallet";
42
- import PlenaWallet from './Wallets/PlenaWallet';
43
42
  import Krystal from './Wallets/Krystal';
44
43
  import Risewallet from './Wallets/Risewallet';
45
44
  import Fewcha from './Wallets/Fewcha';
@@ -54,4 +53,4 @@ import { getSidName, tryWalletConnect, ReqConnectWalletVo } from "./TryWalletCon
54
53
  import { chainsObj, Chains, Chain } from "./Chains";
55
54
  import { walletsObj, Wallets } from "./Wallets/index";
56
55
  import solanaWeb3 from "@solana/web3.js";
57
- export { solanaWeb3, chainsObj, Chains, Chain, walletsObj, Wallets, ReqConnectWalletVo, tryWalletConnect, getSidName, EnumChains, EnumWalletName, BaseWallet, MetaMask, 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, CompassWallet, OKXBtcWallet, UnisatWallet, SlushWallet, SuietWallet, };
56
+ export { solanaWeb3, chainsObj, Chains, Chain, walletsObj, Wallets, ReqConnectWalletVo, tryWalletConnect, getSidName, EnumChains, EnumWalletName, BaseWallet, MetaMask, 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, Krystal, Risewallet, Fewcha, ZerionWallet, CompassWallet, OKXBtcWallet, UnisatWallet, SlushWallet, SuietWallet, };
package/lib/index.js CHANGED
@@ -3,8 +3,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
3
3
  return (mod && mod.__esModule) ? mod : { "default": mod };
4
4
  };
5
5
  Object.defineProperty(exports, "__esModule", { value: true });
6
- exports.CompassWallet = 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.MetaMask = exports.BaseWallet = exports.EnumWalletName = exports.EnumChains = exports.getSidName = exports.tryWalletConnect = exports.Wallets = exports.walletsObj = exports.Chains = exports.chainsObj = exports.solanaWeb3 = void 0;
7
- exports.SuietWallet = exports.SlushWallet = exports.UnisatWallet = exports.OKXBtcWallet = void 0;
6
+ exports.OKXBtcWallet = exports.CompassWallet = exports.ZerionWallet = exports.Fewcha = exports.Risewallet = exports.Krystal = 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.MetaMask = exports.BaseWallet = exports.EnumWalletName = exports.EnumChains = exports.getSidName = exports.tryWalletConnect = exports.Wallets = exports.walletsObj = exports.Chains = exports.chainsObj = exports.solanaWeb3 = void 0;
7
+ exports.SuietWallet = exports.SlushWallet = exports.UnisatWallet = void 0;
8
8
  /**
9
9
  * wallets-manager entry
10
10
  * @author openocean
@@ -86,8 +86,7 @@ var LedgerWallet_1 = __importDefault(require("./Wallets/LedgerWallet"));
86
86
  exports.LedgerWallet = LedgerWallet_1.default;
87
87
  var LedgerEmbedWallet_1 = __importDefault(require("./Wallets/LedgerEmbedWallet"));
88
88
  exports.LedgerEmbedWallet = LedgerEmbedWallet_1.default;
89
- var PlenaWallet_1 = __importDefault(require("./Wallets/PlenaWallet"));
90
- exports.PlenaWallet = PlenaWallet_1.default;
89
+ // import PlenaWallet from './Wallets/PlenaWallet';
91
90
  var Krystal_1 = __importDefault(require("./Wallets/Krystal"));
92
91
  exports.Krystal = Krystal_1.default;
93
92
  var Risewallet_1 = __importDefault(require("./Wallets/Risewallet"));
package/lib/injectedTargets.d.ts CHANGED
@@ -6,4 +6,4 @@ export interface InjectedTarget {
6
6
  }
7
7
  /** EIP-6963:announceProvider */
8
8
  export declare function setupEip6963Listener(): void;
9
- export declare function getMetaMaskProvider(): any;
9
+ export declare function getEthereumProvider(id: string): any;
package/lib/injectedTargets.js CHANGED
@@ -1,7 +1,7 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.setupEip6963Listener = setupEip6963Listener;
4
- exports.getMetaMaskProvider = getMetaMaskProvider;
4
+ exports.getEthereumProvider = getEthereumProvider;
5
5
  var targetMap = {};
6
6
  function addTarget(target) {
7
7
  targetMap[target.id] = target;
@@ -24,6 +24,18 @@ function setupEip6963Listener() {
24
24
  id = "rabby";
25
25
  else if (name.includes("phantom") || rdns.includes("phantom"))
26
26
  id = "phantom";
27
+ else if (name.includes("coin98") || rdns.includes("coin98"))
28
+ id = "coin98";
29
+ else if (name.includes("OKX") || rdns.includes("okex"))
30
+ id = "okex";
31
+ else if (name.includes("BlockWallet") || rdns.includes("blockwallet"))
32
+ id = "blockwallet";
33
+ else if (name.includes("Zerion") || rdns.includes("zerion"))
34
+ id = "zerion";
35
+ else if (name.includes("MathWallet") || rdns.includes("mathwallet"))
36
+ id = "mathwallet";
37
+ else if (name.includes("TokenPocket") || rdns.includes("tokenpocket"))
38
+ id = "tokenpocket";
27
39
  addTarget({
28
40
  id: id,
29
41
  name: (info === null || info === void 0 ? void 0 : info.name) || id,
@@ -33,7 +45,7 @@ function setupEip6963Listener() {
33
45
  }, { once: false });
34
46
  window.dispatchEvent(new Event("eip6963:requestProvider"));
35
47
  }
36
- function getMetaMaskProvider() {
48
+ function getEthereumProvider(id) {
37
49
  var _a;
38
- return (_a = targetMap['metamask']) === null || _a === void 0 ? void 0 : _a.provider;
50
+ return (_a = targetMap[id]) === null || _a === void 0 ? void 0 : _a.provider;
39
51
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@openocean.finance/wallet",
3
- "version": "1.10.61",
3
+ "version": "1.10.62",
4
4
  "description": "A multi-chain wallets manager",
5
5
  "main": "lib/index.js",
6
6
  "scripts": {