Use viem utils in common

Author: Adamj1232

packages/common/package.json

@@ -75,6 +75,7 @@
     "ethers": "5.5.4"
   },
   "dependencies": {
-    "joi": "17.9.1"
+    "joi": "17.9.1",
+    "viem": "2.10.2"
   }
 }

packages/common/src/utils.ts

@@ -1,58 +1,19 @@
+import { formatEther, hexToBigInt, numberToHex, parseEther } from 'viem'
 import type { Address } from './types.js'
 
-const addressRegex = /^0x[a-fA-F0-9]{40}$/
-
 export const isAddress = (address: string): address is Address => {
-  return addressRegex.test(address)
+  return isAddress(address)
 }
 
-export const weiHexToEth = (wei: string): string => {
-  const weiBigInt = BigInt(parseInt(wei, 16))
-  const ethBalance = divideBigIntWithDecimalResolution(
-    weiBigInt,
-    BigInt('1000000000000000000')
-  )
-
-  return ethBalance.toString()
+export const weiHexToEth = (wei: `0x${string}`): string => {
+  const weiBigInt = hexToBigInt(wei)
+  return formatEther(weiBigInt)
 }
+
 export const weiToEth = (wei: string): string => {
   if (!wei) return wei
   const weiBigInt = BigInt(parseInt(wei))
-  const ethBalance = divideBigIntWithDecimalResolution(
-    weiBigInt,
-    BigInt('1000000000000000000')
-  )
-
-  return ethBalance.toString()
-}
-
-const divideBigIntWithDecimalResolution = (
-  dividend: bigint,
-  divisor: bigint,
-  decimalPlaces = 8
-): number => {
-  if (typeof dividend !== 'bigint' || typeof divisor !== 'bigint') {
-    throw new Error('dividend and divisor must be BigInt values')
-  }
-
-  if (typeof decimalPlaces !== 'number' || decimalPlaces < 0) {
-    throw new Error('decimalPlaces must be a non-negative number')
-  }
-
-  // Multiply the dividend by 10 ** decimalPlaces to add precision
-  const adjustedDividend = dividend * BigInt(10 ** decimalPlaces)
-
-  const quotient = adjustedDividend / divisor
-
-  // Convert the result back to a decimal number
-  const decimalPart = String(quotient % BigInt(10 ** decimalPlaces)).padStart(
-    decimalPlaces,
-    '0'
-  )
-  const integerPart = quotient / BigInt(10 ** decimalPlaces)
-  const result = `${integerPart}.${decimalPart}`
-
-  return parseFloat(result)
+  return formatEther(weiBigInt)
 }
 
 export const ethToWeiBigInt = (eth: string | number): bigint => {
@@ -62,20 +23,9 @@ export const ethToWeiBigInt = (eth: string | number): bigint => {
 
   const ethString = typeof eth === 'number' ? eth.toString() : eth
 
-  const decimalSplit = ethString.split('.')
-  const integerPart = BigInt(decimalSplit[0])
-  const decimalPart =
-    decimalSplit.length > 1 ? BigInt(decimalSplit[1]) : BigInt(0)
-
-  const decimalLength = decimalSplit.length > 1 ? decimalSplit[1].length : 0
-  const weiFactor = BigInt(10 ** (18 - decimalLength))
-
-  // Perform the conversion from Eth to Wei
-  const weiValue = integerPart * BigInt(10 ** 18) + decimalPart * weiFactor
-
-  return BigInt(weiValue)
+  return parseEther(ethString)
 }
 
 export const bigIntToHex = (value: bigint): string => {
-  return `0x${value.toString(16)}`
+  return numberToHex(value)
 }

packages/core/src/provider.ts

@@ -455,7 +455,7 @@ export async function getBalance(
     const balanceHex = await provider.request({
       method: 'eth_getBalance',
       params: [address, 'latest']
-    })
+    }) as `0x${string}`
     return balanceHex
       ? { [chain.token || 'eth']: weiHexToEth(balanceHex) }
       : null

yarn.lock

@@ -15534,6 +15534,20 @@ verror@1.10.0:
     core-util-is "1.0.2"
     extsprintf "^1.2.0"
 
+viem@2.10.2, viem@^2.10.2:
+  version "2.10.2"
+  resolved "https://registry.yarnpkg.com/viem/-/viem-2.10.2.tgz#65c2ca82b64e6fb9ee84c02b95dcf2c270ffe651"
+  integrity sha512-gcOL+XxA0UWDarli856OEgumaBz4df/qNMpgno4NTSSZtJSC1XixIb3gWjVBei6Vx085ivw/U9ZE8gdniIo7fA==
+  dependencies:
+    "@adraffy/ens-normalize" "1.10.0"
+    "@noble/curves" "1.2.0"
+    "@noble/hashes" "1.3.2"
+    "@scure/bip32" "1.3.2"
+    "@scure/bip39" "1.2.1"
+    abitype "1.0.0"
+    isows "1.0.3"
+    ws "8.13.0"
+
 viem@^1.0.0:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/viem/-/viem-1.1.4.tgz#21be6d235fb387a391d4abdbbf95cd93bd066ffb"
@@ -15563,20 +15577,6 @@ viem@^1.1.4:
     isows "1.0.3"
     ws "8.13.0"
 
-viem@^2.10.2:
-  version "2.10.2"
-  resolved "https://registry.yarnpkg.com/viem/-/viem-2.10.2.tgz#65c2ca82b64e6fb9ee84c02b95dcf2c270ffe651"
-  integrity sha512-gcOL+XxA0UWDarli856OEgumaBz4df/qNMpgno4NTSSZtJSC1XixIb3gWjVBei6Vx085ivw/U9ZE8gdniIo7fA==
-  dependencies:
-    "@adraffy/ens-normalize" "1.10.0"
-    "@noble/curves" "1.2.0"
-    "@noble/hashes" "1.3.2"
-    "@scure/bip32" "1.3.2"
-    "@scure/bip39" "1.2.1"
-    abitype "1.0.0"
-    isows "1.0.3"
-    ws "8.13.0"
-
 viem@^2.9.15:
   version "2.9.21"
   resolved "https://registry.yarnpkg.com/viem/-/viem-2.9.21.tgz#a7dd3d4c827088e5336e5a6b35ec0283d2938595"