v7.1.2: fix asset meta data completion (decimals, name etc.)

DePayFi · Aug 20, 2023 · c776034 · c776034
1 parent 16cc3bd
commit c776034
Show file tree

Hide file tree

Showing 11 changed files with 104 additions and 17 deletions.
diff --git a/dist/esm/index.evm.js b/dist/esm/index.evm.js
@@ -230,11 +230,21 @@ var dripAssets = async (options) => {
     let allAssets = await getAssets(options);
     promises = promises.concat((allAssets.map((asset)=>{
       return new Promise((resolve, reject)=>{
-        return new Token(asset).balance(options.accounts[asset.blockchain])
-          .then((balance)=>{
+        const token = new Token(asset);
+        return token.balance(options.accounts[asset.blockchain])
+          .then(async(balance)=>{
             if(exists({ assets, asset })) { return resolve() }
             const assetWithBalance = reduceAssetWithBalance(asset, balance);
             if(assetWithBalance.balance != '0') {
+              if(assetWithBalance.name === undefined) {
+                assetWithBalance.name = await token.name();
+              }
+              if(assetWithBalance.symbol === undefined) {
+                assetWithBalance.symbol = await token.symbol();
+              }
+              if(assetWithBalance.decimals === undefined) {
+                assetWithBalance.decimals = await token.decimals();
+              }
               assets.push(assetWithBalance);
               drip(assetWithBalance);
               resolve(assetWithBalance);

diff --git a/dist/esm/index.js b/dist/esm/index.js
@@ -230,11 +230,21 @@ var dripAssets = async (options) => {
     let allAssets = await getAssets(options);
     promises = promises.concat((allAssets.map((asset)=>{
       return new Promise((resolve, reject)=>{
-        return new Token(asset).balance(options.accounts[asset.blockchain])
-          .then((balance)=>{
+        const token = new Token(asset);
+        return token.balance(options.accounts[asset.blockchain])
+          .then(async(balance)=>{
             if(exists({ assets, asset })) { return resolve() }
             const assetWithBalance = reduceAssetWithBalance(asset, balance);
             if(assetWithBalance.balance != '0') {
+              if(assetWithBalance.name === undefined) {
+                assetWithBalance.name = await token.name();
+              }
+              if(assetWithBalance.symbol === undefined) {
+                assetWithBalance.symbol = await token.symbol();
+              }
+              if(assetWithBalance.decimals === undefined) {
+                assetWithBalance.decimals = await token.decimals();
+              }
               assets.push(assetWithBalance);
               drip(assetWithBalance);
               resolve(assetWithBalance);

diff --git a/dist/esm/index.solana.js b/dist/esm/index.solana.js
@@ -230,11 +230,21 @@ var dripAssets = async (options) => {
     let allAssets = await getAssets(options);
     promises = promises.concat((allAssets.map((asset)=>{
       return new Promise((resolve, reject)=>{
-        return new Token(asset).balance(options.accounts[asset.blockchain])
-          .then((balance)=>{
+        const token = new Token(asset);
+        return token.balance(options.accounts[asset.blockchain])
+          .then(async(balance)=>{
             if(exists({ assets, asset })) { return resolve() }
             const assetWithBalance = reduceAssetWithBalance(asset, balance);
             if(assetWithBalance.balance != '0') {
+              if(assetWithBalance.name === undefined) {
+                assetWithBalance.name = await token.name();
+              }
+              if(assetWithBalance.symbol === undefined) {
+                assetWithBalance.symbol = await token.symbol();
+              }
+              if(assetWithBalance.decimals === undefined) {
+                assetWithBalance.decimals = await token.decimals();
+              }
               assets.push(assetWithBalance);
               drip(assetWithBalance);
               resolve(assetWithBalance);

diff --git a/dist/umd/index.evm.js b/dist/umd/index.evm.js
@@ -237,11 +237,21 @@
       let allAssets = await getAssets(options);
       promises = promises.concat((allAssets.map((asset)=>{
         return new Promise((resolve, reject)=>{
-          return new Token__default['default'](asset).balance(options.accounts[asset.blockchain])
-            .then((balance)=>{
+          const token = new Token__default['default'](asset);
+          return token.balance(options.accounts[asset.blockchain])
+            .then(async(balance)=>{
               if(exists({ assets, asset })) { return resolve() }
               const assetWithBalance = reduceAssetWithBalance(asset, balance);
               if(assetWithBalance.balance != '0') {
+                if(assetWithBalance.name === undefined) {
+                  assetWithBalance.name = await token.name();
+                }
+                if(assetWithBalance.symbol === undefined) {
+                  assetWithBalance.symbol = await token.symbol();
+                }
+                if(assetWithBalance.decimals === undefined) {
+                  assetWithBalance.decimals = await token.decimals();
+                }
                 assets.push(assetWithBalance);
                 drip(assetWithBalance);
                 resolve(assetWithBalance);

diff --git a/dist/umd/index.js b/dist/umd/index.js
@@ -237,11 +237,21 @@
       let allAssets = await getAssets(options);
       promises = promises.concat((allAssets.map((asset)=>{
         return new Promise((resolve, reject)=>{
-          return new Token__default['default'](asset).balance(options.accounts[asset.blockchain])
-            .then((balance)=>{
+          const token = new Token__default['default'](asset);
+          return token.balance(options.accounts[asset.blockchain])
+            .then(async(balance)=>{
               if(exists({ assets, asset })) { return resolve() }
               const assetWithBalance = reduceAssetWithBalance(asset, balance);
               if(assetWithBalance.balance != '0') {
+                if(assetWithBalance.name === undefined) {
+                  assetWithBalance.name = await token.name();
+                }
+                if(assetWithBalance.symbol === undefined) {
+                  assetWithBalance.symbol = await token.symbol();
+                }
+                if(assetWithBalance.decimals === undefined) {
+                  assetWithBalance.decimals = await token.decimals();
+                }
                 assets.push(assetWithBalance);
                 drip(assetWithBalance);
                 resolve(assetWithBalance);

diff --git a/dist/umd/index.solana.js b/dist/umd/index.solana.js
@@ -237,11 +237,21 @@
       let allAssets = await getAssets(options);
       promises = promises.concat((allAssets.map((asset)=>{
         return new Promise((resolve, reject)=>{
-          return new Token__default['default'](asset).balance(options.accounts[asset.blockchain])
-            .then((balance)=>{
+          const token = new Token__default['default'](asset);
+          return token.balance(options.accounts[asset.blockchain])
+            .then(async(balance)=>{
               if(exists({ assets, asset })) { return resolve() }
               const assetWithBalance = reduceAssetWithBalance(asset, balance);
               if(assetWithBalance.balance != '0') {
+                if(assetWithBalance.name === undefined) {
+                  assetWithBalance.name = await token.name();
+                }
+                if(assetWithBalance.symbol === undefined) {
+                  assetWithBalance.symbol = await token.symbol();
+                }
+                if(assetWithBalance.decimals === undefined) {
+                  assetWithBalance.decimals = await token.decimals();
+                }
                 assets.push(assetWithBalance);
                 drip(assetWithBalance);
                 resolve(assetWithBalance);

diff --git a/examples/drip.md b/examples/drip.md
@@ -18,3 +18,20 @@ let allAssets = await Web3Assets.dripAssets({
 
 console.log('allAssets', allAssets)
 ```
+
+
+```javascript
+let allAssets = await Web3Assets.dripAssets({
+  accounts: {
+    solana: '2UgCJaHU5y8NC4uWQcZYeV9a5RyYLF7iKYCybCsdFFD1',
+  },
+  priority: [
+    { blockchain: 'solana', address: Web3Blockchains.solana.currency.address },
+  ],
+  drip: (asset)=>{
+   console.log('drip asset', asset)
+  }
+})
+
+console.log('allAssets', allAssets)
+```
diff --git a/package.evm.json b/package.evm.json
@@ -1,7 +1,7 @@
 {
   "name": "@depay/web3-assets-evm",
   "moduleName": "Web3Assets",
-  "version": "7.1.1",
+  "version": "7.1.2",
   "description": "JavaScript library to retrieve Web3 assets of a given or connected wallet/account.",
   "main": "dist/umd/index.evm.js",
   "module": "dist/esm/index.evm.js",

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@depay/web3-assets",
   "moduleName": "Web3Assets",
-  "version": "7.1.1",
+  "version": "7.1.2",
   "description": "JavaScript library to retrieve Web3 assets of a given or connected wallet/account.",
   "main": "dist/umd/index.js",
   "module": "dist/esm/index.js",

diff --git a/package.solana.json b/package.solana.json
@@ -1,7 +1,7 @@
 {
   "name": "@depay/web3-assets-solana",
   "moduleName": "Web3Assets",
-  "version": "7.1.1",
+  "version": "7.1.2",
   "description": "JavaScript library to retrieve Web3 assets of a given or connected wallet/account.",
   "main": "dist/umd/index.solana.js",
   "module": "dist/esm/index.solana.js",

diff --git a/src/dripAssets.js b/src/dripAssets.js
@@ -162,11 +162,21 @@ export default async (options) => {
     let allAssets = await getAssets(options)
     promises = promises.concat((allAssets.map((asset)=>{
       return new Promise((resolve, reject)=>{
-        return new Token(asset).balance(options.accounts[asset.blockchain])
-          .then((balance)=>{
+        const token = new Token(asset)
+        return token.balance(options.accounts[asset.blockchain])
+          .then(async(balance)=>{
             if(exists({ assets, asset })) { return resolve() }
             const assetWithBalance = reduceAssetWithBalance(asset, balance)
             if(assetWithBalance.balance != '0') {
+              if(assetWithBalance.name === undefined) {
+                assetWithBalance.name = await token.name()
+              }
+              if(assetWithBalance.symbol === undefined) {
+                assetWithBalance.symbol = await token.symbol()
+              }
+              if(assetWithBalance.decimals === undefined) {
+                assetWithBalance.decimals = await token.decimals()
+              }
               assets.push(assetWithBalance)
               drip(assetWithBalance)
               resolve(assetWithBalance)