CP-8975 Replace BN for bigint (#1455)

Co-authored-by: ruijialin <[email protected]>
avalabsorg · Aug 1, 2024 · ec59c72 · ec59c72
1 parent 03d7cc8
commit ec59c72
Show file tree

Hide file tree

Showing 41 changed files with 322 additions and 579 deletions.
diff --git a/packages/core-mobile/app/components/BNInput.tsx b/packages/core-mobile/app/components/BNInput.tsx
@@ -1,14 +1,13 @@
 import React, { useEffect, useState } from 'react'
 import InputText, { InputTextProps } from 'components/InputText'
 import Big from 'big.js'
-import BN from 'bn.js'
-import { bigToBN, bnToBig } from '@avalabs/core-utils-sdk'
+import { bigintToBig, bigToBigInt } from '@avalabs/core-utils-sdk'
 
 interface BNInputProps extends Omit<InputTextProps, 'text'> {
-  value?: BN
+  value?: bigint
   denomination: number
 
-  onChange?(val: { bn: BN; amount: string }): void
+  onChange?(val: { bn: bigint; amount: string }): void
 
   onMax?(): void
 
@@ -37,7 +36,7 @@ export function BNInput({
   ..._props
 }: BNInputProps): JSX.Element {
   const [valueAsString, setValueAsString] = useState('')
-  const valueBig = value ? bnToBig(value, denomination) : undefined
+  const valueBig = value ? bigintToBig(value, denomination) : undefined
 
   useEffect(() => {
     // When deleting zeros after decimal, all zeros delete without this check.
@@ -49,7 +48,7 @@ export function BNInput({
 
   const onValueChanged = (rawValue: string): void => {
     if (!rawValue) {
-      onChange?.({ bn: new BN(0), amount: '0' })
+      onChange?.({ bn: 0n, amount: '0' })
       setValueAsString('')
       return
     }
@@ -60,7 +59,7 @@ export function BNInput({
      */
     const [, endValue] = splitBN(changedValue)
     if (!endValue || endValue.length <= denomination) {
-      const valueToBn = bigToBN(new Big(changedValue), denomination)
+      const valueToBn = bigToBigInt(new Big(changedValue), denomination)
       setValueAsString(changedValue)
       onChange?.({
         amount: changedValue ? new Big(changedValue).toString() : '0', // used to removing leading & trailing zeros

diff --git a/packages/core-mobile/app/components/EditSpendLimit.tsx b/packages/core-mobile/app/components/EditSpendLimit.tsx
@@ -10,7 +10,7 @@ import AppNavigation from 'navigation/AppNavigation'
 import RpcRequestBottomSheet from 'screens/rpc/components/shared/RpcRequestBottomSheet'
 import { View, Text, Button } from '@avalabs/k2-mobile'
 import { Limit, SpendLimit } from 'hooks/useSpendLimits'
-import { hexToBN } from '@avalabs/core-utils-sdk'
+import { hexToBigInt } from 'viem'
 
 const EditSpendLimit = (): JSX.Element | null => {
   const { spendLimit, onClose, updateSpendLimit, dAppName, editingToken } =
@@ -70,7 +70,7 @@ const EditSpendLimit = (): JSX.Element | null => {
               Default
             </Text>
             <BNInput
-              value={hexToBN(editingToken.defaultValue)}
+              value={hexToBigInt(editingToken.defaultValue)}
               denomination={editingToken.decimals}
               editable={false}
               selectTextOnFocus={false}

diff --git a/packages/core-mobile/app/components/UniversalTokenSelector.tsx b/packages/core-mobile/app/components/UniversalTokenSelector.tsx
@@ -1,8 +1,7 @@
 import React, { FC, useCallback, useMemo } from 'react'
 import { Pressable, StyleSheet, View } from 'react-native'
 import { AssetBalance } from 'screens/bridge/utils/types'
-import BN from 'bn.js'
-import { bnToBig } from '@avalabs/core-utils-sdk'
+import { bigintToBig } from '@avalabs/core-utils-sdk'
 import { useApplicationContext } from 'contexts/ApplicationContext'
 import { Row } from 'components/Row'
 import AvaText from 'components/AvaText'
@@ -25,7 +24,7 @@ interface Props {
   onTokenChange: (token: TokenWithBalance | AssetBalance) => void
   onMax?: () => void
   hideInput?: boolean
-  inputAmount?: BN
+  inputAmount?: bigint
   onAmountChange: (amount: Amount) => void
   error?: string
   label?: string
@@ -69,7 +68,10 @@ const UniversalTokenSelector: FC<Props> = ({
     if (!inputAmount || !selectedToken?.decimals) {
       return ''
     }
-    const bnNumber = bnToBig(inputAmount, selectedToken?.decimals).toNumber()
+    const bnNumber = bigintToBig(
+      inputAmount,
+      selectedToken?.decimals
+    ).toNumber()
     return selectedToken.priceInCurrency
       ? formatLargeCurrency(
           currencyFormatter(bnNumber * selectedToken.priceInCurrency),

diff --git a/packages/core-mobile/app/contexts/SendTokenContext.tsx b/packages/core-mobile/app/contexts/SendTokenContext.tsx
@@ -14,9 +14,8 @@ import { useSelector } from 'react-redux'
 import { selectActiveAccount } from 'store/account'
 import sendService from 'services/send/SendService'
 import { SendState } from 'services/send/types'
-import { bnToLocaleString } from '@avalabs/core-utils-sdk'
+import { bigIntToString } from '@avalabs/core-utils-sdk'
 import { selectSelectedCurrency } from 'store/settings/currency'
-import BN from 'bn.js'
 import SentryWrapper from 'services/sentry/SentryWrapper'
 import Logger from 'utils/Logger'
 import AnalyticsService from 'services/analytics/AnalyticsService'
@@ -48,7 +47,7 @@ export const SendTokenContext = createContext<SendTokenContextState>(
 )
 
 const ZERO_AMOUNT = {
-  bn: new BN(0),
+  bn: 0n,
   amount: '0'
 }
 
@@ -208,10 +207,11 @@ export const SendTokenContextProvider = ({
       .then(state => {
         setGasLimit(state.gasLimit ?? 0)
         setMaxAmount({
-          bn: state.maxAmount ?? new BN(0),
-          amount: state.maxAmount
-            ? bnToLocaleString(state.maxAmount, sendToken?.decimals)
-            : ''
+          bn: state.maxAmount ?? 0n,
+          amount:
+            state.maxAmount && sendToken
+              ? bigIntToString(state.maxAmount, sendToken.decimals)
+              : ''
         })
         setError(state.error ? state.error.message : undefined)
         setCanSubmit(state.canSubmit ?? false)

diff --git a/packages/core-mobile/app/contexts/SwapContext/performSwap/performSwap.ts b/packages/core-mobile/app/contexts/SwapContext/performSwap/performSwap.ts
@@ -5,7 +5,6 @@ import { JsonRpcBatchInternal } from '@avalabs/core-wallets-sdk'
 import { TransactionParams } from '@avalabs/evm-module'
 import ERC20 from '@openzeppelin/contracts/build/contracts/ERC20.json'
 import Big from 'big.js'
-import { BN } from 'bn.js'
 import { APIError, ETHER_ADDRESS, Transaction } from 'paraswap'
 import { OptimalRate } from 'paraswap-core'
 import { promiseResolveWithBackoff, resolve } from '@avalabs/core-utils-sdk'
@@ -182,9 +181,7 @@ export async function performSwap({
       // @ts-ignore
       gas: bigIntToHex(txBuildData.gas), //gas property is not defined in Transaction@paraswap type but api does return this prop
       data: txBuildData.data,
-      value: isSrcTokenNative
-        ? `0x${new BN(sourceAmount).toString('hex')}`
-        : undefined // AVAX value needs to be sent with the transaction
+      value: isSrcTokenNative ? bigIntToHex(BigInt(sourceAmount)) : undefined // AVAX value needs to be sent with the transaction
     }
   ]
 

diff --git a/packages/core-mobile/app/hooks/useSpendLimits.ts b/packages/core-mobile/app/hooks/useSpendLimits.ts
@@ -1,14 +1,14 @@
-import { bnToLocaleString, hexToBN } from '@avalabs/core-utils-sdk'
+import { bigIntToString } from '@avalabs/core-utils-sdk'
 import { useCallback, useEffect, useState } from 'react'
 import Web3 from 'web3'
 import ERC20 from '@openzeppelin/contracts/build/contracts/ERC20.json'
 import { MaxUint256 } from 'ethers'
 import {
   TokenApproval,
-  TokenType,
-  TokenApprovals
+  TokenApprovals,
+  TokenType
 } from '@avalabs/vm-module-types'
-import type BN from 'bn.js'
+import { hexToBigInt, isHex } from 'viem'
 
 export const useSpendLimits = (
   tokenApprovals: TokenApprovals | undefined
@@ -32,12 +32,14 @@ export const useSpendLimits = (
     for (const tokenApproval of tokenApprovals.approvals) {
       const token = tokenApproval.token
       if (token.type === TokenType.ERC20 && tokenApproval.value) {
-        const defaultLimitBN = hexToBN(tokenApproval.value)
+        const defaultLimitBN = isHex(tokenApproval.value)
+          ? hexToBigInt(tokenApproval.value)
+          : 0n
         _spendLimits.push({
           limitType: Limit.DEFAULT,
           value: {
             bn: defaultLimitBN,
-            amount: bnToLocaleString(defaultLimitBN, token.decimals)
+            amount: bigIntToString(defaultLimitBN, token.decimals)
           },
           tokenApproval
         })
@@ -76,14 +78,16 @@ export const useSpendLimits = (
         ])
         limitAmount = `0x${MaxUint256.toString(16)}`
       } else if (newSpendData.limitType === Limit.DEFAULT) {
-        const bn = hexToBN(spendLimit.tokenApproval.value)
+        const bn = isHex(spendLimit.tokenApproval.value)
+          ? hexToBigInt(spendLimit.tokenApproval.value)
+          : 0n
         setSpendLimits([
           {
             ...spendLimit,
             limitType: Limit.DEFAULT,
             value: {
               bn,
-              amount: bnToLocaleString(
+              amount: bigIntToString(
                 bn,
                 spendLimit.tokenApproval.token.decimals
               )
@@ -132,7 +136,7 @@ export enum Limit {
 export interface SpendLimit {
   limitType: Limit
   value?: {
-    bn: BN
+    bn: bigint
     amount: string
   }
   tokenApproval: TokenApproval

diff --git a/packages/core-mobile/app/navigation/types.ts b/packages/core-mobile/app/navigation/types.ts
@@ -5,6 +5,7 @@ import { DrawerScreenProps as RNDrawerScreenProps } from '@react-navigation/draw
 import {
   Alert,
   DisplayData,
+  Hex,
   SigningData,
   TokenWithBalance
 } from '@avalabs/vm-module-types'
@@ -95,7 +96,7 @@ export type EditSpendLimitParams = {
   onClose(): void
   spendLimit: SpendLimit
   editingToken: {
-    defaultValue: string
+    defaultValue: Hex
     decimals: number
   }
   dAppName?: string

diff --git a/packages/core-mobile/app/screens/bridge/Bridge.tsx b/packages/core-mobile/app/screens/bridge/Bridge.tsx
@@ -28,9 +28,9 @@ import { BridgeScreenProps } from 'navigation/types'
 import { usePosthogContext } from 'contexts/PosthogContext'
 import { setActive, TokenSymbol } from 'store/network'
 import {
-  bigToBN,
+  bigintToBig,
+  bigToBigInt,
   bigToLocaleString,
-  bnToBig,
   resolve
 } from '@avalabs/core-utils-sdk'
 import Big from 'big.js'
@@ -43,7 +43,6 @@ import {
   isUnifiedBridgeAsset
 } from 'screens/bridge/utils/bridgeUtils'
 import { BNInput } from 'components/BNInput'
-import BN from 'bn.js'
 import { useDispatch, useSelector } from 'react-redux'
 import { selectBridgeCriticalConfig } from 'store/bridge'
 import AnalyticsService from 'services/analytics/AnalyticsService'
@@ -146,7 +145,7 @@ const Bridge: FC = () => {
     amount &&
       !amount.eq(BIG_ZERO) &&
       networkFee &&
-      bnToBig(nativeTokenBalance, activeNetwork.networkToken.decimals).lt(
+      bigintToBig(nativeTokenBalance, activeNetwork.networkToken.decimals).lt(
         networkFee
       )
   )
@@ -269,8 +268,8 @@ const Bridge: FC = () => {
   }
 
   const handleAmountChanged = useCallback(
-    (value: { bn: BN; amount: string }) => {
-      const bigValue = bnToBig(value.bn, denomination)
+    (value: { bn: bigint; amount: string }) => {
+      const bigValue = bigintToBig(value.bn, denomination)
       if (bridgeError) {
         setBridgeError('')
       }
@@ -538,7 +537,7 @@ const Bridge: FC = () => {
       return
     }
     handleAmountChanged({
-      bn: bigToBN(maximum, denomination),
+      bn: bigToBigInt(maximum, denomination),
       amount: bigToLocaleString(maximum, 4)
     })
   }, [denomination, handleAmountChanged, maximum])

diff --git a/packages/core-mobile/app/screens/bridge/handlers/getEVMAssetBalances.ts b/packages/core-mobile/app/screens/bridge/handlers/getEVMAssetBalances.ts
@@ -6,7 +6,7 @@ import {
 } from '@avalabs/core-bridge-sdk'
 import { BridgeAsset } from '@avalabs/bridge-unified'
 import { AssetBalance } from 'screens/bridge/utils/types'
-import { bnToBig } from '@avalabs/core-utils-sdk'
+import { bigintToBig } from '@avalabs/core-utils-sdk'
 import { TokenType, TokenWithBalance } from '@avalabs/vm-module-types'
 import { isUnifiedBridgeAsset } from '../utils/bridgeUtils'
 
@@ -43,7 +43,7 @@ export function getEVMAssetBalances(
         erc20TokensByAddress[asset.nativeContractAddress?.toLowerCase()]
 
     const balance =
-      (token && bnToBig(token.balance, token.decimals)) || BIG_ZERO
+      (token && bigintToBig(token.balance, token.decimals)) || BIG_ZERO
     return { symbol, asset, balance }
   })
 }
diff --git a/packages/core-mobile/app/screens/bridge/hooks/useBridge.ts b/packages/core-mobile/app/screens/bridge/hooks/useBridge.ts
@@ -15,9 +15,8 @@ import Big from 'big.js'
 import { useSelector } from 'react-redux'
 import { selectSelectedCurrency } from 'store/settings/currency'
 import { selectActiveAccount } from 'store/account'
-import { BIG_ZERO, bigToBN } from '@avalabs/core-utils-sdk'
+import { BIG_ZERO, bigToBigInt } from '@avalabs/core-utils-sdk'
 import Logger from 'utils/Logger'
-import BN from 'bn.js'
 import BridgeService from 'services/bridge/BridgeService'
 import { selectIsDeveloperMode } from 'store/settings/advanced'
 import { selectBridgeAppConfig } from 'store/bridge'
@@ -60,7 +59,7 @@ interface Bridge extends BridgeAdapter {
   provider: BridgeProvider
   bridgeFee: Big
   denomination: number
-  amountBN: BN
+  amountBN: bigint
 }
 
 // eslint-disable-next-line sonarjs/cognitive-complexity
@@ -130,7 +129,7 @@ export default function useBridge(selectedAsset?: AssetBalance): Bridge {
   }, [sourceBalance])
 
   const amountBN = useMemo(
-    () => bigToBN(amount, denomination),
+    () => bigToBigInt(amount, denomination),
     [amount, denomination]
   )
 

diff --git a/packages/core-mobile/app/screens/bridge/hooks/useBtcBridge.ts b/packages/core-mobile/app/screens/bridge/hooks/useBtcBridge.ts
@@ -104,7 +104,7 @@ export function useBtcBridge({
           setBtcBalance({
             symbol: btcAsset.symbol,
             asset: btcAsset,
-            balance: satoshiToBtc(token.balance.toNumber()),
+            balance: satoshiToBtc(Number(token.balance)),
             logoUri: token.logoUri,
             priceInCurrency: token.priceInCurrency
           })
@@ -117,7 +117,7 @@ export function useBtcBridge({
         setBtcBalanceAvalanche({
           symbol: btcAsset.symbol,
           asset: btcAsset,
-          balance: satoshiToBtc(btcAvalancheBalance?.balance?.toNumber() ?? 0),
+          balance: satoshiToBtc(Number(btcAvalancheBalance?.balance ?? 0)),
           logoUri: btcAvalancheBalance?.logoUri,
           priceInCurrency: btcAvalancheBalance?.priceInCurrency
         })

diff --git a/packages/core-mobile/app/screens/portfolio/useSearchableTokenList.ts b/packages/core-mobile/app/screens/portfolio/useSearchableTokenList.ts
@@ -8,15 +8,12 @@ import {
 import { LocalTokenId, LocalTokenWithBalance } from 'store/balance/types'
 import { useDispatch, useSelector } from 'react-redux'
 import { selectTokenBlacklist } from 'store/portfolio'
-import BN from 'bn.js'
 import { useNetworkContractTokens } from 'hooks/networks/useNetworkContractTokens'
 import { useNetworks } from 'hooks/networks/useNetworks'
 import { getLocalTokenId } from 'store/balance/utils'
 
-const bnZero = new BN(0)
-
 const isGreaterThanZero = (token: LocalTokenWithBalance): boolean =>
-  token.balance?.gt(bnZero)
+  token.balance > 0n
 
 const isNotBlacklisted =
   (tokenBlacklist: string[]) => (token: LocalTokenWithBalance) =>
@@ -50,7 +47,7 @@ export function useSearchableTokenList(
         return {
           ...token,
           localId: getLocalTokenId(token),
-          balance: new BN(0),
+          balance: 0n,
           balanceInCurrency: 0,
           balanceDisplayValue: '0',
           balanceCurrencyDisplayValue: '0',

diff --git a/packages/core-mobile/app/screens/rpc/components/v2/ApprovalPopup.tsx b/packages/core-mobile/app/screens/rpc/components/v2/ApprovalPopup.tsx
@@ -29,6 +29,7 @@ import OvalTagBg from 'components/OvalTagBg'
 import Avatar from 'components/Avatar'
 import GlobeSVG from 'components/svg/GlobeSVG'
 import { useSpendLimits } from 'hooks/useSpendLimits'
+import { isHex } from 'viem'
 import RpcRequestBottomSheet from '../shared/RpcRequestBottomSheet'
 import BalanceChange from './BalanceChange'
 import { SpendLimits } from './SpendLimits'
@@ -250,7 +251,9 @@ const ApprovalPopup = (): JSX.Element => {
       updateSpendLimit,
       dAppName: request.dappInfo.name,
       editingToken: {
-        defaultValue: spendLimit.tokenApproval.value,
+        defaultValue: isHex(spendLimit.tokenApproval.value)
+          ? spendLimit.tokenApproval.value
+          : '0x',
         decimals: spendLimit.tokenApproval.token.decimals
       }
     })