v6.0.1: do not return assets with balance 0

ufw0x · Apr 10, 2022 · d53382c · d53382c
1 parent 45eb9d5
commit d53382c
Show file tree

Hide file tree

Showing 5 changed files with 66 additions and 37 deletions.
diff --git a/dist/esm/index.js b/dist/esm/index.js
@@ -81,9 +81,13 @@ var dripAssets = async (options) => {
           balance: (await token.balance(options.accounts[asset.blockchain])).toString()
         }
       );
-      assets.push(completedAsset);
-      if(typeof options.drip == 'function') { options.drip(completedAsset); }
-      resolve(completedAsset);
+      if(completedAsset.balance != '0') {
+        assets.push(completedAsset);
+        if(typeof options.drip == 'function') { options.drip(completedAsset); }
+        resolve(completedAsset);
+      } else {
+        resolve();
+      }
     })
   }));
 
@@ -103,9 +107,13 @@ var dripAssets = async (options) => {
       new Token(asset).balance(options.accounts[asset.blockchain])
         .then((balance)=>{
           const assetWithBalance = reduceAssetWithBalance(asset, balance);
-          assets.push(assetWithBalance);
-          if(typeof options.drip == 'function') { options.drip(assetWithBalance); }
-          resolve(assetWithBalance);
+          if(assetWithBalance.balance != '0') {
+            assets.push(assetWithBalance);
+            if(typeof options.drip == 'function') { options.drip(assetWithBalance); }
+            resolve(assetWithBalance);
+        } else {
+          resolve();
+        }
         }).catch((error)=>{ console.log(error); });
     })
   }));
@@ -120,9 +128,13 @@ var dripAssets = async (options) => {
       } else {
         return new Token(asset).balance(options.accounts[asset.blockchain]).then((balance)=>{
           const assetWithBalance = reduceAssetWithBalance(asset, balance);
-          assets.push(assetWithBalance);
-          if(typeof options.drip == 'function') { options.drip(assetWithBalance); }
-          resolve(assetWithBalance);
+          if(assetWithBalance.balance != '0') {
+            assets.push(assetWithBalance);
+            if(typeof options.drip == 'function') { options.drip(assetWithBalance); }
+            resolve(assetWithBalance);
+          } else {
+            resolve();
+          }
         })
       }
     })

diff --git a/dist/umd/index.js b/dist/umd/index.js
@@ -82,9 +82,13 @@
             balance: (await token.balance(options.accounts[asset.blockchain])).toString()
           }
         );
-        assets.push(completedAsset);
-        if(typeof options.drip == 'function') { options.drip(completedAsset); }
-        resolve(completedAsset);
+        if(completedAsset.balance != '0') {
+          assets.push(completedAsset);
+          if(typeof options.drip == 'function') { options.drip(completedAsset); }
+          resolve(completedAsset);
+        } else {
+          resolve();
+        }
       })
     }));
 
@@ -104,9 +108,13 @@
         new web3Tokens.Token(asset).balance(options.accounts[asset.blockchain])
           .then((balance)=>{
             const assetWithBalance = reduceAssetWithBalance(asset, balance);
-            assets.push(assetWithBalance);
-            if(typeof options.drip == 'function') { options.drip(assetWithBalance); }
-            resolve(assetWithBalance);
+            if(assetWithBalance.balance != '0') {
+              assets.push(assetWithBalance);
+              if(typeof options.drip == 'function') { options.drip(assetWithBalance); }
+              resolve(assetWithBalance);
+          } else {
+            resolve();
+          }
           }).catch((error)=>{ console.log(error); });
       })
     }));
@@ -121,9 +129,13 @@
         } else {
           return new web3Tokens.Token(asset).balance(options.accounts[asset.blockchain]).then((balance)=>{
             const assetWithBalance = reduceAssetWithBalance(asset, balance);
-            assets.push(assetWithBalance);
-            if(typeof options.drip == 'function') { options.drip(assetWithBalance); }
-            resolve(assetWithBalance);
+            if(assetWithBalance.balance != '0') {
+              assets.push(assetWithBalance);
+              if(typeof options.drip == 'function') { options.drip(assetWithBalance); }
+              resolve(assetWithBalance);
+            } else {
+              resolve();
+            }
           })
         }
       })

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@depay/web3-assets",
   "moduleName": "Web3Assets",
-  "version": "6.0.0",
+  "version": "6.0.1",
   "description": "",
   "main": "dist/umd/index.js",
   "module": "dist/esm/index.js",

diff --git a/src/dripAssets.js b/src/dripAssets.js
@@ -32,9 +32,13 @@ export default async (options) => {
           balance: (await token.balance(options.accounts[asset.blockchain])).toString()
         }
       )
-      assets.push(completedAsset)
-      if(typeof options.drip == 'function') { options.drip(completedAsset) }
-      resolve(completedAsset)
+      if(completedAsset.balance != '0') {
+        assets.push(completedAsset)
+        if(typeof options.drip == 'function') { options.drip(completedAsset) }
+        resolve(completedAsset)
+      } else {
+        resolve()
+      }
     })
   }))
 
@@ -55,9 +59,13 @@ export default async (options) => {
       new Token(asset).balance(options.accounts[asset.blockchain])
         .then((balance)=>{
           const assetWithBalance = reduceAssetWithBalance(asset, balance)
-          assets.push(assetWithBalance)
-          if(typeof options.drip == 'function') { options.drip(assetWithBalance) }
-          resolve(assetWithBalance)
+          if(assetWithBalance.balance != '0') {
+            assets.push(assetWithBalance)
+            if(typeof options.drip == 'function') { options.drip(assetWithBalance) }
+            resolve(assetWithBalance)
+        } else {
+          resolve()
+        }
         }).catch((error)=>{ console.log(error) })
     })
   }))
@@ -72,9 +80,13 @@ export default async (options) => {
       } else {
         return new Token(asset).balance(options.accounts[asset.blockchain]).then((balance)=>{
           const assetWithBalance = reduceAssetWithBalance(asset, balance)
-          assets.push(assetWithBalance)
-          if(typeof options.drip == 'function') { options.drip(assetWithBalance) }
-          resolve(assetWithBalance)
+          if(assetWithBalance.balance != '0') {
+            assets.push(assetWithBalance)
+            if(typeof options.drip == 'function') { options.drip(assetWithBalance) }
+            resolve(assetWithBalance)
+          } else {
+            resolve()
+          }
         })
       }
     })

diff --git a/tests/units/dripAssets.spec.js b/tests/units/dripAssets.spec.js
@@ -282,6 +282,7 @@ describe('dripAssets', ()=>{
       mock({ call: { return: 'Wrapped Ether', to: '0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2', api: Token['ethereum'].DEFAULT, method: 'name' }, provider: providerFor('ethereum'), blockchain: 'ethereum' })
       mock({ call: { return: 'WETH', to: '0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2', api: Token['ethereum'].DEFAULT, method: 'symbol' }, provider: providerFor('ethereum'), blockchain: 'ethereum' })
       mock({ call: { return: 18, to: '0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2', api: Token['ethereum'].DEFAULT, method: 'decimals' }, provider: providerFor('ethereum'), blockchain: 'ethereum' })
+      mock({ call: { return: '0', to: '0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2', api: Token['ethereum'].DEFAULT, method: 'balanceOf', params: accounts[0] }, provider: providerFor('ethereum'), blockchain: 'ethereum' })
 
       mock({ call: { return: 'Wrapped BNB', to: '0xbb4CdB9CBd36B01bD1cBaEBF2De08d9173bc095c', api: Token['bsc'].DEFAULT, method: 'name' }, provider: providerFor('bsc'), blockchain: 'bsc' })
       mock({ call: { return: 'BNB', to: '0xbb4CdB9CBd36B01bD1cBaEBF2De08d9173bc095c', api: Token['bsc'].DEFAULT, method: 'symbol' }, provider: providerFor('bsc'), blockchain: 'bsc' })
@@ -301,7 +302,7 @@ describe('dripAssets', ()=>{
         }
       })
 
-      expect(dripsCount).toEqual(20)
+      expect(dripsCount).toEqual(19)
 
       let expectedAssets = [
         {
@@ -320,14 +321,6 @@ describe('dripAssets', ()=>{
           decimals: 18,
           balance: '56789'
         },
-        {
-          blockchain: 'ethereum',
-          address: '0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2',
-          name: 'Wrapped Ether',
-          symbol: 'WETH',
-          decimals: 18,
-          balance: '123456789'
-        },
         {
           blockchain: 'bsc',
           address: '0xbb4CdB9CBd36B01bD1cBaEBF2De08d9173bc095c',