v10.4.4: fix parsing scientific numbers e.g. 1.9e-17

DePayFi · Dec 27, 2024 · 5668a27 · 5668a27
1 parent 1bf8603
commit 5668a27
Show file tree

Hide file tree

Showing 12 changed files with 107 additions and 46 deletions.
diff --git a/dev.html b/dev.html
@@ -6,7 +6,7 @@
     <link rel="icon" type="image/png" href="https://depay.com/favicon.png"/>
     <title>Development</title>
     <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css" integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">
-    <script src="https://cdn.ethers.io/lib/ethers-5.7.umd.min.js" type="application/javascript"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/ethers/5.7.1/ethers.umd.min.js" type="application/javascript"></script>
     <script crossorigin src="https://unpkg.com/@depay/solana-web3.js@1"></script>
     <script crossorigin src="https://unpkg.com/@depay/web3-blockchains@9"></script>
     <script crossorigin src="https://unpkg.com/@depay/web3-client@10"></script>

diff --git a/dist/esm/index.evm.js b/dist/esm/index.evm.js
@@ -900,9 +900,19 @@ class Token {
   }
 
   async BigNumber(amount) {
-    let decimals = await this.decimals();
+    const decimals = await this.decimals();
+    if(typeof(amount) != 'string') {
+      amount = amount.toString();
+    }
+    if(amount.match('e')) {
+      amount = parseFloat(amount).toFixed(decimals).toString();
+    }
+    const decimalsMatched = amount.match(/\.(\d+)/);
+    if(decimalsMatched && decimalsMatched[1] && decimalsMatched[1].length > decimals) {
+      amount = parseFloat(amount).toFixed(decimals).toString();
+    }
     return ethers.utils.parseUnits(
-      Token.safeAmount({ amount: parseFloat(amount), decimals }).toString(),
+      amount,
       decimals
     )
   }
@@ -925,10 +935,6 @@ Token.readable = async ({ amount, blockchain, address }) => {
   return token.readable(amount)
 };
 
-Token.safeAmount = ({ amount, decimals }) => {
-  return parseFloat(amount.toFixed(decimals))
-};
-
 
 Token.ethereum = { 
   DEFAULT: ERC20,

diff --git a/dist/esm/index.js b/dist/esm/index.js
@@ -1181,9 +1181,19 @@ class Token {
   }
 
   async BigNumber(amount) {
-    let decimals = await this.decimals();
+    const decimals = await this.decimals();
+    if(typeof(amount) != 'string') {
+      amount = amount.toString();
+    }
+    if(amount.match('e')) {
+      amount = parseFloat(amount).toFixed(decimals).toString();
+    }
+    const decimalsMatched = amount.match(/\.(\d+)/);
+    if(decimalsMatched && decimalsMatched[1] && decimalsMatched[1].length > decimals) {
+      amount = parseFloat(amount).toFixed(decimals).toString();
+    }
     return ethers.utils.parseUnits(
-      Token.safeAmount({ amount: parseFloat(amount), decimals }).toString(),
+      amount,
       decimals
     )
   }
@@ -1206,10 +1216,6 @@ Token.readable = async ({ amount, blockchain, address }) => {
   return token.readable(amount)
 };
 
-Token.safeAmount = ({ amount, decimals }) => {
-  return parseFloat(amount.toFixed(decimals))
-};
-
 
 Token.ethereum = { 
   DEFAULT: ERC20,

diff --git a/dist/esm/index.solana.js b/dist/esm/index.solana.js
@@ -1198,9 +1198,19 @@ class Token {
   }
 
   async BigNumber(amount) {
-    let decimals = await this.decimals();
+    const decimals = await this.decimals();
+    if(typeof(amount) != 'string') {
+      amount = amount.toString();
+    }
+    if(amount.match('e')) {
+      amount = parseFloat(amount).toFixed(decimals).toString();
+    }
+    const decimalsMatched = amount.match(/\.(\d+)/);
+    if(decimalsMatched && decimalsMatched[1] && decimalsMatched[1].length > decimals) {
+      amount = parseFloat(amount).toFixed(decimals).toString();
+    }
     return ethers.utils.parseUnits(
-      Token.safeAmount({ amount: parseFloat(amount), decimals }).toString(),
+      amount,
       decimals
     )
   }
@@ -1223,10 +1233,6 @@ Token.readable = async ({ amount, blockchain, address }) => {
   return token.readable(amount)
 };
 
-Token.safeAmount = ({ amount, decimals }) => {
-  return parseFloat(amount.toFixed(decimals))
-};
-
 
 Token.solana = {
   MINT_LAYOUT,

diff --git a/dist/umd/index.evm.js b/dist/umd/index.evm.js
@@ -906,9 +906,19 @@
     }
 
     async BigNumber(amount) {
-      let decimals = await this.decimals();
+      const decimals = await this.decimals();
+      if(typeof(amount) != 'string') {
+        amount = amount.toString();
+      }
+      if(amount.match('e')) {
+        amount = parseFloat(amount).toFixed(decimals).toString();
+      }
+      const decimalsMatched = amount.match(/\.(\d+)/);
+      if(decimalsMatched && decimalsMatched[1] && decimalsMatched[1].length > decimals) {
+        amount = parseFloat(amount).toFixed(decimals).toString();
+      }
       return ethers.ethers.utils.parseUnits(
-        Token.safeAmount({ amount: parseFloat(amount), decimals }).toString(),
+        amount,
         decimals
       )
     }
@@ -931,10 +941,6 @@
     return token.readable(amount)
   };
 
-  Token.safeAmount = ({ amount, decimals }) => {
-    return parseFloat(amount.toFixed(decimals))
-  };
-
 
   Token.ethereum = { 
     DEFAULT: ERC20,

diff --git a/dist/umd/index.js b/dist/umd/index.js
@@ -1186,9 +1186,19 @@
     }
 
     async BigNumber(amount) {
-      let decimals = await this.decimals();
+      const decimals = await this.decimals();
+      if(typeof(amount) != 'string') {
+        amount = amount.toString();
+      }
+      if(amount.match('e')) {
+        amount = parseFloat(amount).toFixed(decimals).toString();
+      }
+      const decimalsMatched = amount.match(/\.(\d+)/);
+      if(decimalsMatched && decimalsMatched[1] && decimalsMatched[1].length > decimals) {
+        amount = parseFloat(amount).toFixed(decimals).toString();
+      }
       return ethers.ethers.utils.parseUnits(
-        Token.safeAmount({ amount: parseFloat(amount), decimals }).toString(),
+        amount,
         decimals
       )
     }
@@ -1211,10 +1221,6 @@
     return token.readable(amount)
   };
 
-  Token.safeAmount = ({ amount, decimals }) => {
-    return parseFloat(amount.toFixed(decimals))
-  };
-
 
   Token.ethereum = { 
     DEFAULT: ERC20,

diff --git a/dist/umd/index.solana.js b/dist/umd/index.solana.js
@@ -1204,9 +1204,19 @@
     }
 
     async BigNumber(amount) {
-      let decimals = await this.decimals();
+      const decimals = await this.decimals();
+      if(typeof(amount) != 'string') {
+        amount = amount.toString();
+      }
+      if(amount.match('e')) {
+        amount = parseFloat(amount).toFixed(decimals).toString();
+      }
+      const decimalsMatched = amount.match(/\.(\d+)/);
+      if(decimalsMatched && decimalsMatched[1] && decimalsMatched[1].length > decimals) {
+        amount = parseFloat(amount).toFixed(decimals).toString();
+      }
       return ethers.ethers.utils.parseUnits(
-        Token.safeAmount({ amount: parseFloat(amount), decimals }).toString(),
+        amount,
         decimals
       )
     }
@@ -1229,10 +1239,6 @@
     return token.readable(amount)
   };
 
-  Token.safeAmount = ({ amount, decimals }) => {
-    return parseFloat(amount.toFixed(decimals))
-  };
-
 
   Token.solana = {
     MINT_LAYOUT,

diff --git a/package.evm.json b/package.evm.json
@@ -1,7 +1,7 @@
 {
   "name": "@depay/web3-tokens-evm",
   "moduleName": "Web3Tokens",
-  "version": "10.4.3",
+  "version": "10.4.4",
   "description": "JavaScript library providing basic functionalities to interact with web3 tokens.",
   "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-tokens",
   "moduleName": "Web3Tokens",
-  "version": "10.4.3",
+  "version": "10.4.4",
   "description": "JavaScript library providing basic functionalities to interact with web3 tokens.",
   "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-tokens-solana",
   "moduleName": "Web3Tokens",
-  "version": "10.4.3",
+  "version": "10.4.4",
   "description": "JavaScript library providing basic functionalities to interact with web3 tokens.",
   "main": "dist/umd/index.solana.js",
   "module": "dist/esm/index.solana.js",

diff --git a/src/Token.js b/src/Token.js
@@ -211,9 +211,19 @@ class Token {
   }
 
   async BigNumber(amount) {
-    let decimals = await this.decimals()
+    const decimals = await this.decimals()
+    if(typeof(amount) != 'string') {
+      amount = amount.toString()
+    }
+    if(amount.match('e')) {
+      amount = parseFloat(amount).toFixed(decimals).toString()
+    }
+    const decimalsMatched = amount.match(/\.(\d+)/)
+    if(decimalsMatched && decimalsMatched[1] && decimalsMatched[1].length > decimals) {
+      amount = parseFloat(amount).toFixed(decimals).toString()
+    }
     return ethers.utils.parseUnits(
-      Token.safeAmount({ amount: parseFloat(amount), decimals }).toString(),
+      amount,
       decimals
     )
   }
@@ -236,10 +246,6 @@ Token.readable = async ({ amount, blockchain, address }) => {
   return token.readable(amount)
 }
 
-Token.safeAmount = ({ amount, decimals }) => {
-  return parseFloat(amount.toFixed(decimals))
-}
-
 /*#if _EVM
 
 Token.ethereum = { 

diff --git a/tests/units/platforms/evm/BigNumber.spec.js b/tests/units/platforms/evm/BigNumber.spec.js
@@ -108,6 +108,25 @@ describe('BigNumber', () => {
 
         expect(amountBN.toString()).toEqual('19126903977196')
       })
+
+      it('fixes syntific numbers when parsing', async ()=> {
+        let tokenCallMock = mock({
+          provider,
+          blockchain,
+          request: {
+            to: '0xa0bEd124a09ac2Bd941b10349d8d224fe3c955eb',
+            api: Token[blockchain].DEFAULT,
+            method: 'decimals',
+            return: 18
+          }
+        })
+
+        let token = new Token({ blockchain, address: '0xa0bed124a09ac2bd941b10349d8d224fe3c955eb' })
+
+        let amountBN = await token.BigNumber(1.9e-10)
+
+        expect(amountBN.toString()).toEqual('190000000')
+      })
     })
   })
 })