@openocean.finance/openocean-sdk 0.1.78 → 0.1.79

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/swapSdk/ConnectWallet.js +30 -37
  2. package/package.json +2 -2
package/lib/swapSdk/ConnectWallet.js CHANGED
@@ -71,7 +71,7 @@ var ConnectWallet = /** @class */ (function () {
71
71
  };
72
72
  ConnectWallet.link = function (reqConnectWalletVo) {
73
73
  return __awaiter(this, void 0, void 0, function () {
74
- var wallet, chain, chainId, selectedChain, qrData, instance_1, account, res, res, account, res, res, res, _a, e_1, message, _b, currentProvider, utilsEht;
74
+ var wallet, chain, chainId, selectedChain, qrData, instance_1, account, res, res, res, res, res, _a, e_1, message, _b, currentProvider, utilsEht;
75
75
  return __generator(this, function (_c) {
76
76
  switch (_c.label) {
77
77
  case 0:
@@ -85,13 +85,13 @@ var ConnectWallet = /** @class */ (function () {
85
85
  selectedChain = chain.key;
86
86
  _c.label = 1;
87
87
  case 1:
88
- _c.trys.push([1, 25, , 29]);
88
+ _c.trys.push([1, 22, , 26]);
89
89
  if (!(wallet.type === 'WalletConnect')) return [3 /*break*/, 3];
90
90
  wallet.infuraId = '2c7c4d86c2c746c89de722551b606119';
91
91
  return [4 /*yield*/, wallet.requestConnect(chainId)];
92
92
  case 2:
93
93
  _c.sent();
94
- return [3 /*break*/, 24];
94
+ return [3 /*break*/, 21];
95
95
  case 3:
96
96
  if (!(wallet.key === 'OntoMobile')) return [3 /*break*/, 6];
97
97
  return [4 /*yield*/, axios.get('https://ethapi.openocean.finance/v1/ont/login')];
@@ -112,7 +112,7 @@ var ConnectWallet = /** @class */ (function () {
112
112
  case 5:
113
113
  account = _c.sent();
114
114
  wallet.address = account;
115
- return [3 /*break*/, 24];
115
+ return [3 /*break*/, 21];
116
116
  case 6:
117
117
  if (!(selectedChain === 'terra')) return [3 /*break*/, 9];
118
118
  if (!!wallet.sdk) return [3 /*break*/, 8];
@@ -130,7 +130,7 @@ var ConnectWallet = /** @class */ (function () {
130
130
  // showToast(this.$t(message));
131
131
  }
132
132
  _c.label = 8;
133
- case 8: return [3 /*break*/, 24];
133
+ case 8: return [3 /*break*/, 21];
134
134
  case 9:
135
135
  if (!(selectedChain === "solana")) return [3 /*break*/, 11];
136
136
  return [4 /*yield*/, wallet.requestSolanaConnect()];
@@ -160,63 +160,56 @@ var ConnectWallet = /** @class */ (function () {
160
160
  // message: message
161
161
  // }
162
162
  }
163
- return [3 /*break*/, 24];
163
+ return [3 /*break*/, 21];
164
164
  case 11:
165
- if (!(selectedChain === 'tron')) return [3 /*break*/, 16];
166
- account = window.tronWeb.defaultAddress.base58;
167
- if (!!account) return [3 /*break*/, 14];
168
- return [4 /*yield*/, utils_1.utils.sleep(1000)];
165
+ if (!(selectedChain === 'tron')) return [3 /*break*/, 13];
166
+ return [4 /*yield*/, wallet.requestTronConnect()];
169
167
  case 12:
170
- _c.sent();
171
- return [4 /*yield*/, this.link(reqConnectWalletVo)];
172
- case 13: return [2 /*return*/, _c.sent()];
173
- case 14: return [4 /*yield*/, wallet.requestConnect()];
174
- case 15:
175
168
  res = _c.sent();
176
169
  console.log('wallet.requestConnect', res, wallet);
177
- return [3 /*break*/, 24];
178
- case 16:
179
- if (!(selectedChain === 'aptos')) return [3 /*break*/, 18];
170
+ return [3 /*break*/, 21];
171
+ case 13:
172
+ if (!(selectedChain === 'aptos')) return [3 /*break*/, 15];
180
173
  return [4 /*yield*/, wallet.requestAptosConnect()];
181
- case 17:
174
+ case 14:
182
175
  res = _c.sent();
183
176
  // wallet.customPublicKey = new PublicKey(res);
184
177
  console.log('wallet.requestConnect', res, wallet);
185
- return [3 /*break*/, 24];
186
- case 18:
187
- if (!chainId) return [3 /*break*/, 20];
178
+ return [3 /*break*/, 21];
179
+ case 15:
180
+ if (!chainId) return [3 /*break*/, 17];
188
181
  return [4 /*yield*/, wallet.requestConnect(chainId)];
189
- case 19:
182
+ case 16:
190
183
  _a = _c.sent();
191
- return [3 /*break*/, 22];
192
- case 20: return [4 /*yield*/, wallet.requestConnect()];
193
- case 21:
184
+ return [3 /*break*/, 19];
185
+ case 17: return [4 /*yield*/, wallet.requestConnect()];
186
+ case 18:
194
187
  _a = _c.sent();
195
- _c.label = 22;
196
- case 22:
188
+ _c.label = 19;
189
+ case 19:
197
190
  res = _a;
198
191
  console.log('wallet.requestConnect', res, wallet);
199
192
  return [4 /*yield*/, utils_1.utils.sleep(200)];
200
- case 23:
193
+ case 20:
201
194
  _c.sent();
202
195
  if (res) {
203
196
  // this.connect(wallet);
204
197
  }
205
- _c.label = 24;
206
- case 24: return [2 /*return*/, { chain: chain, wallet: wallet }];
207
- case 25:
198
+ _c.label = 21;
199
+ case 21: return [2 /*return*/, { chain: chain, wallet: wallet }];
200
+ case 22:
208
201
  e_1 = _c.sent();
209
202
  message = e_1.message;
210
203
  _b = wallet.sdk || {}, currentProvider = _b.currentProvider, utilsEht = _b.utils;
211
204
  if (reqConnectWalletVo.noSwitch) {
212
205
  throw new Error('No Switch');
213
206
  }
214
- if (!(message === "40006" && currentProvider)) return [3 /*break*/, 27];
207
+ if (!(message === "40006" && currentProvider)) return [3 /*break*/, 24];
215
208
  return [4 /*yield*/, this.linkAddOrSwitch(reqConnectWalletVo, wallet, chain)];
216
- case 26: return [2 /*return*/, _c.sent()];
217
- case 27: throw new Error(message);
218
- case 28: return [3 /*break*/, 29];
219
- case 29: return [2 /*return*/];
209
+ case 23: return [2 /*return*/, _c.sent()];
210
+ case 24: throw new Error(message);
211
+ case 25: return [3 /*break*/, 26];
212
+ case 26: return [2 /*return*/];
220
213
  }
221
214
  });
222
215
  });
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@openocean.finance/openocean-sdk",
3
- "version": "0.1.78",
3
+ "version": "0.1.79",
4
4
  "description": "Openocean sdk",
5
5
  "main": "lib/index.js",
6
6
  "scripts": {
@@ -47,7 +47,7 @@
47
47
  "dependencies": {
48
48
  "@1inch/limit-order-protocol": "^2.0.4",
49
49
  "@jup-ag/core": "^1.0.0-beta.27",
50
- "@openocean.finance/wallet": "^0.4.34",
50
+ "@openocean.finance/wallet": "^0.4.35",
51
51
  "@solana/buffer-layout": "^4.0.0",
52
52
  "@walletconnect/web3-provider": "^1.7.8",
53
53
  "bs58": "^4.0.1",