@openocean.finance/wallet 1.4.6 → 1.4.8

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 (2) hide show
  1. package/lib/TryWalletConnect/index.js +36 -28
  2. package/package.json +1 -1
package/lib/TryWalletConnect/index.js CHANGED
@@ -72,7 +72,7 @@ function isChainIdEq(wallet, chainId, utilsEht, k) {
72
72
  }
73
73
  function link(reqConnectWalletVo, chain) {
74
74
  return __awaiter(this, void 0, void 0, function () {
75
- var wallet, chainId, selectedName, qrData, instance_1, account, res, res, res, res, res, res, res, _a, e_1, message, _b, currentProvider, utilsEht;
75
+ var wallet, chainId, selectedName, qrData, instance_1, account, res, res, res, res, res, res, res, res, _a, e_1, message, _b, currentProvider, utilsEht;
76
76
  return __generator(this, function (_c) {
77
77
  switch (_c.label) {
78
78
  case 0:
@@ -83,13 +83,13 @@ function link(reqConnectWalletVo, chain) {
83
83
  selectedName = chain.key;
84
84
  _c.label = 1;
85
85
  case 1:
86
- _c.trys.push([1, 26, , 30]);
86
+ _c.trys.push([1, 28, , 32]);
87
87
  if (!(wallet.type === 'WalletConnect')) return [3 /*break*/, 3];
88
88
  wallet.infuraId = '2c7c4d86c2c746c89de722551b606119';
89
89
  return [4 /*yield*/, wallet.requestConnect(chainId)];
90
90
  case 2:
91
91
  _c.sent();
92
- return [3 /*break*/, 25];
92
+ return [3 /*break*/, 27];
93
93
  case 3:
94
94
  if (!(wallet.key === 'OntoMobile')) return [3 /*break*/, 6];
95
95
  return [4 /*yield*/, axios.get('https://ethapi.openocean.finance/v1/ont/login')];
@@ -110,14 +110,14 @@ function link(reqConnectWalletVo, chain) {
110
110
  case 5:
111
111
  account = _c.sent();
112
112
  wallet.address = account;
113
- return [3 /*break*/, 25];
113
+ return [3 /*break*/, 27];
114
114
  case 6:
115
115
  if (!(wallet.key === 'KeplrWallet')) return [3 /*break*/, 8];
116
116
  return [4 /*yield*/, wallet.requestCosmosConnect(chainId)];
117
117
  case 7:
118
118
  res = _c.sent();
119
119
  console.log('wallet.requestConnect', res, wallet);
120
- return [3 /*break*/, 25];
120
+ return [3 /*break*/, 27];
121
121
  case 8:
122
122
  if (!(selectedName === 'terra')) return [3 /*break*/, 11];
123
123
  if (!!wallet.sdk) return [3 /*break*/, 10];
@@ -135,7 +135,7 @@ function link(reqConnectWalletVo, chain) {
135
135
  // showToast($t(message));
136
136
  }
137
137
  _c.label = 10;
138
- case 10: return [3 /*break*/, 25];
138
+ case 10: return [3 /*break*/, 27];
139
139
  case 11:
140
140
  if (!(selectedName === "solana")) return [3 /*break*/, 13];
141
141
  return [4 /*yield*/, wallet.requestSolanaConnect()];
@@ -166,14 +166,14 @@ function link(reqConnectWalletVo, chain) {
166
166
  // message: message
167
167
  // }
168
168
  }
169
- return [3 /*break*/, 25];
169
+ return [3 /*break*/, 27];
170
170
  case 13:
171
171
  if (!(selectedName === 'tron')) return [3 /*break*/, 15];
172
172
  return [4 /*yield*/, wallet.requestTronConnect()];
173
173
  case 14:
174
174
  res = _c.sent();
175
175
  console.log('wallet.requestConnect', res, wallet);
176
- return [3 /*break*/, 25];
176
+ return [3 /*break*/, 27];
177
177
  case 15:
178
178
  if (!(selectedName === 'aptos')) return [3 /*break*/, 17];
179
179
  return [4 /*yield*/, wallet.requestAptosConnect()];
@@ -181,48 +181,56 @@ function link(reqConnectWalletVo, chain) {
181
181
  res = _c.sent();
182
182
  // wallet.customPublicKey = new PublicKey(res);
183
183
  console.log('wallet.requestConnect', res, wallet);
184
- return [3 /*break*/, 25];
184
+ return [3 /*break*/, 27];
185
185
  case 17:
186
- if (!(selectedName === 'near')) return [3 /*break*/, 19];
187
- return [4 /*yield*/, wallet.requestConnect()];
186
+ if (!(selectedName === 'starknet')) return [3 /*break*/, 19];
187
+ return [4 /*yield*/, wallet.requestStarknetConnect()];
188
188
  case 18:
189
189
  res = _c.sent();
190
+ // wallet.customPublicKey = new PublicKey(res);
190
191
  console.log('wallet.requestConnect', res, wallet);
191
- return [3 /*break*/, 25];
192
+ return [3 /*break*/, 27];
192
193
  case 19:
193
- if (!chainId) return [3 /*break*/, 21];
194
- return [4 /*yield*/, wallet.requestConnect(chainId)];
194
+ if (!(selectedName === 'near')) return [3 /*break*/, 21];
195
+ return [4 /*yield*/, wallet.requestConnect()];
195
196
  case 20:
196
- _a = _c.sent();
197
- return [3 /*break*/, 23];
198
- case 21: return [4 /*yield*/, wallet.requestConnect()];
197
+ res = _c.sent();
198
+ console.log('wallet.requestConnect', res, wallet);
199
+ return [3 /*break*/, 27];
200
+ case 21:
201
+ if (!chainId) return [3 /*break*/, 23];
202
+ return [4 /*yield*/, wallet.requestConnect(chainId)];
199
203
  case 22:
200
204
  _a = _c.sent();
201
- _c.label = 23;
202
- case 23:
205
+ return [3 /*break*/, 25];
206
+ case 23: return [4 /*yield*/, wallet.requestConnect()];
207
+ case 24:
208
+ _a = _c.sent();
209
+ _c.label = 25;
210
+ case 25:
203
211
  res = _a;
204
212
  console.log('wallet.requestConnect', res, wallet);
205
213
  return [4 /*yield*/, (0, util_1.sleep)(200)];
206
- case 24:
214
+ case 26:
207
215
  _c.sent();
208
216
  if (res) {
209
217
  // connect(wallet);
210
218
  }
211
- _c.label = 25;
212
- case 25: return [2 /*return*/, wallet];
213
- case 26:
219
+ _c.label = 27;
220
+ case 27: return [2 /*return*/, wallet];
221
+ case 28:
214
222
  e_1 = _c.sent();
215
223
  message = e_1.message;
216
224
  _b = wallet.sdk || {}, currentProvider = _b.currentProvider, utilsEht = _b.utils;
217
225
  if (reqConnectWalletVo.noSwitch) {
218
226
  throw new Error('No Switch');
219
227
  }
220
- if (!(message === "40006" && currentProvider)) return [3 /*break*/, 28];
228
+ if (!(message === "40006" && currentProvider)) return [3 /*break*/, 30];
221
229
  return [4 /*yield*/, linkAddOrSwitch(wallet, chain)];
222
- case 27: return [2 /*return*/, _c.sent()];
223
- case 28: throw new Error(message);
224
- case 29: return [3 /*break*/, 30];
225
- case 30: return [2 /*return*/];
230
+ case 29: return [2 /*return*/, _c.sent()];
231
+ case 30: throw new Error(message);
232
+ case 31: return [3 /*break*/, 32];
233
+ case 32: return [2 /*return*/];
226
234
  }
227
235
  });
228
236
  });
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@openocean.finance/wallet",
3
- "version": "1.4.6",
3
+ "version": "1.4.8",
4
4
  "description": "A multi-chain wallets manager",
5
5
  "main": "lib/index.js",
6
6
  "scripts": {