@openocean.finance/wallet 1.10.2 → 1.10.4

package/lib/TryWalletConnect/index.js

@@ -52,7 +52,7 @@ var SID = require('@siddomains/sidjs').default;
 var SIDfunctions = require('@siddomains/sidjs');
 function isChainIdEq(wallet, chainId, utilsEht, k) {
     return __awaiter(this, void 0, void 0, function () {
-        var key, chainIdNow;
+        var key, chainIdNow1, chainIdNow2, chainIdNow;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
@@ -60,15 +60,19 @@ function isChainIdEq(wallet, chainId, utilsEht, k) {
                     return [4 /*yield*/, (0, util_1.sleep)(1000)];
                 case 1:
                     _a.sent();
-                    chainIdNow = utilsEht.hexToNumber(wallet.sdk.currentProvider.chainId);
-                    if (!(chainId == chainIdNow)) return [3 /*break*/, 2];
+                    return [4 /*yield*/, wallet.sdk.eth.getChainId()];
+                case 2:
+                    chainIdNow1 = _a.sent();
+                    chainIdNow2 = utilsEht.hexToNumber(wallet.sdk.currentProvider.chainId);
+                    chainIdNow = chainIdNow2 || chainIdNow1;
+                    if (!(chainId == chainIdNow)) return [3 /*break*/, 3];
                     wallet.chainId = chainId;
                     return [2 /*return*/, true];
-                case 2:
-                    if (!(key < 4)) return [3 /*break*/, 4];
+                case 3:
+                    if (!(key < 4)) return [3 /*break*/, 5];
                     return [4 /*yield*/, isChainIdEq(wallet, chainId, utilsEht, key + 1)];
-                case 3: return [2 /*return*/, _a.sent()];
-                case 4: throw new Error('User rejected the request.');
+                case 4: return [2 /*return*/, _a.sent()];
+                case 5: throw new Error('User rejected the request.');
             }
         });
     });

package/lib/Wallets/WalletConnect.d.ts

@@ -9,8 +9,9 @@ declare class WalletConnect extends BaseWallet {
     sdk: any;
     infuraId?: string;
     modal: AppKit;
-    constructor();
+    modalIsClose: Boolean;
     init(chainId?: number, config?: any): void;
+    getModalClose(): Boolean;
     /**
      * connect metamask and get wallet address
      * @param chainId specific chainId,throw error when not match

package/lib/Wallets/WalletConnect.js

@@ -73,7 +73,7 @@ var helper_2 = require("../helper");
 var WalletConnect = /** @class */ (function (_super) {
     __extends(WalletConnect, _super);
     function WalletConnect() {
-        var _this = _super.call(this) || this;
+        var _this = _super !== null && _super.apply(this, arguments) || this;
         _this.name = types_1.EnumWalletName.WalletConnect;
         _this.icon = walletconnect_svg_1.default;
         _this.supportChains = [
@@ -121,6 +121,7 @@ var WalletConnect = /** @class */ (function (_super) {
         return _this;
     }
     WalletConnect.prototype.init = function (chainId, config) {
+        var _this = this;
         if (chainId === void 0) { chainId = 1; }
         var projectId = config && config.projectId ? config.projectId : 'c1ca7adc83e89c7e7848440702f28f38'; // '90304d7fbed3543fd7cac4b24f800264'
         var networks = [chains_1.mainnet, chains_1.telos, chains_1.opBNB, chains_1.mantle, chains_1.manta, chains_1.blast, chains_1.mode, chains_1.pulsechain, chains_1.merlin, chains_1.rootstock, chains_1.sei, chains_1.arbitrumSepolia, chains_1.gravity, chains_1.apeChain, chains_1.harmonyOne, chains_1.metis, chains_1.kava, chains_1.celo, chains_1.klaytn, chains_1.zksync, chains_1.linea, chains_1.lineaTestnet, chains_1.polygonZkEvm, chains_1.arbitrum, chains_1.bsc, chains_1.polygon, chains_1.okc, chains_1.xdc, chains_1.fantom, chains_1.avalanche, chains_1.optimism, chains_1.bob, chains_1.moonriver, chains_1.aurora, chains_1.cronos, chains_1.base];
@@ -158,12 +159,31 @@ var WalletConnect = /** @class */ (function (_super) {
             allWallets: 'HIDE',
         });
         this.modal.subscribeEvents(function (event) {
+            console.log('_____________________event_________________');
             console.log(event.data);
+            console.log(event.data.event);
+            if (event.data.event == 'MODAL_OPEN') {
+                _this.modalIsClose = false;
+            }
+            if (event.data.event == "MODAL_CLOSE") {
+                _this.modalIsClose = true;
+            }
+            if (event.data.event == "CONNECT_ERROR") {
+                if (event.data.properties.message.indexOf('User rejected the request') != -1) {
+                    _this.modal.close();
+                    // this.modalIsClose = true
+                }
+            }
         });
         this.modal.subscribeWalletInfo(function (data) {
-            var sdf = data;
+            console.log('_____________________subscribeWalletInfo_________________');
+            console.log(data);
         });
     };
+    WalletConnect.prototype.getModalClose = function () {
+        var open = this.modal.getState().open;
+        return this.modalIsClose || !open;
+    };
     /**
      * connect metamask and get wallet address
      * @param chainId specific chainId,throw error when not match
@@ -171,12 +191,14 @@ var WalletConnect = /** @class */ (function (_super) {
      */
     WalletConnect.prototype.requestConnect = function () {
         return __awaiter(this, arguments, void 0, function (chainId, config) {
-            var provider_1, isConnected, currentChainId_1, address_1, provider, currentChainId, address;
+            var provider1_1, providerType, isConnected, currentChainId_1, chainId_1, address_1, address1, provider1, currentChainId, address;
             var _this = this;
             if (chainId === void 0) { chainId = 1; }
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
+                        this.modalIsClose = false;
+                        console.log('requestConnect1111-----------------');
                         if (!!this.modal) return [3 /*break*/, 2];
                         this.init(chainId, config);
                         return [4 /*yield*/, (0, helper_2.sleep)(5000)];
@@ -185,54 +207,75 @@ var WalletConnect = /** @class */ (function (_super) {
                         _a.label = 2;
                     case 2:
                         if (!this.modal) return [3 /*break*/, 6];
-                        provider_1 = this.modal.getWalletProvider();
+                        console.log('requestConnect222-----------------');
+                        provider1_1 = this.modal.getWalletProvider();
+                        console.log(provider1_1);
+                        providerType = this.modal.getWalletProviderType();
+                        console.log('providerType', providerType);
                         isConnected = this.modal.getIsConnectedState();
-                        if (!(provider_1 && isConnected)) return [3 /*break*/, 6];
-                        this.sdk = new web3_1.default(provider_1);
+                        console.log('requestConnect333-----------------');
+                        if (!(provider1_1 && isConnected)) return [3 /*break*/, 6];
+                        // let provider =await provider1.getProvider()
+                        // console.log(provider)
+                        console.log('requestConnect333322222-----------------');
+                        // await provider.enable();
+                        this.sdk = new web3_1.default(provider1_1);
                         return [4 /*yield*/, this.sdk.eth.getChainId()];
                     case 3:
                         currentChainId_1 = _a.sent();
-                        if (!(chainId && currentChainId_1 != chainId)) return [3 /*break*/, 4];
+                        chainId_1 = this.modal.getChainId();
+                        console.log(currentChainId_1, chainId_1);
+                        console.log('requestConnect444-----------------');
+                        if (!(chainId_1 && currentChainId_1 != chainId_1)) return [3 /*break*/, 4];
+                        console.log('requestConnect555-----------------');
                         throw new Error(types_1.EnumErrors.ChainIdNotMath);
-                    case 4: return [4 /*yield*/, this.sdk.eth.getAccounts()];
+                    case 4:
+                        console.log('requestConnect666-----------------');
+                        return [4 /*yield*/, this.sdk.eth.getAccounts()];
                     case 5:
                         address_1 = (_a.sent())[0];
-                        this.address = address_1;
+                        address1 = this.modal.getAddress();
+                        console.log(address_1, address1);
+                        this.address = address_1 || address1;
                         this.chainId = currentChainId_1;
                         return [2 /*return*/, address_1];
-                    case 6: return [4 /*yield*/, this.modal.open({
-                            view: 'Connect' //'Account' | 'Connect' | 'Networks' | 'ApproveTransaction' | 'OnRampProviders';
-                        })];
+                    case 6:
+                        console.log('requestConnect777-----------------');
+                        return [4 /*yield*/, this.modal.open({
+                                view: 'Connect' //'Account' | 'Connect' | 'Networks' | 'ApproveTransaction' | 'OnRampProviders';
+                            })];
                     case 7:
                         _a.sent();
                         return [4 /*yield*/, (0, helper_1.autoWalletCheck)(function () {
-                                // const { name, icon } = this.modal.getWalletInfo()
-                                var _a = _this.modal.getState(), open = _a.open, selectedNetworkId = _a.selectedNetworkId;
-                                return !open;
+                                return _this.getModalClose();
                             }, 1000 * 60 * 6, 60 * 3)];
                     case 8:
                         _a.sent();
-                        provider = this.modal.getWalletProvider();
-                        if (!provider) {
+                        console.log('autoWalletCheck-----------------');
+                        provider1 = this.modal.getWalletProvider();
+                        console.log(provider1);
+                        if (!provider1) {
                             this.modal.close();
-                            throw new Error('Cancel connect');
+                            throw new Error('User rejected the request.');
                         }
-                        console.log('fk01');
-                        this.sdk = new web3_1.default(provider);
+                        console.log('autoWalletCheck22-----------------');
+                        // let provider = await provider1.getProvider()
+                        // console.log(provider)
+                        this.sdk = new web3_1.default(provider1);
                         return [4 /*yield*/, this.sdk.eth.getChainId()];
                     case 9:
                         currentChainId = _a.sent();
-                        console.log('fk02');
+                        console.log('autoWalletCheck333-----------------');
                         if (chainId && currentChainId != chainId) {
                             throw new Error(types_1.EnumErrors.ChainIdNotMath);
                         }
-                        console.log('fk03');
+                        console.log('autoWalletCheck4444-----------------');
                         return [4 /*yield*/, this.sdk.eth.getAccounts()];
                     case 10:
                         address = (_a.sent())[0];
                         this.address = address;
                         this.chainId = currentChainId;
-                        console.log('fk04');
+                        console.log('address,currentChainId-----------------');
                         console.log(address, currentChainId);
                         return [2 /*return*/, address];
                 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openocean.finance/wallet",
-  "version": "1.10.2",
+  "version": "1.10.4",
   "description": "A multi-chain wallets manager",
   "main": "lib/index.js",
   "scripts": {