@openocean.finance/wallet 1.5.44 → 1.5.45

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 (6) hide show
  1. package/lib/Chains.d.ts +1 -1
  2. package/lib/Chains.js +1 -1
  3. package/lib/TryWalletConnect/index.js +1 -0
  4. package/lib/Wallets/WalletConnect.js +13 -15
  5. package/lib/types.js +4 -4
  6. package/package.json +2 -1
package/lib/Chains.d.ts CHANGED
@@ -11,7 +11,7 @@ interface Chain {
11
11
  declare class Chains {
12
12
  chainObj: any;
13
13
  chainList: Chain[];
14
- chainIds: String[];
14
+ chainIds: any[];
15
15
  chainNames: String[];
16
16
  chainApproveNames: String[];
17
17
  constructor();
package/lib/Chains.js CHANGED
@@ -42,7 +42,7 @@ var chainObj = {
42
42
  chainName: "Binance Smart Chain", chainId: 56, blockExplorerUrl: "https://bscscan.com/tx/",
43
43
  popularToken: ["BNB", "USDT", "BUSD", "CAKE", "C98", "BAKE", "MBOX"],
44
44
  nativeCurrency: { name: "BNB", symbol: "BNB", decimals: 18, address: "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE" },
45
- rpcUrls: ["https://bsc-dataseed1.binance.org/"],
45
+ rpcUrls: ["https://1rpc.io/bnb", "https://bsc-dataseed1.binance.org/"],
46
46
  compiler: 'EVM',
47
47
  },
48
48
  "solana": {
package/lib/TryWalletConnect/index.js CHANGED
@@ -88,6 +88,7 @@ function link(reqConnectWalletVo, chain) {
88
88
  _c.trys.push([1, 28, , 32]);
89
89
  if (!(wallet.type === 'WalletConnect')) return [3 /*break*/, 3];
90
90
  return [4 /*yield*/, wallet.requestConnect(chainId, {
91
+ chainsObj: Chains_1.chainsObj,
91
92
  projectId: reqConnectWalletVo.projectId
92
93
  })];
93
94
  case 2:
package/lib/Wallets/WalletConnect.js CHANGED
@@ -113,25 +113,26 @@ var WalletConnect = /** @class */ (function (_super) {
113
113
  WalletConnect.prototype.requestConnect = function (chainId, config) {
114
114
  if (chainId === void 0) { chainId = 1; }
115
115
  return __awaiter(this, void 0, void 0, function () {
116
- var qrModalOptions, provider, currentChainId, address;
116
+ var rpcMap, provider, currentChainId, address;
117
117
  return __generator(this, function (_a) {
118
118
  switch (_a.label) {
119
119
  case 0:
120
- // if (!this.infuraId) {
121
- // throw new Error("infuraId not set");
122
- // }
123
- alert(chainId);
120
+ rpcMap = {};
121
+ this.supportChains.forEach(function (i) {
122
+ var chain = config.chainsObj.chainObj[i];
123
+ rpcMap[chain.chainId] = chain.rpcUrls[0];
124
+ });
124
125
  console.log('chainId', chainId);
125
- qrModalOptions = {
126
- themeVariables: {
127
- '--wcm-z-index': '99999',
128
- }
129
- };
126
+ console.log(rpcMap);
127
+ console.log(config.chainsObj.chainIds);
130
128
  return [4 /*yield*/, ethereum_provider_1.EthereumProvider.init({
131
129
  projectId: config && config.projectId ? config.projectId : 'c1ca7adc83e89c7e7848440702f28f38',
132
- chains: [chainId],
133
130
  showQrModal: true,
134
- qrModalOptions: qrModalOptions
131
+ // qrModalOptions,
132
+ chains: [chainId],
133
+ optionalChains: config.chainsObj.chainIds,
134
+ rpcMap: rpcMap,
135
+ optionalMethods: ['wallet_addEthereumChain', 'wallet_switchEthereumChain']
135
136
  })];
136
137
  case 1:
137
138
  provider = _a.sent();
@@ -144,9 +145,7 @@ var WalletConnect = /** @class */ (function (_super) {
144
145
  return [4 /*yield*/, this.sdk.eth.getChainId()];
145
146
  case 3:
146
147
  currentChainId = _a.sent();
147
- alert(currentChainId + '--' + chainId);
148
148
  if (chainId && currentChainId != chainId) {
149
- alert('changer');
150
149
  throw new Error(types_1.EnumErrors.ChainIdNotMath);
151
150
  }
152
151
  return [4 /*yield*/, this.sdk.eth.getAccounts()];
@@ -154,7 +153,6 @@ var WalletConnect = /** @class */ (function (_super) {
154
153
  address = (_a.sent())[0];
155
154
  this.address = address;
156
155
  this.chainId = currentChainId;
157
- alert(address);
158
156
  return [2 /*return*/, address];
159
157
  }
160
158
  });
package/lib/types.js CHANGED
@@ -52,14 +52,14 @@ var EnumChains;
52
52
  EnumChains["OpBNB"] = "opbnb";
53
53
  EnumChains["Mantle"] = "mantle";
54
54
  EnumChains["Manta"] = "manta";
55
- })(EnumChains || (exports.EnumChains = EnumChains = {}));
55
+ })(EnumChains = exports.EnumChains || (exports.EnumChains = {}));
56
56
  var EnumWalletType;
57
57
  (function (EnumWalletType) {
58
58
  EnumWalletType["Extension"] = "Extension";
59
59
  EnumWalletType["WalletConnect"] = "WalletConnect";
60
60
  EnumWalletType["Web"] = "Web";
61
61
  EnumWalletType["Mobile"] = "Mobile";
62
- })(EnumWalletType || (exports.EnumWalletType = EnumWalletType = {}));
62
+ })(EnumWalletType = exports.EnumWalletType || (exports.EnumWalletType = {}));
63
63
  var EnumWalletName;
64
64
  (function (EnumWalletName) {
65
65
  EnumWalletName["NearWallet"] = "NearWallet";
@@ -107,7 +107,7 @@ var EnumWalletName;
107
107
  EnumWalletName["ArgentX"] = "Argent X";
108
108
  EnumWalletName["Braavos"] = "Braavos";
109
109
  EnumWalletName["Krystal"] = "Krystal";
110
- })(EnumWalletName || (exports.EnumWalletName = EnumWalletName = {}));
110
+ })(EnumWalletName = exports.EnumWalletName || (exports.EnumWalletName = {}));
111
111
  var EnumErrors;
112
112
  (function (EnumErrors) {
113
113
  EnumErrors["NotMetamask"] = "40001";
@@ -151,4 +151,4 @@ var EnumErrors;
151
151
  EnumErrors["NoRabbyWallet"] = "40041";
152
152
  EnumErrors["NoArgentX"] = "40042";
153
153
  EnumErrors["NoBraavos"] = "40043";
154
- })(EnumErrors || (exports.EnumErrors = EnumErrors = {}));
154
+ })(EnumErrors = exports.EnumErrors || (exports.EnumErrors = {}));
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@openocean.finance/wallet",
3
- "version": "1.5.44",
3
+ "version": "1.5.45",
4
4
  "description": "A multi-chain wallets manager",
5
5
  "main": "lib/index.js",
6
6
  "scripts": {
@@ -61,6 +61,7 @@
61
61
  "@terra-money/terra.js": "3.0.8",
62
62
  "@uauth/js": "^2.4.0",
63
63
  "@walletconnect/ethereum-provider": "^2.10.4",
64
+ "@walletconnect/modal": "^2.6.2",
64
65
  "buffer": "^6.0.3",
65
66
  "fs": "^0.0.1-security",
66
67
  "near-api-js": "^0.44.2",