@depay/web3-wallets-evm 14.6.5 → 14.8.0

package/dist/esm/index.js

@@ -1,8 +1,8 @@
 import { Blockchain } from '@depay/web3-blockchains';
 import { ethers } from 'ethers';
+import { request as request$2, getProvider, estimate } from '@depay/web3-client';
 import { CONSTANTS } from '@depay/web3-constants';
 import { PublicKey, Transaction as Transaction$1, SystemProgram } from '@depay/solana-web3.js';
-import { getProvider, request as request$1, estimate } from '@depay/web3-client';
 import { WalletConnectClient } from '@depay/walletconnect-v1';
 import { Core, SignClient } from '@depay/walletconnect-v2';
 import { CoinbaseWalletSDK } from '@depay/coinbase-wallet-sdk';
@@ -213,7 +213,7 @@ let getWindow = () => {
 
 // MAKE SURE PROVIDER SUPPORT BATCH SIZE OF 99 BATCH REQUESTS!
 const ENDPOINTS = {
-  ethereum: ['https://rpc.ankr.com/eth', 'https://eth-mainnet-public.unifra.io', 'https://ethereum.publicnode.com'],
+  ethereum: ['https://rpc.ankr.com/eth', 'https://eth.llamarpc.com', 'https://ethereum.publicnode.com'],
   bsc: ['https://bsc-dataseed.binance.org', 'https://bsc-dataseed1.ninicoin.io', 'https://bsc-dataseed3.defibit.io'],
   polygon: ['https://polygon-rpc.com', 'https://poly-rpc.gateway.pokt.network', 'https://matic-mainnet.chainstacklabs.com'],
   velas: ['https://mainnet.velas.com/rpc', 'https://evmexplorer.velas.com/rpc', 'https://explorer.velas.com/rpc'],
@@ -469,7 +469,7 @@ var requestEVM = async ({ blockchain, address, api, method, params, block }) =>
   }
 };
 
-let request = async function (url, options) {
+let request$1 = async function (url, options) {
   let { blockchain, address, method } = parseUrl(url);
   let { api, params, cache: cache$1, block } = (typeof(url) == 'object' ? url : options) || {};
 
@@ -495,7 +495,7 @@ const sendTransaction$4 = async ({ transaction, wallet })=> {
     throw({ code: 'WRONG_NETWORK' })
   }
   await transaction.prepare({ wallet });
-  let transactionCount = await request({ blockchain: transaction.blockchain, method: 'transactionCount', address: transaction.from });
+  let transactionCount = await request$1({ blockchain: transaction.blockchain, method: 'transactionCount', address: transaction.from });
   transaction.nonce = transactionCount;
   let provider = new ethers.providers.Web3Provider(wallet.getProvider(), 'any');
   let signer = provider.getSigner(0);
@@ -681,6 +681,10 @@ class WindowEthereum {
     })
   }
 
+  transactionCount({ blockchain, address }) {
+    return request$2({ blockchain, method: 'transactionCount', address })
+  }
+
   async sign(message) {
     await this.account();
     let provider = new ethers.providers.Web3Provider(this.getProvider(), 'any');
@@ -1024,7 +1028,7 @@ class Safe {
     if(jsonResult && jsonResult.nonce) {
       transactionCount = jsonResult.nonce;
     } else {
-      transactionCount = parseInt((await request$1({
+      transactionCount = parseInt((await request$2({
         blockchain: this.blockchain,
         address: this.address,
         api: [{"inputs":[],"name":"nonce","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"}],
@@ -1062,7 +1066,7 @@ const isSmartContractWallet = async(blockchain, address)=>{
 const identifySmartContractWallet = async (blockchain, address)=>{
   let name; 
   try {
-    name = await request$1({
+    name = await request$2({
       blockchain,
       address,
       api: [{ "constant": true, "inputs": [], "name": "NAME", "outputs": [{ "internalType": "string", "name": "", "type": "string" }], "payable": false, "stateMutability": "view", "type": "function"}],
@@ -1073,7 +1077,7 @@ const identifySmartContractWallet = async (blockchain, address)=>{
   
   let executor; 
   try {
-    executor = await request$1({
+    executor = await request$2({
       blockchain,
       address,
       api: [{ "constant": true, "inputs": [], "name": "staticCallExecutor", "outputs": [{ "internalType": "address", "name": "", "type": "address" }], "payable": false, "stateMutability": "view", "type": "function"}],
@@ -1107,7 +1111,7 @@ const sendTransaction$2 = async ({ transaction, wallet })=> {
   }
   await transaction.prepare({ wallet });
   const smartContractWallet = await getSmartContractWallet(transaction.blockchain, transaction.from);
-  const transactionCount = smartContractWallet ? await smartContractWallet.transactionCount() : await request$1({ blockchain: transaction.blockchain, method: 'transactionCount', address: transaction.from });
+  let transactionCount = await wallet.transactionCount({ blockchain: transaction.blockchain, address: transaction.from });
   transaction.nonce = transactionCount;
   await submit$2({ transaction, wallet }).then((tx)=>{
     if (tx) {
@@ -1221,6 +1225,16 @@ const setConnectedInstance$2 = (value)=>{
   window[KEY$1] = value;
 };
 
+const getWalletConnectInstance = (connect)=>{
+  return new WalletConnectClient({
+    bridge: "https://walletconnect.depay.com",
+    qrcodeModal: { 
+      open: async(uri)=>connect({ uri }),
+      close: ()=>{},
+    }
+  })
+};
+
 class WalletConnectV1 {
 
   static __initStatic() {this.info = {
@@ -1229,8 +1243,9 @@ class WalletConnectV1 {
     blockchains: ['ethereum', 'bsc', 'polygon', 'velas']
   };}
 
-  static __initStatic2() {this.isAvailable = ()=>{ 
-    return getConnectedInstance$2() != undefined 
+  static __initStatic2() {this.isAvailable = ()=>{
+    let connector = getWalletConnectInstance(()=>{});
+    return getConnectedInstance$2() != undefined || connector.connected
   };}
 
   constructor() {
@@ -1246,13 +1261,7 @@ class WalletConnectV1 {
   }
 
   newWalletConnectInstance(connect) {
-    let instance = new WalletConnectClient({
-      bridge: "https://walletconnect.depay.com",
-      qrcodeModal: { 
-        open: async(uri)=>connect({ uri }),
-        close: ()=>{},
-      }
-    });
+    let instance = getWalletConnectInstance(connect);
 
     instance.on("connect", (error, payload) => {
       if (error) { throw error }
@@ -1282,8 +1291,9 @@ class WalletConnectV1 {
   }
 
   async account() {
-    if(this.connectedAccounts == undefined) { return }
-    return this.connectedAccounts[0]
+    if(!this.connector){ return }
+    let accounts = await this.connector.sendCustomRequest({ method: 'eth_accounts' });
+    if(accounts && accounts.length) { return ethers.utils.getAddress(accounts[0]) }
   }
 
   async connect(options) {
@@ -1291,7 +1301,6 @@ class WalletConnectV1 {
     if(_optionalChain$2([options, 'optionalAccess', _ => _.name])) { this.name = options.name; }
     if(_optionalChain$2([options, 'optionalAccess', _2 => _2.logo])) { this.logo = options.logo; }
     try {
-      window.localStorage.removeItem('walletconnect'); // https://github.com/WalletConnect/walletconnect-monorepo/issues/315
 
       this.connector = WalletConnectV1.instance;
 
@@ -1300,23 +1309,26 @@ class WalletConnectV1 {
       }
 
       if(this.connector.connected) {
-        await this.connector.killSession();
-        setConnectedInstance$2(undefined);
-        this.connector = this.newWalletConnectInstance(connect);
-      }
 
-      let { accounts, chainId } = await this.connector.connect();
+        let account = await this.account();
+        this.connectedChainId = await this.connector.sendCustomRequest({ method: 'eth_chainId' });
 
-      if(accounts instanceof Array && accounts.length) {
-        setConnectedInstance$2(this);
-        accounts = accounts.map((account)=>ethers.utils.getAddress(account));
-        this.connectedAccounts = accounts;
-        this.connectedChainId = chainId;
-
-        return accounts[0]
+        return account
       } else {
-        return
+
+        let { accounts, chainId } = await this.connector.connect();
+
+        if(accounts instanceof Array && accounts.length) {
+          setConnectedInstance$2(this);
+          accounts = accounts.map((account)=>ethers.utils.getAddress(account));
+          this.connectedChainId = chainId;
+
+          return accounts[0]
+        } else {
+          return
+        }
       }
+      
     } catch (error) {
       console.log('WALLETCONNECT ERROR', error);
       return undefined
@@ -1414,6 +1426,15 @@ class WalletConnectV1 {
     }
   }
 
+  async transactionCount({ blockchain, address }) {
+    const smartContractWallet = await getSmartContractWallet(blockchain, address);
+    if(smartContractWallet) {
+      return await smartContractWallet.transactionCount()
+    } else {
+      return await request$2({ blockchain, method: 'transactionCount', address })
+    }
+  }
+
   async sign(message) {
     let address = await this.account();
     var params = [ethers.utils.toUtf8Bytes(message), address];
@@ -1435,7 +1456,7 @@ const sendTransaction$1 = async ({ transaction, wallet })=> {
     throw({ code: 'WRONG_NETWORK' })
   }
   await transaction.prepare({ wallet });
-  let transactionCount = await request$1({ blockchain: transaction.blockchain, method: 'transactionCount', address: transaction.from });
+  let transactionCount = await request$2({ blockchain: transaction.blockchain, method: 'transactionCount', address: transaction.from });
   transaction.nonce = transactionCount;
   await submit$1({ transaction, wallet }).then(async (response)=>{
     if(typeof response == 'string') {
@@ -1913,6 +1934,10 @@ class WalletLink {
     return internalCallback
   }
 
+  transactionCount({ blockchain, address }) {
+    return request({ blockchain, method: 'transactionCount', address })
+  }
+
   async sign(message) {
     await this.account();
     let provider = new ethers.providers.Web3Provider(this.connector, 'any');