@depay/web3-wallets-evm 12.4.2 → 13.1.0

package/README.md

@@ -99,6 +99,15 @@ if(foundWallets.length == 1) {
 }
 ```
 
+### getConnectedWallets
+
+`getConnectedWallets`: Returns an array of currently connected wallets.
+
+```javascript
+let wallets = await getConnectedWallets();
+// [<Wallet name='MetaMask'>, <Wallet name='Phantom'>]
+```
+
 ### Name
 
 `name:string`: Returns the name of the wallet.

package/dist/esm/index.evm.js

@@ -12,8 +12,8 @@ class Transaction {
 
     // required
     this.blockchain = blockchain;
-    this.from = from;
-    this.to = to;
+    this.from = (from && from.match('0x')) ? ethers.utils.getAddress(from) : from;
+    this.to = (to && to.match('0x')) ? ethers.utils.getAddress(to) : to;
 
     // optional
     this.value = _optionalChain$5([Transaction, 'access', _ => _.bigNumberify, 'call', _2 => _2(value, blockchain), 'optionalAccess', _3 => _3.toString, 'call', _4 => _4()]);
@@ -213,13 +213,13 @@ class WindowEthereum {
 
   async account() {
     if(!_optionalChain$4([window, 'optionalAccess', _15 => _15.ethereum])) { return undefined }
-    const accounts = await window.ethereum.request({ method: 'eth_accounts' });
+    const accounts = (await window.ethereum.request({ method: 'eth_accounts' })).map((address)=>ethers.utils.getAddress(address));
     return accounts[0]
   }
 
   async connect() {
     if(!_optionalChain$4([window, 'optionalAccess', _16 => _16.ethereum])) { return undefined }
-    const accounts = await window.ethereum.request({ method: 'eth_requestAccounts' });
+    const accounts = (await window.ethereum.request({ method: 'eth_requestAccounts' })).map((address)=>ethers.utils.getAddress(address));
     return accounts[0]
   }
 
@@ -227,7 +227,7 @@ class WindowEthereum {
     let internalCallback;
     switch (event) {
       case 'account':
-        internalCallback = (accounts) => callback(accounts[0]);
+        internalCallback = (accounts) => callback(ethers.utils.getAddress(accounts[0]));
         window.ethereum.on('accountsChanged', internalCallback);
         break
     }
@@ -462,14 +462,14 @@ class WalletConnect {
     instance.on("connect", (error, payload) => {
       if (error) { throw error }
       const { accounts, chainId } = payload.params[0];
-      this.connectedAccounts = accounts;
+      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;
+      this.connectedAccounts = accounts.map((account)=>ethers.utils.getAddress(account));
       this.connectedChainId = chainId;
     });
 
@@ -505,12 +505,13 @@ class WalletConnect {
         this.connector = this.newWalletConnectInstance();
       }
 
-      const { accounts, chainId } = await this.connector.connect({ chainId: _optionalChain([options, 'optionalAccess', _ => _.chainId]) });
+      let { accounts, chainId } = await this.connector.connect({ chainId: _optionalChain([options, 'optionalAccess', _ => _.chainId]) });
 
       if(accounts instanceof Array && accounts.length) {
         setConnectedInstance$1(this);
       }
 
+      accounts = accounts.map((account)=>ethers.utils.getAddress(account));
       this.connectedAccounts = accounts;
       this.connectedChainId = chainId;
 
@@ -533,17 +534,35 @@ class WalletConnect {
 
   switchTo(blockchainName) {
     return new Promise((resolve, reject)=>{
+      let resolved, rejected;
       const blockchain = Blockchain.findByName(blockchainName);
+      setTimeout(async()=>{
+        if(!(await this.connectedTo(blockchainName)) && !resolved && !rejected){
+          reject({ code: 'NOT_SUPPORTED' });
+        } else {
+          resolve();
+        }
+      }, 3000);
       this.connector.sendCustomRequest({ 
         method: 'wallet_switchEthereumChain',
         params: [{ chainId: blockchain.id }],
-      }).then(resolve).catch((error)=> {
-        if(error && typeof error.message == 'string' && error.message.match('wallet_addEthereumChain')){ // chain not yet added
+      }).then(()=>{
+        resolved = true;
+        resolve();
+      }).catch((error)=> {
+        if(error && typeof error.message == 'string' && error.message.match('addEthereumChain')){ // chain not yet added
           this.addNetwork(blockchainName)
-            .then(()=>this.switchTo(blockchainName).then(resolve))
-            .catch(reject);
+            .then(()=>this.switchTo(blockchainName).then(()=>{
+              resolved = true;
+              resolve();
+            }))
+            .catch(()=>{
+              rejected = true;
+              reject({ code: 'NOT_SUPPORTED' });
+            });
         } else {
-          reject(error);
+          rejected = true;
+          reject({ code: 'NOT_SUPPORTED' });
         }
       });
     })
@@ -575,8 +594,10 @@ class WalletConnect {
     switch (event) {
       case 'account':
         internalCallback = (error, payload) => {
-          const { accounts } = payload.params[0];
-          if(accounts instanceof Array) { callback(accounts[0]); }
+          if(payload && payload.params && payload.params[0].accounts && payload.params[0].accounts instanceof Array) {
+            const accounts = payload.params[0].accounts.map((account)=>ethers.utils.getAddress(account));
+            callback(accounts[0]);
+          }
         };
         this.connector.on("session_update", internalCallback);
         break
@@ -716,7 +737,7 @@ class WalletLink {
 
   async account() {
     if(this.connectedAccounts == undefined) { return }
-    return this.connectedAccounts[0]
+    return ethers.utils.getAddress(this.connectedAccounts[0])
   }
 
   async connect(options) {
@@ -726,6 +747,7 @@ class WalletLink {
     if(accounts instanceof Array && accounts.length) {
       setConnectedInstance(this);
     }
+    accounts = accounts.map((account)=>ethers.utils.getAddress(account));
     this.connectedAccounts = accounts;
     this.connectedChainId = await this.connector.getChainId();
     return accounts[0]
@@ -784,7 +806,7 @@ class WalletLink {
     let internalCallback;
     switch (event) {
       case 'account':
-        internalCallback = (accounts) => callback(accounts[0]);
+        internalCallback = (accounts) => callback(ethers.utils.getAddress(accounts[0]));
         this.connector.on('accountsChanged', internalCallback);
         break
     }
@@ -842,6 +864,19 @@ const getWallets = ()=>{
   return availableWallets
 };
 
+const getConnectedWallets = async()=>{
+
+  let connectedWallets = (await Promise.all(
+    getWallets().map(async(wallet)=>{
+      if(await wallet.account()) {
+        return wallet
+      }
+    })
+  )).filter((value)=>!!value);
+
+  return connectedWallets
+};
+
 const supported = [
   wallets.MetaMask,
   wallets.Coinbase,
@@ -849,4 +884,4 @@ const supported = [
   wallets.WalletLink
 ];
 
-export { getWallets, supported, wallets };
+export { getConnectedWallets, getWallets, supported, wallets };

package/dist/esm/index.js

@@ -13,8 +13,8 @@ class Transaction {
 
     // required
     this.blockchain = blockchain;
-    this.from = from;
-    this.to = to;
+    this.from = (from && from.match('0x')) ? ethers.utils.getAddress(from) : from;
+    this.to = (to && to.match('0x')) ? ethers.utils.getAddress(to) : to;
 
     // optional
     this.value = _optionalChain$8([Transaction, 'access', _ => _.bigNumberify, 'call', _2 => _2(value, blockchain), 'optionalAccess', _3 => _3.toString, 'call', _4 => _4()]);
@@ -214,13 +214,13 @@ class WindowEthereum {
 
   async account() {
     if(!_optionalChain$7([window, 'optionalAccess', _15 => _15.ethereum])) { return undefined }
-    const accounts = await window.ethereum.request({ method: 'eth_accounts' });
+    const accounts = (await window.ethereum.request({ method: 'eth_accounts' })).map((address)=>ethers.utils.getAddress(address));
     return accounts[0]
   }
 
   async connect() {
     if(!_optionalChain$7([window, 'optionalAccess', _16 => _16.ethereum])) { return undefined }
-    const accounts = await window.ethereum.request({ method: 'eth_requestAccounts' });
+    const accounts = (await window.ethereum.request({ method: 'eth_requestAccounts' })).map((address)=>ethers.utils.getAddress(address));
     return accounts[0]
   }
 
@@ -228,7 +228,7 @@ class WindowEthereum {
     let internalCallback;
     switch (event) {
       case 'account':
-        internalCallback = (accounts) => callback(accounts[0]);
+        internalCallback = (accounts) => callback(ethers.utils.getAddress(accounts[0]));
         window.ethereum.on('accountsChanged', internalCallback);
         break
     }
@@ -444,9 +444,10 @@ class WindowSolana {
   }
 
   async account() {
-    if(_optionalChain$3([window, 'optionalAccess', _7 => _7.solana, 'optionalAccess', _8 => _8.publicKey])) {return window.solana.publicKey.toString() }
-    if(_optionalChain$3([window, 'optionalAccess', _9 => _9.solana]) == undefined){ return }
-    let { publicKey } = await window.solana.connect({ onlyIfTrusted: true });
+    if(_optionalChain$3([window, 'optionalAccess', _7 => _7.solana]) == undefined){ return }
+    if(_optionalChain$3([window, 'optionalAccess', _8 => _8.solana, 'optionalAccess', _9 => _9.publicKey])) { return window.solana.publicKey.toString() }
+    let publicKey;
+    try { ({ publicKey } = await window.solana.connect({ onlyIfTrusted: true })); } catch (e) {}
     if(publicKey){ return publicKey.toString() }
   }
 
@@ -650,14 +651,14 @@ class WalletConnect {
     instance.on("connect", (error, payload) => {
       if (error) { throw error }
       const { accounts, chainId } = payload.params[0];
-      this.connectedAccounts = accounts;
+      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;
+      this.connectedAccounts = accounts.map((account)=>ethers.utils.getAddress(account));
       this.connectedChainId = chainId;
     });
 
@@ -693,12 +694,13 @@ class WalletConnect {
         this.connector = this.newWalletConnectInstance();
       }
 
-      const { accounts, chainId } = await this.connector.connect({ chainId: _optionalChain([options, 'optionalAccess', _ => _.chainId]) });
+      let { accounts, chainId } = await this.connector.connect({ chainId: _optionalChain([options, 'optionalAccess', _ => _.chainId]) });
 
       if(accounts instanceof Array && accounts.length) {
         setConnectedInstance$1(this);
       }
 
+      accounts = accounts.map((account)=>ethers.utils.getAddress(account));
       this.connectedAccounts = accounts;
       this.connectedChainId = chainId;
 
@@ -781,8 +783,10 @@ class WalletConnect {
     switch (event) {
       case 'account':
         internalCallback = (error, payload) => {
-          const { accounts } = payload.params[0];
-          if(accounts instanceof Array) { callback(accounts[0]); }
+          if(payload && payload.params && payload.params[0].accounts && payload.params[0].accounts instanceof Array) {
+            const accounts = payload.params[0].accounts.map((account)=>ethers.utils.getAddress(account));
+            callback(accounts[0]);
+          }
         };
         this.connector.on("session_update", internalCallback);
         break
@@ -922,7 +926,7 @@ class WalletLink {
 
   async account() {
     if(this.connectedAccounts == undefined) { return }
-    return this.connectedAccounts[0]
+    return ethers.utils.getAddress(this.connectedAccounts[0])
   }
 
   async connect(options) {
@@ -932,6 +936,7 @@ class WalletLink {
     if(accounts instanceof Array && accounts.length) {
       setConnectedInstance(this);
     }
+    accounts = accounts.map((account)=>ethers.utils.getAddress(account));
     this.connectedAccounts = accounts;
     this.connectedChainId = await this.connector.getChainId();
     return accounts[0]
@@ -990,7 +995,7 @@ class WalletLink {
     let internalCallback;
     switch (event) {
       case 'account':
-        internalCallback = (accounts) => callback(accounts[0]);
+        internalCallback = (accounts) => callback(ethers.utils.getAddress(accounts[0]));
         this.connector.on('accountsChanged', internalCallback);
         break
     }
@@ -1050,6 +1055,19 @@ const getWallets = ()=>{
   return availableWallets
 };
 
+const getConnectedWallets = async()=>{
+
+  let connectedWallets = (await Promise.all(
+    getWallets().map(async(wallet)=>{
+      if(await wallet.account()) {
+        return wallet
+      }
+    })
+  )).filter((value)=>!!value);
+
+  return connectedWallets
+};
+
 const supported = [
   wallets.MetaMask,
   wallets.Phantom,
@@ -1058,4 +1076,4 @@ const supported = [
   wallets.WalletLink
 ];
 
-export { getWallets, supported, wallets };
+export { getConnectedWallets, getWallets, supported, wallets };

package/dist/umd/index.evm.js

@@ -11,8 +11,8 @@
 
       // required
       this.blockchain = blockchain;
-      this.from = from;
-      this.to = to;
+      this.from = (from && from.match('0x')) ? ethers.ethers.utils.getAddress(from) : from;
+      this.to = (to && to.match('0x')) ? ethers.ethers.utils.getAddress(to) : to;
 
       // optional
       this.value = _optionalChain$5([Transaction, 'access', _ => _.bigNumberify, 'call', _2 => _2(value, blockchain), 'optionalAccess', _3 => _3.toString, 'call', _4 => _4()]);
@@ -212,13 +212,13 @@
 
     async account() {
       if(!_optionalChain$4([window, 'optionalAccess', _15 => _15.ethereum])) { return undefined }
-      const accounts = await window.ethereum.request({ method: 'eth_accounts' });
+      const accounts = (await window.ethereum.request({ method: 'eth_accounts' })).map((address)=>ethers.ethers.utils.getAddress(address));
       return accounts[0]
     }
 
     async connect() {
       if(!_optionalChain$4([window, 'optionalAccess', _16 => _16.ethereum])) { return undefined }
-      const accounts = await window.ethereum.request({ method: 'eth_requestAccounts' });
+      const accounts = (await window.ethereum.request({ method: 'eth_requestAccounts' })).map((address)=>ethers.ethers.utils.getAddress(address));
       return accounts[0]
     }
 
@@ -226,7 +226,7 @@
       let internalCallback;
       switch (event) {
         case 'account':
-          internalCallback = (accounts) => callback(accounts[0]);
+          internalCallback = (accounts) => callback(ethers.ethers.utils.getAddress(accounts[0]));
           window.ethereum.on('accountsChanged', internalCallback);
           break
       }
@@ -461,14 +461,14 @@
       instance.on("connect", (error, payload) => {
         if (error) { throw error }
         const { accounts, chainId } = payload.params[0];
-        this.connectedAccounts = accounts;
+        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;
+        this.connectedAccounts = accounts.map((account)=>ethers.ethers.utils.getAddress(account));
         this.connectedChainId = chainId;
       });
 
@@ -504,12 +504,13 @@
           this.connector = this.newWalletConnectInstance();
         }
 
-        const { accounts, chainId } = await this.connector.connect({ chainId: _optionalChain([options, 'optionalAccess', _ => _.chainId]) });
+        let { accounts, chainId } = await this.connector.connect({ chainId: _optionalChain([options, 'optionalAccess', _ => _.chainId]) });
 
         if(accounts instanceof Array && accounts.length) {
           setConnectedInstance$1(this);
         }
 
+        accounts = accounts.map((account)=>ethers.ethers.utils.getAddress(account));
         this.connectedAccounts = accounts;
         this.connectedChainId = chainId;
 
@@ -532,17 +533,35 @@
 
     switchTo(blockchainName) {
       return new Promise((resolve, reject)=>{
+        let resolved, rejected;
         const blockchain = web3Blockchains.Blockchain.findByName(blockchainName);
+        setTimeout(async()=>{
+          if(!(await this.connectedTo(blockchainName)) && !resolved && !rejected){
+            reject({ code: 'NOT_SUPPORTED' });
+          } else {
+            resolve();
+          }
+        }, 3000);
         this.connector.sendCustomRequest({ 
           method: 'wallet_switchEthereumChain',
           params: [{ chainId: blockchain.id }],
-        }).then(resolve).catch((error)=> {
-          if(error && typeof error.message == 'string' && error.message.match('wallet_addEthereumChain')){ // chain not yet added
+        }).then(()=>{
+          resolved = true;
+          resolve();
+        }).catch((error)=> {
+          if(error && typeof error.message == 'string' && error.message.match('addEthereumChain')){ // chain not yet added
             this.addNetwork(blockchainName)
-              .then(()=>this.switchTo(blockchainName).then(resolve))
-              .catch(reject);
+              .then(()=>this.switchTo(blockchainName).then(()=>{
+                resolved = true;
+                resolve();
+              }))
+              .catch(()=>{
+                rejected = true;
+                reject({ code: 'NOT_SUPPORTED' });
+              });
           } else {
-            reject(error);
+            rejected = true;
+            reject({ code: 'NOT_SUPPORTED' });
           }
         });
       })
@@ -574,8 +593,10 @@
       switch (event) {
         case 'account':
           internalCallback = (error, payload) => {
-            const { accounts } = payload.params[0];
-            if(accounts instanceof Array) { callback(accounts[0]); }
+            if(payload && payload.params && payload.params[0].accounts && payload.params[0].accounts instanceof Array) {
+              const accounts = payload.params[0].accounts.map((account)=>ethers.ethers.utils.getAddress(account));
+              callback(accounts[0]);
+            }
           };
           this.connector.on("session_update", internalCallback);
           break
@@ -715,7 +736,7 @@
 
     async account() {
       if(this.connectedAccounts == undefined) { return }
-      return this.connectedAccounts[0]
+      return ethers.ethers.utils.getAddress(this.connectedAccounts[0])
     }
 
     async connect(options) {
@@ -725,6 +746,7 @@
       if(accounts instanceof Array && accounts.length) {
         setConnectedInstance(this);
       }
+      accounts = accounts.map((account)=>ethers.ethers.utils.getAddress(account));
       this.connectedAccounts = accounts;
       this.connectedChainId = await this.connector.getChainId();
       return accounts[0]
@@ -783,7 +805,7 @@
       let internalCallback;
       switch (event) {
         case 'account':
-          internalCallback = (accounts) => callback(accounts[0]);
+          internalCallback = (accounts) => callback(ethers.ethers.utils.getAddress(accounts[0]));
           this.connector.on('accountsChanged', internalCallback);
           break
       }
@@ -841,6 +863,19 @@
     return availableWallets
   };
 
+  const getConnectedWallets = async()=>{
+
+    let connectedWallets = (await Promise.all(
+      getWallets().map(async(wallet)=>{
+        if(await wallet.account()) {
+          return wallet
+        }
+      })
+    )).filter((value)=>!!value);
+
+    return connectedWallets
+  };
+
   const supported = [
     wallets.MetaMask,
     wallets.Coinbase,
@@ -848,6 +883,7 @@
     wallets.WalletLink
   ];
 
+  exports.getConnectedWallets = getConnectedWallets;
   exports.getWallets = getWallets;
   exports.supported = supported;
   exports.wallets = wallets;

package/dist/umd/index.js

@@ -11,8 +11,8 @@
 
       // required
       this.blockchain = blockchain;
-      this.from = from;
-      this.to = to;
+      this.from = (from && from.match('0x')) ? ethers.ethers.utils.getAddress(from) : from;
+      this.to = (to && to.match('0x')) ? ethers.ethers.utils.getAddress(to) : to;
 
       // optional
       this.value = _optionalChain$8([Transaction, 'access', _ => _.bigNumberify, 'call', _2 => _2(value, blockchain), 'optionalAccess', _3 => _3.toString, 'call', _4 => _4()]);
@@ -212,13 +212,13 @@
 
     async account() {
       if(!_optionalChain$7([window, 'optionalAccess', _15 => _15.ethereum])) { return undefined }
-      const accounts = await window.ethereum.request({ method: 'eth_accounts' });
+      const accounts = (await window.ethereum.request({ method: 'eth_accounts' })).map((address)=>ethers.ethers.utils.getAddress(address));
       return accounts[0]
     }
 
     async connect() {
       if(!_optionalChain$7([window, 'optionalAccess', _16 => _16.ethereum])) { return undefined }
-      const accounts = await window.ethereum.request({ method: 'eth_requestAccounts' });
+      const accounts = (await window.ethereum.request({ method: 'eth_requestAccounts' })).map((address)=>ethers.ethers.utils.getAddress(address));
       return accounts[0]
     }
 
@@ -226,7 +226,7 @@
       let internalCallback;
       switch (event) {
         case 'account':
-          internalCallback = (accounts) => callback(accounts[0]);
+          internalCallback = (accounts) => callback(ethers.ethers.utils.getAddress(accounts[0]));
           window.ethereum.on('accountsChanged', internalCallback);
           break
       }
@@ -442,9 +442,10 @@
     }
 
     async account() {
-      if(_optionalChain$3([window, 'optionalAccess', _7 => _7.solana, 'optionalAccess', _8 => _8.publicKey])) {return window.solana.publicKey.toString() }
-      if(_optionalChain$3([window, 'optionalAccess', _9 => _9.solana]) == undefined){ return }
-      let { publicKey } = await window.solana.connect({ onlyIfTrusted: true });
+      if(_optionalChain$3([window, 'optionalAccess', _7 => _7.solana]) == undefined){ return }
+      if(_optionalChain$3([window, 'optionalAccess', _8 => _8.solana, 'optionalAccess', _9 => _9.publicKey])) { return window.solana.publicKey.toString() }
+      let publicKey;
+      try { ({ publicKey } = await window.solana.connect({ onlyIfTrusted: true })); } catch (e) {}
       if(publicKey){ return publicKey.toString() }
     }
 
@@ -648,14 +649,14 @@
       instance.on("connect", (error, payload) => {
         if (error) { throw error }
         const { accounts, chainId } = payload.params[0];
-        this.connectedAccounts = accounts;
+        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;
+        this.connectedAccounts = accounts.map((account)=>ethers.ethers.utils.getAddress(account));
         this.connectedChainId = chainId;
       });
 
@@ -691,12 +692,13 @@
           this.connector = this.newWalletConnectInstance();
         }
 
-        const { accounts, chainId } = await this.connector.connect({ chainId: _optionalChain([options, 'optionalAccess', _ => _.chainId]) });
+        let { accounts, chainId } = await this.connector.connect({ chainId: _optionalChain([options, 'optionalAccess', _ => _.chainId]) });
 
         if(accounts instanceof Array && accounts.length) {
           setConnectedInstance$1(this);
         }
 
+        accounts = accounts.map((account)=>ethers.ethers.utils.getAddress(account));
         this.connectedAccounts = accounts;
         this.connectedChainId = chainId;
 
@@ -779,8 +781,10 @@
       switch (event) {
         case 'account':
           internalCallback = (error, payload) => {
-            const { accounts } = payload.params[0];
-            if(accounts instanceof Array) { callback(accounts[0]); }
+            if(payload && payload.params && payload.params[0].accounts && payload.params[0].accounts instanceof Array) {
+              const accounts = payload.params[0].accounts.map((account)=>ethers.ethers.utils.getAddress(account));
+              callback(accounts[0]);
+            }
           };
           this.connector.on("session_update", internalCallback);
           break
@@ -920,7 +924,7 @@
 
     async account() {
       if(this.connectedAccounts == undefined) { return }
-      return this.connectedAccounts[0]
+      return ethers.ethers.utils.getAddress(this.connectedAccounts[0])
     }
 
     async connect(options) {
@@ -930,6 +934,7 @@
       if(accounts instanceof Array && accounts.length) {
         setConnectedInstance(this);
       }
+      accounts = accounts.map((account)=>ethers.ethers.utils.getAddress(account));
       this.connectedAccounts = accounts;
       this.connectedChainId = await this.connector.getChainId();
       return accounts[0]
@@ -988,7 +993,7 @@
       let internalCallback;
       switch (event) {
         case 'account':
-          internalCallback = (accounts) => callback(accounts[0]);
+          internalCallback = (accounts) => callback(ethers.ethers.utils.getAddress(accounts[0]));
           this.connector.on('accountsChanged', internalCallback);
           break
       }
@@ -1048,6 +1053,19 @@
     return availableWallets
   };
 
+  const getConnectedWallets = async()=>{
+
+    let connectedWallets = (await Promise.all(
+      getWallets().map(async(wallet)=>{
+        if(await wallet.account()) {
+          return wallet
+        }
+      })
+    )).filter((value)=>!!value);
+
+    return connectedWallets
+  };
+
   const supported = [
     wallets.MetaMask,
     wallets.Phantom,
@@ -1056,6 +1074,7 @@
     wallets.WalletLink
   ];
 
+  exports.getConnectedWallets = getConnectedWallets;
   exports.getWallets = getWallets;
   exports.supported = supported;
   exports.wallets = wallets;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@depay/web3-wallets-evm",
   "moduleName": "Web3Wallets",
-  "version": "12.4.2",
+  "version": "13.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",