@depay/web3-wallets-evm 15.0.1 → 15.1.0

package/dist/esm/index.evm.js

@@ -60127,13 +60127,14 @@ let currentPlainInstance;
 const getPlainInstance = ()=>{
   if(currentPlainInstance) { return currentPlainInstance }
   currentPlainInstance = getWalletConnectInstance(()=>{});
+  return currentPlainInstance
 };
 
 const isConnected = async()=>{
   let connector = getPlainInstance();
-  let account;
-  try { account = await connector.sendCustomRequest({ method: 'eth_chainId' }); } catch (e) {}
-  return !!account
+  let accounts;
+  try { accounts = await connector.sendCustomRequest({ method: 'eth_accounts' }); } catch (error) { console.log(error); }
+  return accounts && accounts.length
 };
 
 const getConnectedInstance$1 = async()=>{
@@ -60179,27 +60180,18 @@ class WalletConnectV1 {
     };
   }
 
+  disconnect() {
+    setConnectedInstance$1(undefined);
+    localStorage[KEY+'_name'] = undefined;
+    localStorage[KEY+'_logo'] = undefined;
+    currentPlainInstance = undefined;
+  }
+
   newWalletConnectInstance(connect) {
     let instance = getWalletConnectInstance(connect);
 
-    instance.on("connect", (error, payload) => {
-      if (error) { throw error }
-      const { accounts, chainId } = payload.params[0];
-      this.connectedAccounts = accounts.map((account)=>ethers.utils.getAddress(account));
-      this.connectedChainId = chainId;
-    });
-
-    instance.on("session_update", (error, payload) => {
-      if (error) { throw error }
-      const { accounts, chainId } = payload.params[0];
-      this.connectedAccounts = accounts.map((account)=>ethers.utils.getAddress(account));
-      this.connectedChainId = chainId;
-    });
-
     instance.on("disconnect", (error, payload) => {
-      setConnectedInstance$1(undefined);
-      localStorage[KEY+'_name'] = undefined;
-      localStorage[KEY+'_logo'] = undefined;
+      this.disconnect();
       if (error) { throw error }
     });
 
@@ -60227,12 +60219,15 @@ class WalletConnectV1 {
         this.connector = this.newWalletConnectInstance(connect);
       }
 
-      if(this.connector.connected) {
-
-        let account = await this.account();
-        this.connectedChainId = await this.connector.sendCustomRequest({ method: 'eth_chainId' });
+      if(options && options.reconnect) {
+        if(this.connector) {
+          await this.connector.killSession();
+          this.disconnect();
+        }
+      }
 
-        return account
+      if((await isConnected())) {
+        return await this.account()
       } else {
 
         let { accounts, chainId } = await this.connector.connect();
@@ -60243,7 +60238,6 @@ class WalletConnectV1 {
         if(accounts instanceof Array && accounts.length) {
           setConnectedInstance$1(this);
           accounts = accounts.map((account)=>ethers.utils.getAddress(account));
-          this.connectedChainId = chainId;
 
           return accounts[0]
         } else {

package/dist/esm/index.js

@@ -1221,13 +1221,14 @@ let currentPlainInstance;
 const getPlainInstance = ()=>{
   if(currentPlainInstance) { return currentPlainInstance }
   currentPlainInstance = getWalletConnectInstance(()=>{});
+  return currentPlainInstance
 };
 
 const isConnected = async()=>{
   let connector = getPlainInstance();
-  let account;
-  try { account = await connector.sendCustomRequest({ method: 'eth_chainId' }); } catch (e) {}
-  return !!account
+  let accounts;
+  try { accounts = await connector.sendCustomRequest({ method: 'eth_accounts' }); } catch (error) { console.log(error); }
+  return accounts && accounts.length
 };
 
 const getConnectedInstance$1 = async()=>{
@@ -1273,27 +1274,18 @@ class WalletConnectV1 {
     };
   }
 
+  disconnect() {
+    setConnectedInstance$1(undefined);
+    localStorage[KEY+'_name'] = undefined;
+    localStorage[KEY+'_logo'] = undefined;
+    currentPlainInstance = undefined;
+  }
+
   newWalletConnectInstance(connect) {
     let instance = getWalletConnectInstance(connect);
 
-    instance.on("connect", (error, payload) => {
-      if (error) { throw error }
-      const { accounts, chainId } = payload.params[0];
-      this.connectedAccounts = accounts.map((account)=>ethers.utils.getAddress(account));
-      this.connectedChainId = chainId;
-    });
-
-    instance.on("session_update", (error, payload) => {
-      if (error) { throw error }
-      const { accounts, chainId } = payload.params[0];
-      this.connectedAccounts = accounts.map((account)=>ethers.utils.getAddress(account));
-      this.connectedChainId = chainId;
-    });
-
     instance.on("disconnect", (error, payload) => {
-      setConnectedInstance$1(undefined);
-      localStorage[KEY+'_name'] = undefined;
-      localStorage[KEY+'_logo'] = undefined;
+      this.disconnect();
       if (error) { throw error }
     });
 
@@ -1321,12 +1313,15 @@ class WalletConnectV1 {
         this.connector = this.newWalletConnectInstance(connect);
       }
 
-      if(this.connector.connected) {
-
-        let account = await this.account();
-        this.connectedChainId = await this.connector.sendCustomRequest({ method: 'eth_chainId' });
+      if(options && options.reconnect) {
+        if(this.connector) {
+          await this.connector.killSession();
+          this.disconnect();
+        }
+      }
 
-        return account
+      if((await isConnected())) {
+        return await this.account()
       } else {
 
         let { accounts, chainId } = await this.connector.connect();
@@ -1337,7 +1332,6 @@ class WalletConnectV1 {
         if(accounts instanceof Array && accounts.length) {
           setConnectedInstance$1(this);
           accounts = accounts.map((account)=>ethers.utils.getAddress(account));
-          this.connectedChainId = chainId;
 
           return accounts[0]
         } else {

package/dist/umd/index.evm.js

@@ -60126,13 +60126,14 @@
   const getPlainInstance = ()=>{
     if(currentPlainInstance) { return currentPlainInstance }
     currentPlainInstance = getWalletConnectInstance(()=>{});
+    return currentPlainInstance
   };
 
   const isConnected = async()=>{
     let connector = getPlainInstance();
-    let account;
-    try { account = await connector.sendCustomRequest({ method: 'eth_chainId' }); } catch (e) {}
-    return !!account
+    let accounts;
+    try { accounts = await connector.sendCustomRequest({ method: 'eth_accounts' }); } catch (error) { console.log(error); }
+    return accounts && accounts.length
   };
 
   const getConnectedInstance$1 = async()=>{
@@ -60178,27 +60179,18 @@
       };
     }
 
+    disconnect() {
+      setConnectedInstance$1(undefined);
+      localStorage[KEY+'_name'] = undefined;
+      localStorage[KEY+'_logo'] = undefined;
+      currentPlainInstance = undefined;
+    }
+
     newWalletConnectInstance(connect) {
       let instance = getWalletConnectInstance(connect);
 
-      instance.on("connect", (error, payload) => {
-        if (error) { throw error }
-        const { accounts, chainId } = payload.params[0];
-        this.connectedAccounts = accounts.map((account)=>ethers.ethers.utils.getAddress(account));
-        this.connectedChainId = chainId;
-      });
-
-      instance.on("session_update", (error, payload) => {
-        if (error) { throw error }
-        const { accounts, chainId } = payload.params[0];
-        this.connectedAccounts = accounts.map((account)=>ethers.ethers.utils.getAddress(account));
-        this.connectedChainId = chainId;
-      });
-
       instance.on("disconnect", (error, payload) => {
-        setConnectedInstance$1(undefined);
-        localStorage[KEY+'_name'] = undefined;
-        localStorage[KEY+'_logo'] = undefined;
+        this.disconnect();
         if (error) { throw error }
       });
 
@@ -60226,12 +60218,15 @@
           this.connector = this.newWalletConnectInstance(connect);
         }
 
-        if(this.connector.connected) {
-
-          let account = await this.account();
-          this.connectedChainId = await this.connector.sendCustomRequest({ method: 'eth_chainId' });
+        if(options && options.reconnect) {
+          if(this.connector) {
+            await this.connector.killSession();
+            this.disconnect();
+          }
+        }
 
-          return account
+        if((await isConnected())) {
+          return await this.account()
         } else {
 
           let { accounts, chainId } = await this.connector.connect();
@@ -60242,7 +60237,6 @@
           if(accounts instanceof Array && accounts.length) {
             setConnectedInstance$1(this);
             accounts = accounts.map((account)=>ethers.ethers.utils.getAddress(account));
-            this.connectedChainId = chainId;
 
             return accounts[0]
           } else {

package/dist/umd/index.js

@@ -1219,13 +1219,14 @@
   const getPlainInstance = ()=>{
     if(currentPlainInstance) { return currentPlainInstance }
     currentPlainInstance = getWalletConnectInstance(()=>{});
+    return currentPlainInstance
   };
 
   const isConnected = async()=>{
     let connector = getPlainInstance();
-    let account;
-    try { account = await connector.sendCustomRequest({ method: 'eth_chainId' }); } catch (e) {}
-    return !!account
+    let accounts;
+    try { accounts = await connector.sendCustomRequest({ method: 'eth_accounts' }); } catch (error) { console.log(error); }
+    return accounts && accounts.length
   };
 
   const getConnectedInstance$1 = async()=>{
@@ -1271,27 +1272,18 @@
       };
     }
 
+    disconnect() {
+      setConnectedInstance$1(undefined);
+      localStorage[KEY+'_name'] = undefined;
+      localStorage[KEY+'_logo'] = undefined;
+      currentPlainInstance = undefined;
+    }
+
     newWalletConnectInstance(connect) {
       let instance = getWalletConnectInstance(connect);
 
-      instance.on("connect", (error, payload) => {
-        if (error) { throw error }
-        const { accounts, chainId } = payload.params[0];
-        this.connectedAccounts = accounts.map((account)=>ethers.ethers.utils.getAddress(account));
-        this.connectedChainId = chainId;
-      });
-
-      instance.on("session_update", (error, payload) => {
-        if (error) { throw error }
-        const { accounts, chainId } = payload.params[0];
-        this.connectedAccounts = accounts.map((account)=>ethers.ethers.utils.getAddress(account));
-        this.connectedChainId = chainId;
-      });
-
       instance.on("disconnect", (error, payload) => {
-        setConnectedInstance$1(undefined);
-        localStorage[KEY+'_name'] = undefined;
-        localStorage[KEY+'_logo'] = undefined;
+        this.disconnect();
         if (error) { throw error }
       });
 
@@ -1319,12 +1311,15 @@
           this.connector = this.newWalletConnectInstance(connect);
         }
 
-        if(this.connector.connected) {
-
-          let account = await this.account();
-          this.connectedChainId = await this.connector.sendCustomRequest({ method: 'eth_chainId' });
+        if(options && options.reconnect) {
+          if(this.connector) {
+            await this.connector.killSession();
+            this.disconnect();
+          }
+        }
 
-          return account
+        if((await isConnected())) {
+          return await this.account()
         } else {
 
           let { accounts, chainId } = await this.connector.connect();
@@ -1335,7 +1330,6 @@
           if(accounts instanceof Array && accounts.length) {
             setConnectedInstance$1(this);
             accounts = accounts.map((account)=>ethers.ethers.utils.getAddress(account));
-            this.connectedChainId = chainId;
 
             return accounts[0]
           } else {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@depay/web3-wallets-evm",
   "moduleName": "Web3Wallets",
-  "version": "15.0.1",
+  "version": "15.1.0",
   "description": "One-Stop-Shop JavaScript library to integrate various web3 crypto wallets and multiple blockchains at once with a single interface.",
   "main": "dist/umd/index.evm.js",
   "module": "dist/esm/index.evm.js",