enh(utils/parse.ts): update logic, better string/numberLike handling

Author: D3Portillo

lib/index.d.ts

@@ -26,9 +26,9 @@ interface AddEtherToken {
 interface Parse {
   toHex: (n: number) => string
   hexToInt: (s: string) => number
-  toWei: (s: number) => number
-  toTxWei: (n: number) => string
-  weiToEth: (n: number) => number
+  toWei: (s: number | string) => string
+  toTxWei: (n: number | string) => string
+  weiToEth: (n: number | string) => number
   txWeiToEth: (s: string) => number
 }
 

lib/utils/parse.ts

@@ -1,18 +1,27 @@
-const toHex = (n: number) => {
-  if (n < 0) {
-    // Handle negative overflow
-    n = 0xffffffff + n + 1
-  }
-  return `0x${n.toString(16).toUpperCase()}`
-}
+/** expands to `000000000000000000` */
+const ZERO_GAP = "0".repeat(18) as any
+
+const toHex = (n: number) => `0x${n.toString(16).toUpperCase()}`
 
 const hexToInt = (str: string) => parseInt(str, 16)
 
-const toWei = (n: number) => n * 10 ** 18
+const toWei = (n: number | string) => {
+  // Avoid returning ZERO_GAP for n==0
+  if (n == 0) return "0"
+  const [intPart = 0, decPart] = `${n}`.split(".")
+  // Be optimistic that input is an int
+  let fillGap = ZERO_GAP
+  if (decPart) {
+    // If decimal part exists we get it's [decPart]x10^-18 value
+    fillGap = Math.round((`0.${decPart}` as any) * 1e18)
+  }
+  // If `intPart == 0` we just return decimal part value
+  return `${intPart == 0 ? "" : intPart}${fillGap}`
+}
 
-const toTxWei = (n: number) => toHex(toWei(n))
+const toTxWei = (n: number | string) => toHex(parseInt(toWei(n)))
 
-const weiToEth = (n: number) => n * 10 ** -18
+const weiToEth = (n: string | number) => (n as any) / 1e18
 
 const txWeiToEth = (s: string) => weiToEth(hexToInt(s))