@openocean.finance/wallet 1.10.3 → 1.10.4
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.
|
@@ -52,7 +52,7 @@ var SID = require('@siddomains/sidjs').default;
|
|
|
52
52
|
var SIDfunctions = require('@siddomains/sidjs');
|
|
53
53
|
function isChainIdEq(wallet, chainId, utilsEht, k) {
|
|
54
54
|
return __awaiter(this, void 0, void 0, function () {
|
|
55
|
-
var key, chainIdNow;
|
|
55
|
+
var key, chainIdNow1, chainIdNow2, chainIdNow;
|
|
56
56
|
return __generator(this, function (_a) {
|
|
57
57
|
switch (_a.label) {
|
|
58
58
|
case 0:
|
|
@@ -60,15 +60,19 @@ function isChainIdEq(wallet, chainId, utilsEht, k) {
|
|
|
60
60
|
return [4 /*yield*/, (0, util_1.sleep)(1000)];
|
|
61
61
|
case 1:
|
|
62
62
|
_a.sent();
|
|
63
|
-
|
|
64
|
-
|
|
63
|
+
return [4 /*yield*/, wallet.sdk.eth.getChainId()];
|
|
64
|
+
case 2:
|
|
65
|
+
chainIdNow1 = _a.sent();
|
|
66
|
+
chainIdNow2 = utilsEht.hexToNumber(wallet.sdk.currentProvider.chainId);
|
|
67
|
+
chainIdNow = chainIdNow2 || chainIdNow1;
|
|
68
|
+
if (!(chainId == chainIdNow)) return [3 /*break*/, 3];
|
|
65
69
|
wallet.chainId = chainId;
|
|
66
70
|
return [2 /*return*/, true];
|
|
67
|
-
case
|
|
68
|
-
if (!(key < 4)) return [3 /*break*/,
|
|
71
|
+
case 3:
|
|
72
|
+
if (!(key < 4)) return [3 /*break*/, 5];
|
|
69
73
|
return [4 /*yield*/, isChainIdEq(wallet, chainId, utilsEht, key + 1)];
|
|
70
|
-
case
|
|
71
|
-
case
|
|
74
|
+
case 4: return [2 /*return*/, _a.sent()];
|
|
75
|
+
case 5: throw new Error('User rejected the request.');
|
|
72
76
|
}
|
|
73
77
|
});
|
|
74
78
|
});
|
|
@@ -191,7 +191,7 @@ var WalletConnect = /** @class */ (function (_super) {
|
|
|
191
191
|
*/
|
|
192
192
|
WalletConnect.prototype.requestConnect = function () {
|
|
193
193
|
return __awaiter(this, arguments, void 0, function (chainId, config) {
|
|
194
|
-
var
|
|
194
|
+
var provider1_1, providerType, isConnected, currentChainId_1, chainId_1, address_1, address1, provider1, currentChainId, address;
|
|
195
195
|
var _this = this;
|
|
196
196
|
if (chainId === void 0) { chainId = 1; }
|
|
197
197
|
return __generator(this, function (_a) {
|
|
@@ -208,17 +208,25 @@ var WalletConnect = /** @class */ (function (_super) {
|
|
|
208
208
|
case 2:
|
|
209
209
|
if (!this.modal) return [3 /*break*/, 6];
|
|
210
210
|
console.log('requestConnect222-----------------');
|
|
211
|
-
|
|
211
|
+
provider1_1 = this.modal.getWalletProvider();
|
|
212
|
+
console.log(provider1_1);
|
|
213
|
+
providerType = this.modal.getWalletProviderType();
|
|
214
|
+
console.log('providerType', providerType);
|
|
212
215
|
isConnected = this.modal.getIsConnectedState();
|
|
213
216
|
console.log('requestConnect333-----------------');
|
|
214
|
-
if (!(
|
|
217
|
+
if (!(provider1_1 && isConnected)) return [3 /*break*/, 6];
|
|
218
|
+
// let provider =await provider1.getProvider()
|
|
219
|
+
// console.log(provider)
|
|
215
220
|
console.log('requestConnect333322222-----------------');
|
|
216
|
-
|
|
221
|
+
// await provider.enable();
|
|
222
|
+
this.sdk = new web3_1.default(provider1_1);
|
|
217
223
|
return [4 /*yield*/, this.sdk.eth.getChainId()];
|
|
218
224
|
case 3:
|
|
219
225
|
currentChainId_1 = _a.sent();
|
|
226
|
+
chainId_1 = this.modal.getChainId();
|
|
227
|
+
console.log(currentChainId_1, chainId_1);
|
|
220
228
|
console.log('requestConnect444-----------------');
|
|
221
|
-
if (!(
|
|
229
|
+
if (!(chainId_1 && currentChainId_1 != chainId_1)) return [3 /*break*/, 4];
|
|
222
230
|
console.log('requestConnect555-----------------');
|
|
223
231
|
throw new Error(types_1.EnumErrors.ChainIdNotMath);
|
|
224
232
|
case 4:
|
|
@@ -226,7 +234,9 @@ var WalletConnect = /** @class */ (function (_super) {
|
|
|
226
234
|
return [4 /*yield*/, this.sdk.eth.getAccounts()];
|
|
227
235
|
case 5:
|
|
228
236
|
address_1 = (_a.sent())[0];
|
|
229
|
-
|
|
237
|
+
address1 = this.modal.getAddress();
|
|
238
|
+
console.log(address_1, address1);
|
|
239
|
+
this.address = address_1 || address1;
|
|
230
240
|
this.chainId = currentChainId_1;
|
|
231
241
|
return [2 /*return*/, address_1];
|
|
232
242
|
case 6:
|
|
@@ -242,13 +252,16 @@ var WalletConnect = /** @class */ (function (_super) {
|
|
|
242
252
|
case 8:
|
|
243
253
|
_a.sent();
|
|
244
254
|
console.log('autoWalletCheck-----------------');
|
|
245
|
-
|
|
246
|
-
|
|
255
|
+
provider1 = this.modal.getWalletProvider();
|
|
256
|
+
console.log(provider1);
|
|
257
|
+
if (!provider1) {
|
|
247
258
|
this.modal.close();
|
|
248
259
|
throw new Error('User rejected the request.');
|
|
249
260
|
}
|
|
250
261
|
console.log('autoWalletCheck22-----------------');
|
|
251
|
-
|
|
262
|
+
// let provider = await provider1.getProvider()
|
|
263
|
+
// console.log(provider)
|
|
264
|
+
this.sdk = new web3_1.default(provider1);
|
|
252
265
|
return [4 /*yield*/, this.sdk.eth.getChainId()];
|
|
253
266
|
case 9:
|
|
254
267
|
currentChainId = _a.sent();
|