@depay/web3-wallets-evm 15.6.0 → 15.8.0

package/README.md

@@ -14,6 +14,9 @@ npm install --save @depay/web3-wallets
 import { getWallets } from '@depay/web3-wallets'
 
 let wallets = await getWallets()
+
+// display wallets, have user pick one:
+
 let wallet = wallets[0]
 
 wallet.name // MetaMask
@@ -78,7 +81,8 @@ import { getWallets } from '@depay/web3-wallets-solana'
 
 ### getWallets
 
-`getWallets`: Returns an array of available/connectable wallets.
+`getWallets`: Returns an array of available/connectable wallets. Can wait up to 5 seconds because of checking existing WalletConnect connections.
+Use `drip` to receive available wallets faster.
 
 ```javascript
 let availableWallets = await getWallets();
@@ -87,7 +91,7 @@ let availableWallets = await getWallets();
 
 ```javascript
 let availableWallets = await getWallets();
-// [] no wallets detected. (you can still try WalletConnect or WalletLink)
+// [] no wallets detected. (you can still try have user connec via WalletConnect or WalletLink)
 ```
 
 ```javascript
@@ -108,6 +112,22 @@ if(availableWallets.length == 1) {
 }
 ```
 
+#### drip
+
+Pass a `drip` callback to `getWallets` to receive available wallet as soon as they are found, without waiting for all wallets to be checked:
+
+```javascript
+
+getWallets({
+  drip: (wallet)=>{
+    setAvaialbleWallets(
+      availableWallets.concat([wallet])
+    )
+  }
+})
+
+```
+
 ### Name
 
 `name:string`: Returns the name of the wallet.

package/dist/esm/index.evm.js

@@ -22639,7 +22639,7 @@ SystemProgram.programId = new PublicKey('11111111111111111111111111111111'); //
 // TODO: replace 300 with a proper constant for the size of the other
 // Transaction fields
 
-var CHUNK_SIZE$1 = PACKET_DATA_SIZE - 300;
+var CHUNK_SIZE$2 = PACKET_DATA_SIZE - 300;
 /**
  * Program loader interface
  */
@@ -22868,7 +22868,7 @@ var Loader = /*#__PURE__*/function () {
   return Loader;
 }();
 
-Loader.chunkSize = CHUNK_SIZE$1;
+Loader.chunkSize = CHUNK_SIZE$2;
 var BPF_LOADER_PROGRAM_ID = new PublicKey('BPFLoader2111111111111111111111111111111111');
 /**
  * Factory class for transactions to interact with a program loader
@@ -40700,8 +40700,27 @@ lib.u8;
 lib.vec;
 lib.vecU8;
 
-const BATCH_INTERVAL = 10;
-const CHUNK_SIZE = 99;
+let _window;
+
+let getWindow = () => {
+  if(_window) { return _window }
+  if (typeof global == 'object') {
+    _window = global;
+  } else {
+    _window = window;
+  }
+  return _window
+};
+
+const getConfiguration = () =>{
+  if(getWindow()._Web3ClientConfiguration === undefined) {
+    getWindow()._Web3ClientConfiguration = {};
+  }
+  return getWindow()._Web3ClientConfiguration
+};
+
+const BATCH_INTERVAL$1 = 10;
+const CHUNK_SIZE$1 = 99;
 
 class StaticJsonRpcBatchProvider extends ethers.providers.JsonRpcProvider {
 
@@ -40711,6 +40730,7 @@ class StaticJsonRpcBatchProvider extends ethers.providers.JsonRpcProvider {
     this._endpoint = url;
     this._endpoints = endpoints;
     this._failover = failover;
+    this._pendingBatch = [];
   }
 
   detectNetwork() {
@@ -40779,19 +40799,19 @@ class StaticJsonRpcBatchProvider extends ethers.providers.JsonRpcProvider {
         // Get the current batch and clear it, so new requests
         // go into the next batch
         const batch = this._pendingBatch;
-        this._pendingBatch = null;
+        this._pendingBatch = [];
         this._pendingBatchAggregator = null;
         // Prepare Chunks of CHUNK_SIZE
         const chunks = [];
-        for (let i = 0; i < Math.ceil(batch.length / CHUNK_SIZE); i++) {
-          chunks[i] = batch.slice(i*CHUNK_SIZE, (i+1)*CHUNK_SIZE);
+        for (let i = 0; i < Math.ceil(batch.length / CHUNK_SIZE$1); i++) {
+          chunks[i] = batch.slice(i*CHUNK_SIZE$1, (i+1)*CHUNK_SIZE$1);
         }
         chunks.forEach((chunk)=>{
           // Get the request as an array of requests
           chunk.map((inflight) => inflight.request);
           return this.requestChunk(chunk, this._endpoint)
         });
-      }, BATCH_INTERVAL);
+      }, getConfiguration().batchInterval || BATCH_INTERVAL$1);
     }
 
     return promise
@@ -40799,18 +40819,6 @@ class StaticJsonRpcBatchProvider extends ethers.providers.JsonRpcProvider {
 
 }
 
-let _window;
-
-let getWindow = () => {
-  if(_window) { return _window }
-  if (typeof global == 'object') {
-    _window = global;
-  } else {
-    _window = window;
-  }
-  return _window
-};
-
 const getAllProviders$1 = ()=> {
   if(getWindow()._Web3ClientProviders == undefined) {
     getWindow()._Web3ClientProviders = {};
@@ -40919,14 +40927,96 @@ var EVM = {
   setProvider: setProvider$2,
 };
 
+const BATCH_INTERVAL = 10;
+const CHUNK_SIZE = 99;
+
 class StaticJsonRpcSequentialProvider extends Connection {
 
   constructor(url, network, endpoints, failover) {
     super(url);
+    this._provider = new Connection(url);
     this._network = network;
     this._endpoint = url;
     this._endpoints = endpoints;
     this._failover = failover;
+    this._pendingBatch = [];
+    this._rpcRequest = this._rpcRequestReplacement.bind(this);
+  }
+
+  requestChunk(chunk) {
+
+    const batch = chunk.map((inflight) => inflight.request);
+
+    return this._provider._rpcBatchRequest(batch)
+      .then((result) => {
+        // For each result, feed it to the correct Promise, depending
+        // on whether it was a success or error
+        chunk.forEach((inflightRequest, index) => {
+          const payload = result[index];
+          if (payload.error) {
+            const error = new Error(payload.error.message);
+            error.code = payload.error.code;
+            error.data = payload.error.data;
+            inflightRequest.reject(error);
+          } else {
+            inflightRequest.resolve(payload);
+          }
+        });
+      }).catch((error) => {
+        if(error && [
+          'Failed to fetch', '504', '503', '502', '500', '429', '426', '422', '413', '409', '408', '406', '405', '404', '403', '402', '401', '400'
+        ].some((errorType)=>error.toString().match(errorType))) {
+          const index = this._endpoints.indexOf(this._endpoint)+1;
+          this._endpoint = index >= this._endpoints.length ? this._endpoints[0] : this._endpoints[index];
+          this._provider = new Connection(this._endpoint);
+          this.requestChunk(chunk);
+        } else {
+          chunk.forEach((inflightRequest) => {
+            inflightRequest.reject(error);
+          });
+        }
+      })
+  }
+    
+  _rpcRequestReplacement(methodName, args) {
+
+    const request = { methodName, args };
+
+    if (this._pendingBatch == null) {
+      this._pendingBatch = [];
+    }
+
+    const inflightRequest = { request, resolve: null, reject: null };
+
+    const promise = new Promise((resolve, reject) => {
+      inflightRequest.resolve = resolve;
+      inflightRequest.reject = reject;
+    });
+
+    this._pendingBatch.push(inflightRequest);
+
+    if (!this._pendingBatchAggregator) {
+      // Schedule batch for next event loop + short duration
+      this._pendingBatchAggregator = setTimeout(() => {
+        // Get the current batch and clear it, so new requests
+        // go into the next batch
+        const batch = this._pendingBatch;
+        this._pendingBatch = [];
+        this._pendingBatchAggregator = null;
+        // Prepare Chunks of CHUNK_SIZE
+        const chunks = [];
+        for (let i = 0; i < Math.ceil(batch.length / CHUNK_SIZE); i++) {
+          chunks[i] = batch.slice(i*CHUNK_SIZE, (i+1)*CHUNK_SIZE);
+        }
+        chunks.forEach((chunk)=>{
+          // Get the request as an array of requests
+          chunk.map((inflight) => inflight.request);
+          return this.requestChunk(chunk)
+        });
+      }, getConfiguration().batchInterval || BATCH_INTERVAL);
+    }
+
+    return promise
   }
 }
 
@@ -40949,7 +41039,13 @@ const setProvider$1 = (blockchain, provider)=> {
 const setProviderEndpoints$1 = async (blockchain, endpoints, detectFastest = true)=> {
   
   getAllProviders()[blockchain] = endpoints.map((endpoint, index)=>
-    new StaticJsonRpcSequentialProvider(endpoint, blockchain, endpoints)
+    new StaticJsonRpcSequentialProvider(endpoint, blockchain, endpoints, ()=>{
+      if(getAllProviders()[blockchain].length === 1) {
+        setProviderEndpoints$1(blockchain, endpoints, detectFastest);
+      } else {
+        getAllProviders()[blockchain].splice(index, 1);
+      }
+    })
   );
 
   let provider;
@@ -41134,13 +41230,6 @@ let cache = function ({ call, key, expires = 0 }) {
   })
 };
 
-const getConfiguration = () =>{
-  if(getWindow()._Web3ClientConfiguration === undefined) {
-    getWindow()._Web3ClientConfiguration = {};
-  }
-  return getWindow()._Web3ClientConfiguration
-};
-
 let paramsToContractArgs = ({ contract, method, params }) => {
   let fragment = contract.interface.fragments.find((fragment) => {
     return fragment.name == method
@@ -42182,7 +42271,10 @@ const getPlainInstance = ()=>{
 const isConnected = ()=>{
   return new Promise(async(resolve, reject)=>{
     
-    setTimeout(()=>{ resolve(false); }, 800);
+    setTimeout(()=>{ 
+      delete localStorage['walletconnect'];
+      resolve(false);
+    }, 5000);
 
     if(!localStorage['walletconnect'] || JSON.parse(localStorage['walletconnect']).handshakeTopic.length == 0) {
       delete localStorage['walletconnect'];
@@ -42668,10 +42760,14 @@ var wallets = {
   WalletLink
 };
 
-const getWallets = async()=>{
+const getWallets = async(args)=>{
+
+  let drip = (args && typeof args.drip === 'function') ? args.drip : undefined;
 
   let availableWallets = await Promise.all(
+    
     Object.keys(wallets).map(
+      
       async(key)=>{
       
         let wallet = wallets[key];
@@ -42681,16 +42777,18 @@ const getWallets = async()=>{
           
           if(wallet.getConnectedInstance) {
             instance = await wallet.getConnectedInstance();
+            if(drip) { drip(instance); }
             return instance
           } else {
+            if(drip) { drip(wallet); }
             return new wallet
-          }          
+          }
         }
       }
     )
   );
 
-  return availableWallets.filter((wallet)=>wallet)
+  return availableWallets.filter(Boolean)
 };
 
 const supported = [

package/dist/esm/index.js

@@ -839,7 +839,10 @@ const getPlainInstance = ()=>{
 const isConnected = ()=>{
   return new Promise(async(resolve, reject)=>{
     
-    setTimeout(()=>{ resolve(false); }, 800);
+    setTimeout(()=>{ 
+      delete localStorage['walletconnect'];
+      resolve(false);
+    }, 5000);
 
     if(!localStorage['walletconnect'] || JSON.parse(localStorage['walletconnect']).handshakeTopic.length == 0) {
       delete localStorage['walletconnect'];
@@ -1325,10 +1328,14 @@ var wallets = {
   WalletLink
 };
 
-const getWallets = async()=>{
+const getWallets = async(args)=>{
+
+  let drip = (args && typeof args.drip === 'function') ? args.drip : undefined;
 
   let availableWallets = await Promise.all(
+    
     Object.keys(wallets).map(
+      
       async(key)=>{
       
         let wallet = wallets[key];
@@ -1338,16 +1345,18 @@ const getWallets = async()=>{
           
           if(wallet.getConnectedInstance) {
             instance = await wallet.getConnectedInstance();
+            if(drip) { drip(instance); }
             return instance
           } else {
+            if(drip) { drip(wallet); }
             return new wallet
-          }          
+          }
         }
       }
     )
   );
 
-  return availableWallets.filter((wallet)=>wallet)
+  return availableWallets.filter(Boolean)
 };
 
 const supported = [

package/dist/esm/index.solana.js

@@ -9,8 +9,27 @@ let supported$2 = ['solana'];
 supported$2.evm = [];
 supported$2.solana = ['solana'];
 
-const BATCH_INTERVAL = 10;
-const CHUNK_SIZE = 99;
+let _window;
+
+let getWindow = () => {
+  if(_window) { return _window }
+  if (typeof global == 'object') {
+    _window = global;
+  } else {
+    _window = window;
+  }
+  return _window
+};
+
+const getConfiguration = () =>{
+  if(getWindow()._Web3ClientConfiguration === undefined) {
+    getWindow()._Web3ClientConfiguration = {};
+  }
+  return getWindow()._Web3ClientConfiguration
+};
+
+const BATCH_INTERVAL$1 = 10;
+const CHUNK_SIZE$1 = 99;
 
 class StaticJsonRpcBatchProvider extends ethers.providers.JsonRpcProvider {
 
@@ -20,6 +39,7 @@ class StaticJsonRpcBatchProvider extends ethers.providers.JsonRpcProvider {
     this._endpoint = url;
     this._endpoints = endpoints;
     this._failover = failover;
+    this._pendingBatch = [];
   }
 
   detectNetwork() {
@@ -88,19 +108,19 @@ class StaticJsonRpcBatchProvider extends ethers.providers.JsonRpcProvider {
         // Get the current batch and clear it, so new requests
         // go into the next batch
         const batch = this._pendingBatch;
-        this._pendingBatch = null;
+        this._pendingBatch = [];
         this._pendingBatchAggregator = null;
         // Prepare Chunks of CHUNK_SIZE
         const chunks = [];
-        for (let i = 0; i < Math.ceil(batch.length / CHUNK_SIZE); i++) {
-          chunks[i] = batch.slice(i*CHUNK_SIZE, (i+1)*CHUNK_SIZE);
+        for (let i = 0; i < Math.ceil(batch.length / CHUNK_SIZE$1); i++) {
+          chunks[i] = batch.slice(i*CHUNK_SIZE$1, (i+1)*CHUNK_SIZE$1);
         }
         chunks.forEach((chunk)=>{
           // Get the request as an array of requests
           chunk.map((inflight) => inflight.request);
           return this.requestChunk(chunk, this._endpoint)
         });
-      }, BATCH_INTERVAL);
+      }, getConfiguration().batchInterval || BATCH_INTERVAL$1);
     }
 
     return promise
@@ -108,18 +128,6 @@ class StaticJsonRpcBatchProvider extends ethers.providers.JsonRpcProvider {
 
 }
 
-let _window;
-
-let getWindow = () => {
-  if(_window) { return _window }
-  if (typeof global == 'object') {
-    _window = global;
-  } else {
-    _window = window;
-  }
-  return _window
-};
-
 const getAllProviders$1 = ()=> {
   if(getWindow()._Web3ClientProviders == undefined) {
     getWindow()._Web3ClientProviders = {};
@@ -228,14 +236,96 @@ var EVM = {
   setProvider: setProvider$2,
 };
 
+const BATCH_INTERVAL = 10;
+const CHUNK_SIZE = 99;
+
 class StaticJsonRpcSequentialProvider extends Connection {
 
   constructor(url, network, endpoints, failover) {
     super(url);
+    this._provider = new Connection(url);
     this._network = network;
     this._endpoint = url;
     this._endpoints = endpoints;
     this._failover = failover;
+    this._pendingBatch = [];
+    this._rpcRequest = this._rpcRequestReplacement.bind(this);
+  }
+
+  requestChunk(chunk) {
+
+    const batch = chunk.map((inflight) => inflight.request);
+
+    return this._provider._rpcBatchRequest(batch)
+      .then((result) => {
+        // For each result, feed it to the correct Promise, depending
+        // on whether it was a success or error
+        chunk.forEach((inflightRequest, index) => {
+          const payload = result[index];
+          if (payload.error) {
+            const error = new Error(payload.error.message);
+            error.code = payload.error.code;
+            error.data = payload.error.data;
+            inflightRequest.reject(error);
+          } else {
+            inflightRequest.resolve(payload);
+          }
+        });
+      }).catch((error) => {
+        if(error && [
+          'Failed to fetch', '504', '503', '502', '500', '429', '426', '422', '413', '409', '408', '406', '405', '404', '403', '402', '401', '400'
+        ].some((errorType)=>error.toString().match(errorType))) {
+          const index = this._endpoints.indexOf(this._endpoint)+1;
+          this._endpoint = index >= this._endpoints.length ? this._endpoints[0] : this._endpoints[index];
+          this._provider = new Connection(this._endpoint);
+          this.requestChunk(chunk);
+        } else {
+          chunk.forEach((inflightRequest) => {
+            inflightRequest.reject(error);
+          });
+        }
+      })
+  }
+    
+  _rpcRequestReplacement(methodName, args) {
+
+    const request = { methodName, args };
+
+    if (this._pendingBatch == null) {
+      this._pendingBatch = [];
+    }
+
+    const inflightRequest = { request, resolve: null, reject: null };
+
+    const promise = new Promise((resolve, reject) => {
+      inflightRequest.resolve = resolve;
+      inflightRequest.reject = reject;
+    });
+
+    this._pendingBatch.push(inflightRequest);
+
+    if (!this._pendingBatchAggregator) {
+      // Schedule batch for next event loop + short duration
+      this._pendingBatchAggregator = setTimeout(() => {
+        // Get the current batch and clear it, so new requests
+        // go into the next batch
+        const batch = this._pendingBatch;
+        this._pendingBatch = [];
+        this._pendingBatchAggregator = null;
+        // Prepare Chunks of CHUNK_SIZE
+        const chunks = [];
+        for (let i = 0; i < Math.ceil(batch.length / CHUNK_SIZE); i++) {
+          chunks[i] = batch.slice(i*CHUNK_SIZE, (i+1)*CHUNK_SIZE);
+        }
+        chunks.forEach((chunk)=>{
+          // Get the request as an array of requests
+          chunk.map((inflight) => inflight.request);
+          return this.requestChunk(chunk)
+        });
+      }, getConfiguration().batchInterval || BATCH_INTERVAL);
+    }
+
+    return promise
   }
 }
 
@@ -258,7 +348,13 @@ const setProvider$1 = (blockchain, provider)=> {
 const setProviderEndpoints$1 = async (blockchain, endpoints, detectFastest = true)=> {
   
   getAllProviders()[blockchain] = endpoints.map((endpoint, index)=>
-    new StaticJsonRpcSequentialProvider(endpoint, blockchain, endpoints)
+    new StaticJsonRpcSequentialProvider(endpoint, blockchain, endpoints, ()=>{
+      if(getAllProviders()[blockchain].length === 1) {
+        setProviderEndpoints$1(blockchain, endpoints, detectFastest);
+      } else {
+        getAllProviders()[blockchain].splice(index, 1);
+      }
+    })
   );
 
   let provider;
@@ -443,13 +539,6 @@ let cache = function ({ call, key, expires = 0 }) {
   })
 };
 
-const getConfiguration = () =>{
-  if(getWindow()._Web3ClientConfiguration === undefined) {
-    getWindow()._Web3ClientConfiguration = {};
-  }
-  return getWindow()._Web3ClientConfiguration
-};
-
 let paramsToContractArgs = ({ contract, method, params }) => {
   let fragment = contract.interface.fragments.find((fragment) => {
     return fragment.name == method
@@ -1491,7 +1580,10 @@ const getPlainInstance = ()=>{
 const isConnected = ()=>{
   return new Promise(async(resolve, reject)=>{
     
-    setTimeout(()=>{ resolve(false); }, 800);
+    setTimeout(()=>{ 
+      delete localStorage['walletconnect'];
+      resolve(false);
+    }, 5000);
 
     if(!localStorage['walletconnect'] || JSON.parse(localStorage['walletconnect']).handshakeTopic.length == 0) {
       delete localStorage['walletconnect'];
@@ -1977,10 +2069,14 @@ var wallets = {
   WalletLink
 };
 
-const getWallets = async()=>{
+const getWallets = async(args)=>{
+
+  let drip = (args && typeof args.drip === 'function') ? args.drip : undefined;
 
   let availableWallets = await Promise.all(
+    
     Object.keys(wallets).map(
+      
       async(key)=>{
       
         let wallet = wallets[key];
@@ -1990,16 +2086,18 @@ const getWallets = async()=>{
           
           if(wallet.getConnectedInstance) {
             instance = await wallet.getConnectedInstance();
+            if(drip) { drip(instance); }
             return instance
           } else {
+            if(drip) { drip(wallet); }
             return new wallet
-          }          
+          }
         }
       }
     )
   );
 
-  return availableWallets.filter((wallet)=>wallet)
+  return availableWallets.filter(Boolean)
 };
 
 const supported = [

package/dist/umd/index.evm.js

@@ -22643,7 +22643,7 @@
   // TODO: replace 300 with a proper constant for the size of the other
   // Transaction fields
 
-  var CHUNK_SIZE$1 = PACKET_DATA_SIZE - 300;
+  var CHUNK_SIZE$2 = PACKET_DATA_SIZE - 300;
   /**
    * Program loader interface
    */
@@ -22872,7 +22872,7 @@
     return Loader;
   }();
 
-  Loader.chunkSize = CHUNK_SIZE$1;
+  Loader.chunkSize = CHUNK_SIZE$2;
   var BPF_LOADER_PROGRAM_ID = new PublicKey('BPFLoader2111111111111111111111111111111111');
   /**
    * Factory class for transactions to interact with a program loader
@@ -40704,8 +40704,27 @@
   lib.vec;
   lib.vecU8;
 
-  const BATCH_INTERVAL = 10;
-  const CHUNK_SIZE = 99;
+  let _window;
+
+  let getWindow = () => {
+    if(_window) { return _window }
+    if (typeof global == 'object') {
+      _window = global;
+    } else {
+      _window = window;
+    }
+    return _window
+  };
+
+  const getConfiguration = () =>{
+    if(getWindow()._Web3ClientConfiguration === undefined) {
+      getWindow()._Web3ClientConfiguration = {};
+    }
+    return getWindow()._Web3ClientConfiguration
+  };
+
+  const BATCH_INTERVAL$1 = 10;
+  const CHUNK_SIZE$1 = 99;
 
   class StaticJsonRpcBatchProvider extends ethers.ethers.providers.JsonRpcProvider {
 
@@ -40715,6 +40734,7 @@
       this._endpoint = url;
       this._endpoints = endpoints;
       this._failover = failover;
+      this._pendingBatch = [];
     }
 
     detectNetwork() {
@@ -40783,19 +40803,19 @@
           // Get the current batch and clear it, so new requests
           // go into the next batch
           const batch = this._pendingBatch;
-          this._pendingBatch = null;
+          this._pendingBatch = [];
           this._pendingBatchAggregator = null;
           // Prepare Chunks of CHUNK_SIZE
           const chunks = [];
-          for (let i = 0; i < Math.ceil(batch.length / CHUNK_SIZE); i++) {
-            chunks[i] = batch.slice(i*CHUNK_SIZE, (i+1)*CHUNK_SIZE);
+          for (let i = 0; i < Math.ceil(batch.length / CHUNK_SIZE$1); i++) {
+            chunks[i] = batch.slice(i*CHUNK_SIZE$1, (i+1)*CHUNK_SIZE$1);
           }
           chunks.forEach((chunk)=>{
             // Get the request as an array of requests
             chunk.map((inflight) => inflight.request);
             return this.requestChunk(chunk, this._endpoint)
           });
-        }, BATCH_INTERVAL);
+        }, getConfiguration().batchInterval || BATCH_INTERVAL$1);
       }
 
       return promise
@@ -40803,18 +40823,6 @@
 
   }
 
-  let _window;
-
-  let getWindow = () => {
-    if(_window) { return _window }
-    if (typeof global == 'object') {
-      _window = global;
-    } else {
-      _window = window;
-    }
-    return _window
-  };
-
   const getAllProviders$1 = ()=> {
     if(getWindow()._Web3ClientProviders == undefined) {
       getWindow()._Web3ClientProviders = {};
@@ -40923,14 +40931,96 @@
     setProvider: setProvider$2,
   };
 
+  const BATCH_INTERVAL = 10;
+  const CHUNK_SIZE = 99;
+
   class StaticJsonRpcSequentialProvider extends Connection {
 
     constructor(url, network, endpoints, failover) {
       super(url);
+      this._provider = new Connection(url);
       this._network = network;
       this._endpoint = url;
       this._endpoints = endpoints;
       this._failover = failover;
+      this._pendingBatch = [];
+      this._rpcRequest = this._rpcRequestReplacement.bind(this);
+    }
+
+    requestChunk(chunk) {
+
+      const batch = chunk.map((inflight) => inflight.request);
+
+      return this._provider._rpcBatchRequest(batch)
+        .then((result) => {
+          // For each result, feed it to the correct Promise, depending
+          // on whether it was a success or error
+          chunk.forEach((inflightRequest, index) => {
+            const payload = result[index];
+            if (payload.error) {
+              const error = new Error(payload.error.message);
+              error.code = payload.error.code;
+              error.data = payload.error.data;
+              inflightRequest.reject(error);
+            } else {
+              inflightRequest.resolve(payload);
+            }
+          });
+        }).catch((error) => {
+          if(error && [
+            'Failed to fetch', '504', '503', '502', '500', '429', '426', '422', '413', '409', '408', '406', '405', '404', '403', '402', '401', '400'
+          ].some((errorType)=>error.toString().match(errorType))) {
+            const index = this._endpoints.indexOf(this._endpoint)+1;
+            this._endpoint = index >= this._endpoints.length ? this._endpoints[0] : this._endpoints[index];
+            this._provider = new Connection(this._endpoint);
+            this.requestChunk(chunk);
+          } else {
+            chunk.forEach((inflightRequest) => {
+              inflightRequest.reject(error);
+            });
+          }
+        })
+    }
+      
+    _rpcRequestReplacement(methodName, args) {
+
+      const request = { methodName, args };
+
+      if (this._pendingBatch == null) {
+        this._pendingBatch = [];
+      }
+
+      const inflightRequest = { request, resolve: null, reject: null };
+
+      const promise = new Promise((resolve, reject) => {
+        inflightRequest.resolve = resolve;
+        inflightRequest.reject = reject;
+      });
+
+      this._pendingBatch.push(inflightRequest);
+
+      if (!this._pendingBatchAggregator) {
+        // Schedule batch for next event loop + short duration
+        this._pendingBatchAggregator = setTimeout(() => {
+          // Get the current batch and clear it, so new requests
+          // go into the next batch
+          const batch = this._pendingBatch;
+          this._pendingBatch = [];
+          this._pendingBatchAggregator = null;
+          // Prepare Chunks of CHUNK_SIZE
+          const chunks = [];
+          for (let i = 0; i < Math.ceil(batch.length / CHUNK_SIZE); i++) {
+            chunks[i] = batch.slice(i*CHUNK_SIZE, (i+1)*CHUNK_SIZE);
+          }
+          chunks.forEach((chunk)=>{
+            // Get the request as an array of requests
+            chunk.map((inflight) => inflight.request);
+            return this.requestChunk(chunk)
+          });
+        }, getConfiguration().batchInterval || BATCH_INTERVAL);
+      }
+
+      return promise
     }
   }
 
@@ -40953,7 +41043,13 @@
   const setProviderEndpoints$1 = async (blockchain, endpoints, detectFastest = true)=> {
     
     getAllProviders()[blockchain] = endpoints.map((endpoint, index)=>
-      new StaticJsonRpcSequentialProvider(endpoint, blockchain, endpoints)
+      new StaticJsonRpcSequentialProvider(endpoint, blockchain, endpoints, ()=>{
+        if(getAllProviders()[blockchain].length === 1) {
+          setProviderEndpoints$1(blockchain, endpoints, detectFastest);
+        } else {
+          getAllProviders()[blockchain].splice(index, 1);
+        }
+      })
     );
 
     let provider;
@@ -41138,13 +41234,6 @@
     })
   };
 
-  const getConfiguration = () =>{
-    if(getWindow()._Web3ClientConfiguration === undefined) {
-      getWindow()._Web3ClientConfiguration = {};
-    }
-    return getWindow()._Web3ClientConfiguration
-  };
-
   let paramsToContractArgs = ({ contract, method, params }) => {
     let fragment = contract.interface.fragments.find((fragment) => {
       return fragment.name == method
@@ -42186,7 +42275,10 @@
   const isConnected = ()=>{
     return new Promise(async(resolve, reject)=>{
       
-      setTimeout(()=>{ resolve(false); }, 800);
+      setTimeout(()=>{ 
+        delete localStorage['walletconnect'];
+        resolve(false);
+      }, 5000);
 
       if(!localStorage['walletconnect'] || JSON.parse(localStorage['walletconnect']).handshakeTopic.length == 0) {
         delete localStorage['walletconnect'];
@@ -42672,10 +42764,14 @@
     WalletLink
   };
 
-  const getWallets = async()=>{
+  const getWallets = async(args)=>{
+
+    let drip = (args && typeof args.drip === 'function') ? args.drip : undefined;
 
     let availableWallets = await Promise.all(
+      
       Object.keys(wallets).map(
+        
         async(key)=>{
         
           let wallet = wallets[key];
@@ -42685,16 +42781,18 @@
             
             if(wallet.getConnectedInstance) {
               instance = await wallet.getConnectedInstance();
+              if(drip) { drip(instance); }
               return instance
             } else {
+              if(drip) { drip(wallet); }
               return new wallet
-            }          
+            }
           }
         }
       )
     );
 
-    return availableWallets.filter((wallet)=>wallet)
+    return availableWallets.filter(Boolean)
   };
 
   const supported = [

package/dist/umd/index.js

@@ -842,7 +842,10 @@
   const isConnected = ()=>{
     return new Promise(async(resolve, reject)=>{
       
-      setTimeout(()=>{ resolve(false); }, 800);
+      setTimeout(()=>{ 
+        delete localStorage['walletconnect'];
+        resolve(false);
+      }, 5000);
 
       if(!localStorage['walletconnect'] || JSON.parse(localStorage['walletconnect']).handshakeTopic.length == 0) {
         delete localStorage['walletconnect'];
@@ -1328,10 +1331,14 @@
     WalletLink
   };
 
-  const getWallets = async()=>{
+  const getWallets = async(args)=>{
+
+    let drip = (args && typeof args.drip === 'function') ? args.drip : undefined;
 
     let availableWallets = await Promise.all(
+      
       Object.keys(wallets).map(
+        
         async(key)=>{
         
           let wallet = wallets[key];
@@ -1341,16 +1348,18 @@
             
             if(wallet.getConnectedInstance) {
               instance = await wallet.getConnectedInstance();
+              if(drip) { drip(instance); }
               return instance
             } else {
+              if(drip) { drip(wallet); }
               return new wallet
-            }          
+            }
           }
         }
       )
     );
 
-    return availableWallets.filter((wallet)=>wallet)
+    return availableWallets.filter(Boolean)
   };
 
   const supported = [

package/dist/umd/index.solana.js

@@ -12,8 +12,27 @@
   supported$2.evm = [];
   supported$2.solana = ['solana'];
 
-  const BATCH_INTERVAL = 10;
-  const CHUNK_SIZE = 99;
+  let _window;
+
+  let getWindow = () => {
+    if(_window) { return _window }
+    if (typeof global == 'object') {
+      _window = global;
+    } else {
+      _window = window;
+    }
+    return _window
+  };
+
+  const getConfiguration = () =>{
+    if(getWindow()._Web3ClientConfiguration === undefined) {
+      getWindow()._Web3ClientConfiguration = {};
+    }
+    return getWindow()._Web3ClientConfiguration
+  };
+
+  const BATCH_INTERVAL$1 = 10;
+  const CHUNK_SIZE$1 = 99;
 
   class StaticJsonRpcBatchProvider extends ethers.ethers.providers.JsonRpcProvider {
 
@@ -23,6 +42,7 @@
       this._endpoint = url;
       this._endpoints = endpoints;
       this._failover = failover;
+      this._pendingBatch = [];
     }
 
     detectNetwork() {
@@ -91,19 +111,19 @@
           // Get the current batch and clear it, so new requests
           // go into the next batch
           const batch = this._pendingBatch;
-          this._pendingBatch = null;
+          this._pendingBatch = [];
           this._pendingBatchAggregator = null;
           // Prepare Chunks of CHUNK_SIZE
           const chunks = [];
-          for (let i = 0; i < Math.ceil(batch.length / CHUNK_SIZE); i++) {
-            chunks[i] = batch.slice(i*CHUNK_SIZE, (i+1)*CHUNK_SIZE);
+          for (let i = 0; i < Math.ceil(batch.length / CHUNK_SIZE$1); i++) {
+            chunks[i] = batch.slice(i*CHUNK_SIZE$1, (i+1)*CHUNK_SIZE$1);
           }
           chunks.forEach((chunk)=>{
             // Get the request as an array of requests
             chunk.map((inflight) => inflight.request);
             return this.requestChunk(chunk, this._endpoint)
           });
-        }, BATCH_INTERVAL);
+        }, getConfiguration().batchInterval || BATCH_INTERVAL$1);
       }
 
       return promise
@@ -111,18 +131,6 @@
 
   }
 
-  let _window;
-
-  let getWindow = () => {
-    if(_window) { return _window }
-    if (typeof global == 'object') {
-      _window = global;
-    } else {
-      _window = window;
-    }
-    return _window
-  };
-
   const getAllProviders$1 = ()=> {
     if(getWindow()._Web3ClientProviders == undefined) {
       getWindow()._Web3ClientProviders = {};
@@ -231,14 +239,96 @@
     setProvider: setProvider$2,
   };
 
+  const BATCH_INTERVAL = 10;
+  const CHUNK_SIZE = 99;
+
   class StaticJsonRpcSequentialProvider extends solanaWeb3_js.Connection {
 
     constructor(url, network, endpoints, failover) {
       super(url);
+      this._provider = new solanaWeb3_js.Connection(url);
       this._network = network;
       this._endpoint = url;
       this._endpoints = endpoints;
       this._failover = failover;
+      this._pendingBatch = [];
+      this._rpcRequest = this._rpcRequestReplacement.bind(this);
+    }
+
+    requestChunk(chunk) {
+
+      const batch = chunk.map((inflight) => inflight.request);
+
+      return this._provider._rpcBatchRequest(batch)
+        .then((result) => {
+          // For each result, feed it to the correct Promise, depending
+          // on whether it was a success or error
+          chunk.forEach((inflightRequest, index) => {
+            const payload = result[index];
+            if (payload.error) {
+              const error = new Error(payload.error.message);
+              error.code = payload.error.code;
+              error.data = payload.error.data;
+              inflightRequest.reject(error);
+            } else {
+              inflightRequest.resolve(payload);
+            }
+          });
+        }).catch((error) => {
+          if(error && [
+            'Failed to fetch', '504', '503', '502', '500', '429', '426', '422', '413', '409', '408', '406', '405', '404', '403', '402', '401', '400'
+          ].some((errorType)=>error.toString().match(errorType))) {
+            const index = this._endpoints.indexOf(this._endpoint)+1;
+            this._endpoint = index >= this._endpoints.length ? this._endpoints[0] : this._endpoints[index];
+            this._provider = new solanaWeb3_js.Connection(this._endpoint);
+            this.requestChunk(chunk);
+          } else {
+            chunk.forEach((inflightRequest) => {
+              inflightRequest.reject(error);
+            });
+          }
+        })
+    }
+      
+    _rpcRequestReplacement(methodName, args) {
+
+      const request = { methodName, args };
+
+      if (this._pendingBatch == null) {
+        this._pendingBatch = [];
+      }
+
+      const inflightRequest = { request, resolve: null, reject: null };
+
+      const promise = new Promise((resolve, reject) => {
+        inflightRequest.resolve = resolve;
+        inflightRequest.reject = reject;
+      });
+
+      this._pendingBatch.push(inflightRequest);
+
+      if (!this._pendingBatchAggregator) {
+        // Schedule batch for next event loop + short duration
+        this._pendingBatchAggregator = setTimeout(() => {
+          // Get the current batch and clear it, so new requests
+          // go into the next batch
+          const batch = this._pendingBatch;
+          this._pendingBatch = [];
+          this._pendingBatchAggregator = null;
+          // Prepare Chunks of CHUNK_SIZE
+          const chunks = [];
+          for (let i = 0; i < Math.ceil(batch.length / CHUNK_SIZE); i++) {
+            chunks[i] = batch.slice(i*CHUNK_SIZE, (i+1)*CHUNK_SIZE);
+          }
+          chunks.forEach((chunk)=>{
+            // Get the request as an array of requests
+            chunk.map((inflight) => inflight.request);
+            return this.requestChunk(chunk)
+          });
+        }, getConfiguration().batchInterval || BATCH_INTERVAL);
+      }
+
+      return promise
     }
   }
 
@@ -261,7 +351,13 @@
   const setProviderEndpoints$1 = async (blockchain, endpoints, detectFastest = true)=> {
     
     getAllProviders()[blockchain] = endpoints.map((endpoint, index)=>
-      new StaticJsonRpcSequentialProvider(endpoint, blockchain, endpoints)
+      new StaticJsonRpcSequentialProvider(endpoint, blockchain, endpoints, ()=>{
+        if(getAllProviders()[blockchain].length === 1) {
+          setProviderEndpoints$1(blockchain, endpoints, detectFastest);
+        } else {
+          getAllProviders()[blockchain].splice(index, 1);
+        }
+      })
     );
 
     let provider;
@@ -446,13 +542,6 @@
     })
   };
 
-  const getConfiguration = () =>{
-    if(getWindow()._Web3ClientConfiguration === undefined) {
-      getWindow()._Web3ClientConfiguration = {};
-    }
-    return getWindow()._Web3ClientConfiguration
-  };
-
   let paramsToContractArgs = ({ contract, method, params }) => {
     let fragment = contract.interface.fragments.find((fragment) => {
       return fragment.name == method
@@ -1494,7 +1583,10 @@
   const isConnected = ()=>{
     return new Promise(async(resolve, reject)=>{
       
-      setTimeout(()=>{ resolve(false); }, 800);
+      setTimeout(()=>{ 
+        delete localStorage['walletconnect'];
+        resolve(false);
+      }, 5000);
 
       if(!localStorage['walletconnect'] || JSON.parse(localStorage['walletconnect']).handshakeTopic.length == 0) {
         delete localStorage['walletconnect'];
@@ -1980,10 +2072,14 @@
     WalletLink
   };
 
-  const getWallets = async()=>{
+  const getWallets = async(args)=>{
+
+    let drip = (args && typeof args.drip === 'function') ? args.drip : undefined;
 
     let availableWallets = await Promise.all(
+      
       Object.keys(wallets).map(
+        
         async(key)=>{
         
           let wallet = wallets[key];
@@ -1993,16 +2089,18 @@
             
             if(wallet.getConnectedInstance) {
               instance = await wallet.getConnectedInstance();
+              if(drip) { drip(instance); }
               return instance
             } else {
+              if(drip) { drip(wallet); }
               return new wallet
-            }          
+            }
           }
         }
       )
     );
 
-    return availableWallets.filter((wallet)=>wallet)
+    return availableWallets.filter(Boolean)
   };
 
   const supported = [

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@depay/web3-wallets-evm",
   "moduleName": "Web3Wallets",
-  "version": "15.6.0",
+  "version": "15.8.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",
@@ -28,7 +28,7 @@
     "@depay/walletconnect-v1": "^1.8.0",
     "@depay/walletconnect-v2": "^2.4.2",
     "@depay/web3-blockchains": "^8.0.1",
-    "@depay/web3-client-evm": "^10.11.0",
+    "@depay/web3-client-evm": "^10.12.0",
     "ethers": "^5.7.1"
   },
   "engines": {