CP-9539: devnet cleanup (#2268)

ava-labs · Feb 13, 2025 · 854a8cc · 854a8cc
1 parent faf33dd
commit 854a8cc
Show file tree

Hide file tree

Showing 57 changed files with 111 additions and 456 deletions.
diff --git a/packages/core-mobile/app/hooks/earn/useAdvancedSearchNodes.ts b/packages/core-mobile/app/hooks/earn/useAdvancedSearchNodes.ts
@@ -9,8 +9,6 @@ import { selectIsDeveloperMode } from 'store/settings/advanced'
 import { AdvancedSortFilter, NodeValidators } from 'types/earn'
 import Logger from 'utils/Logger'
 import { TokenUnit } from '@avalabs/core-utils-sdk'
-import { isDevnet } from 'utils/isDevnet'
-import { selectActiveNetwork } from 'store/network'
 import { usePeers } from './usePeers'
 
 export type useAdvancedSearchNodesProps = {
@@ -52,20 +50,13 @@ export const useAdvancedSearchNodes = ({
       error: Error
     } => {
   const { data: peers } = usePeers()
-  const activeNetwork = useSelector(selectActiveNetwork)
   const isDeveloperMode = useSelector(selectIsDeveloperMode)
   const isEndTimeOverOneYear = isOverOneYear(stakingEndTime)
   const noMatchError = new Error(
     `no node matches filter criteria: stakingAmount:  ${stakingAmount}, stakingEndTime: ${stakingEndTime}, minUpTime: ${minUpTime}`
   )
   const noValidatorsError = new Error(`no validators found.`)
 
-  // TODO: https://ava-labs.atlassian.net/browse/CP-9539
-  // simply return all nodes for devnet
-  if (isDevnet(activeNetwork)) {
-    return { validators, error: undefined }
-  }
-
   if (validators && validators.length > 0) {
     const filteredValidators = getFilteredValidators({
       isDeveloperMode,
@@ -75,8 +66,7 @@ export const useAdvancedSearchNodes = ({
       minUpTime,
       maxFee,
       searchText,
-      isEndTimeOverOneYear,
-      isDevnet: isDevnet(activeNetwork)
+      isEndTimeOverOneYear
     })
     if (filteredValidators.length === 0) {
       Logger.info(noMatchError.message)

diff --git a/packages/core-mobile/app/hooks/earn/useCChainNetwork.ts b/packages/core-mobile/app/hooks/earn/useCChainNetwork.ts
@@ -2,18 +2,12 @@ import { Network } from '@avalabs/core-chains-sdk'
 import { useNetworks } from 'hooks/networks/useNetworks'
 import { useMemo } from 'react'
 import { getAvalancheNetwork } from 'services/network/utils/providerUtils'
-import { isDevnet } from 'utils/isDevnet'
 
 const useCChainNetwork = (): Network | undefined => {
   const { activeNetwork, networks } = useNetworks()
 
   return useMemo(
-    () =>
-      getAvalancheNetwork(
-        networks,
-        activeNetwork.isTestnet,
-        isDevnet(activeNetwork)
-      ),
+    () => getAvalancheNetwork(networks, activeNetwork.isTestnet),
     [activeNetwork, networks]
   )
 }

diff --git a/packages/core-mobile/app/hooks/earn/useClaimFees.ts b/packages/core-mobile/app/hooks/earn/useClaimFees.ts
@@ -15,8 +15,6 @@ import WalletService from 'services/wallet/WalletService'
 import Logger from 'utils/Logger'
 import { useCChainBaseFee } from 'hooks/useCChainBaseFee'
 import { TokenUnit } from '@avalabs/core-utils-sdk'
-import { selectActiveNetwork } from 'store/network/slice'
-import { isDevnet } from 'utils/isDevnet'
 import { weiToNano } from 'utils/units/converter'
 import { CorePrimaryAccount } from '@avalabs/types'
 import { Avalanche } from '@avalabs/core-wallets-sdk'
@@ -46,7 +44,6 @@ export const useClaimFees = (): {
 } => {
   const isDevMode = useSelector(selectIsDeveloperMode)
   const activeAccount = useSelector(selectActiveAccount)
-  const activeNetwork = useSelector(selectActiveNetwork)
   const pFeeAdjustmentThreshold = useSelector(selectPFeeAdjustmentThreshold)
   const [totalFees, setTotalFees] = useState<TokenUnit>()
   const [amountToTransfer, setAmountToTransfer] = useState<TokenUnit>()
@@ -58,10 +55,7 @@ export const useClaimFees = (): {
   const cChainBaseFee = useCChainBaseFee()
   const cBaseFeeMultiplier = useSelector(selectCBaseFeeMultiplier)
 
-  const avaxXPNetwork = NetworkService.getAvalancheNetworkP(
-    isDevMode,
-    isDevnet(activeNetwork)
-  )
+  const avaxXPNetwork = NetworkService.getAvalancheNetworkP(isDevMode)
 
   const totalClaimable = useMemo(() => {
     return pChainBalance?.data?.balancePerType.unlockedUnstaked

diff --git a/packages/core-mobile/app/hooks/earn/useClaimRewards.ts b/packages/core-mobile/app/hooks/earn/useClaimRewards.ts
@@ -12,8 +12,6 @@ import { selectCBaseFeeMultiplier } from 'store/posthog/slice'
 import { selectSelectedCurrency } from 'store/settings/currency/slice'
 import Logger from 'utils/Logger'
 import { FundsStuckError } from 'hooks/earn/errors'
-import { selectActiveNetwork } from 'store/network'
-import { isDevnet } from 'utils/isDevnet'
 import { TokenUnit } from '@avalabs/core-utils-sdk'
 import { SendErrorMessage } from 'screens/send/utils/types'
 import { useClaimFees } from './useClaimFees'
@@ -38,7 +36,6 @@ export const useClaimRewards = (
   const queryClient = useQueryClient()
   const activeAccount = useSelector(selectActiveAccount)
   const isDeveloperMode = useSelector(selectIsDeveloperMode)
-  const activeNetwork = useSelector(selectActiveNetwork)
   const selectedCurrency = useSelector(selectSelectedCurrency)
   const { defaultFeeState } = useGetFeeState()
   const cBaseFeeMultiplier = useSelector(selectCBaseFeeMultiplier)
@@ -73,7 +70,6 @@ export const useClaimRewards = (
         requiredAmount: amountToTransfer,
         activeAccount,
         isDevMode: isDeveloperMode,
-        isDevnet: isDevnet(activeNetwork),
         feeState: defaultFeeState,
         cBaseFeeMultiplier
       })

diff --git a/packages/core-mobile/app/hooks/earn/useDefaultFeeState.ts b/packages/core-mobile/app/hooks/earn/useDefaultFeeState.ts
@@ -2,9 +2,7 @@ import { pvm } from '@avalabs/avalanchejs'
 import { useQuery, UseQueryResult } from '@tanstack/react-query'
 import { useSelector } from 'react-redux'
 import NetworkService from 'services/network/NetworkService'
-import { selectActiveNetwork } from 'store/network'
 import { selectIsDeveloperMode } from 'store/settings/advanced'
-import { isDevnet } from 'utils/isDevnet'
 
 const REFETCH_INTERVAL = 1000 * 60 * 1 // 1 minute
 
@@ -13,17 +11,14 @@ export const useDefaultFeeState = (): UseQueryResult<
   Error
 > => {
   const isDeveloperMode = useSelector(selectIsDeveloperMode)
-  const network = useSelector(selectActiveNetwork)
-  const devnet = isDevnet(network)
 
   return useQuery({
     retry: false,
     refetchInterval: REFETCH_INTERVAL,
-    queryKey: ['defaultFeeState', isDeveloperMode, devnet],
+    queryKey: ['defaultFeeState', isDeveloperMode],
     queryFn: async () => {
       const provider = await NetworkService.getAvalancheProviderXP(
-        isDeveloperMode,
-        devnet
+        isDeveloperMode
       )
 
       if (provider.isEtnaEnabled()) {

diff --git a/packages/core-mobile/app/hooks/earn/useDelegation.ts b/packages/core-mobile/app/hooks/earn/useDelegation.ts
@@ -4,13 +4,11 @@ import { selectSelectedCurrency } from 'store/settings/currency'
 import { selectIsDeveloperMode } from 'store/settings/advanced'
 import { useCChainBalance } from 'hooks/earn/useCChainBalance'
 import { useCChainBaseFee } from 'hooks/useCChainBaseFee'
-import { selectActiveNetwork } from 'store/network/slice'
 import {
   selectPFeeAdjustmentThreshold,
   selectCrossChainFeesMultiplier,
   selectCBaseFeeMultiplier
 } from 'store/posthog/slice'
-import { isDevnet } from 'utils/isDevnet'
 import { selectActiveAccount } from 'store/account/slice'
 import { computeDelegationSteps } from 'services/earn/computeDelegationSteps/computeDelegationSteps'
 import {
@@ -38,7 +36,6 @@ export const useDelegation = (): {
 } => {
   const [steps, setSteps] = useState<Step[]>(EMPTY_STEPS)
   const cChainBalance = useCChainBalance()
-  const activeNetwork = useSelector(selectActiveNetwork)
   const activeAccount = useSelector(selectActiveAccount)
   const isDeveloperMode = useSelector(selectIsDeveloperMode)
   const selectedCurrency = useSelector(selectSelectedCurrency)
@@ -58,8 +55,6 @@ export const useDelegation = (): {
     [steps]
   )
 
-  const isDevNetwork = isDevnet(activeNetwork)
-
   const compute: Compute = useCallback(
     async (stakeAmount: bigint) => {
       if (
@@ -71,10 +66,7 @@ export const useDelegation = (): {
       )
         return EMPTY_STEPS
 
-      const network = NetworkService.getAvalancheNetworkP(
-        isDeveloperMode,
-        isDevNetwork
-      )
+      const network = NetworkService.getAvalancheNetworkP(isDeveloperMode)
 
       const result = await computeDelegationSteps({
         pAddress: activeAccount.addressPVM,
@@ -98,7 +90,6 @@ export const useDelegation = (): {
     [
       cChainNetwork,
       activeAccount,
-      isDevNetwork,
       cChainBaseFee.data,
       defaultFeeState,
       isDeveloperMode,
@@ -142,7 +133,6 @@ export const useDelegation = (): {
               nodeId,
               stakeAmountNanoAvax: step.amount,
               startDate: startDate,
-              isDevnet: isDevNetwork,
               feeState: defaultFeeState,
               pFeeAdjustmentThreshold
             })
@@ -155,7 +145,6 @@ export const useDelegation = (): {
               activeAccount,
               selectedCurrency,
               isDevMode: isDeveloperMode,
-              isDevnet: isDevNetwork,
               feeState: defaultFeeState
             })
             break
@@ -170,7 +159,6 @@ export const useDelegation = (): {
               requiredAmountWei: nanoToWei(step.amount),
               activeAccount,
               isDevMode: isDeveloperMode,
-              isDevnet: isDevNetwork,
               cBaseFeeMultiplier
             })
             break
@@ -189,7 +177,6 @@ export const useDelegation = (): {
     },
     [
       activeAccount,
-      isDevNetwork,
       cChainBalance.data?.balance,
       defaultFeeState,
       isDeveloperMode,

diff --git a/packages/core-mobile/app/hooks/earn/useEarnCalcEstimatedRewards.ts b/packages/core-mobile/app/hooks/earn/useEarnCalcEstimatedRewards.ts
@@ -7,8 +7,6 @@ import { pvm } from '@avalabs/avalanchejs'
 import { Seconds } from 'types/siUnits'
 import { TokenUnit } from '@avalabs/core-utils-sdk'
 import NetworkService from 'services/network/NetworkService'
-import { selectActiveNetwork } from 'store/network'
-import { isDevnet } from 'utils/isDevnet'
 import { useAvalancheXpProvider } from 'hooks/networks/networkProviderHooks'
 
 export type useEarnCalcEstimatedRewardsProps = {
@@ -37,12 +35,8 @@ export const useEarnCalcEstimatedRewards = ({
 > => {
   const isDeveloperMode = useSelector(selectIsDeveloperMode)
   const avaxPrice = useSelector(selectAvaxPrice)
-  const activeNetwork = useSelector(selectActiveNetwork)
   const provider = useAvalancheXpProvider(isDeveloperMode)
-  const { networkToken } = NetworkService.getAvalancheNetworkP(
-    isDeveloperMode,
-    isDevnet(activeNetwork)
-  )
+  const { networkToken } = NetworkService.getAvalancheNetworkP(isDeveloperMode)
 
   return useQuery({
     queryKey: ['currentSupply', provider],
@@ -62,8 +56,7 @@ export const useEarnCalcEstimatedRewards = ({
           networkToken.symbol
         ),
         delegationFee,
-        isDeveloperMode,
-        isDevnet(activeNetwork)
+        isDeveloperMode
       )
       return {
         estimatedTokenReward: reward,

diff --git a/packages/core-mobile/app/hooks/earn/useGetClaimableBalance.ts b/packages/core-mobile/app/hooks/earn/useGetClaimableBalance.ts
@@ -4,8 +4,6 @@ import { TokenUnit } from '@avalabs/core-utils-sdk'
 import NetworkService from 'services/network/NetworkService'
 import { useSelector } from 'react-redux'
 import { selectIsDeveloperMode } from 'store/settings/advanced'
-import { selectActiveNetwork } from 'store/network'
-import { isDevnet } from 'utils/isDevnet'
 
 export const useGetClaimableBalance = (): TokenUnit | undefined => {
   const pChainBalance = usePChainBalance()
@@ -14,11 +12,7 @@ export const useGetClaimableBalance = (): TokenUnit | undefined => {
   const hasErrors = pChainBalance.error || !pChainBalance.data
   const dataReady = !pChainBalance.isLoading && !hasErrors
   const isDeveloperMode = useSelector(selectIsDeveloperMode)
-  const activeNetwork = useSelector(selectActiveNetwork)
-  const { networkToken } = NetworkService.getAvalancheNetworkP(
-    isDeveloperMode,
-    isDevnet(activeNetwork)
-  )
+  const { networkToken } = NetworkService.getAvalancheNetworkP(isDeveloperMode)
 
   return useMemo(() => {
     if (dataReady && unlockedUnstakedNAvax !== undefined) {

diff --git a/packages/core-mobile/app/hooks/earn/useGetStuckBalance.ts b/packages/core-mobile/app/hooks/earn/useGetStuckBalance.ts
@@ -4,8 +4,6 @@ import { TokenUnit } from '@avalabs/core-utils-sdk'
 import NetworkService from 'services/network/NetworkService'
 import { useSelector } from 'react-redux'
 import { selectIsDeveloperMode } from 'store/settings/advanced'
-import { selectActiveNetwork } from 'store/network'
-import { isDevnet } from 'utils/isDevnet'
 
 export const useGetStuckBalance = (): TokenUnit | undefined => {
   const pChainBalance = usePChainBalance()
@@ -14,11 +12,7 @@ export const useGetStuckBalance = (): TokenUnit | undefined => {
   const hasErrors = pChainBalance.error || !pChainBalance.data
   const dataReady = !pChainBalance.isLoading && !hasErrors
   const isDeveloperMode = useSelector(selectIsDeveloperMode)
-  const activeNetwork = useSelector(selectActiveNetwork)
-  const { networkToken } = NetworkService.getAvalancheNetworkP(
-    isDeveloperMode,
-    isDevnet(activeNetwork)
-  )
+  const { networkToken } = NetworkService.getAvalancheNetworkP(isDeveloperMode)
 
   return useMemo(() => {
     if (dataReady && atomicMemoryUnlockedNAvax !== undefined) {

diff --git a/packages/core-mobile/app/hooks/earn/useImportAnyStuckFunds.ts b/packages/core-mobile/app/hooks/earn/useImportAnyStuckFunds.ts
@@ -7,8 +7,6 @@ import { RecoveryEvents } from 'services/earn/types'
 import { selectCBaseFeeMultiplier } from 'store/posthog/slice'
 import { assertNotUndefined } from 'utils/assertions'
 import { selectSelectedCurrency } from 'store/settings/currency'
-import { selectActiveNetwork } from 'store/network'
-import { isDevnet } from 'utils/isDevnet'
 import { useGetFeeState } from './useGetFeeState'
 
 const REFETCH_INTERVAL = 3 * 60 * 1000 // 3 minutes
@@ -24,10 +22,8 @@ export const useImportAnyStuckFunds = (
   const activeAccount = useSelector(selectActiveAccount)
   const isDevMode = useSelector(selectIsDeveloperMode)
   const selectedCurrency = useSelector(selectSelectedCurrency)
-  const activeNetwork = useSelector(selectActiveNetwork)
   const cBaseFeeMultiplier = useSelector(selectCBaseFeeMultiplier)
   const { defaultFeeState } = useGetFeeState()
-  const devnet = isDevnet(activeNetwork)
 
   return useQuery({
     // no need to retry failed request as we are already doing interval fetching
@@ -39,8 +35,7 @@ export const useImportAnyStuckFunds = (
       'ImportAnyStuckFunds',
       activeAccount,
       isDevMode,
-      defaultFeeState,
-      devnet
+      defaultFeeState
     ],
     queryFn: async () => {
       assertNotUndefined(activeAccount)
@@ -50,7 +45,6 @@ export const useImportAnyStuckFunds = (
         selectedCurrency,
         progressEvents: handleRecoveryEvent,
         feeState: defaultFeeState,
-        isDevnet: devnet,
         cBaseFeeMultiplier
       })
       return true

diff --git a/packages/core-mobile/app/hooks/earn/useNodes.ts b/packages/core-mobile/app/hooks/earn/useNodes.ts
@@ -3,24 +3,19 @@ import { useQuery, UseQueryResult } from '@tanstack/react-query'
 import { useSelector } from 'react-redux'
 import EarnService from 'services/earn/EarnService'
 import NetworkService from 'services/network/NetworkService'
-import { selectActiveNetwork } from 'store/network'
 import { selectIsDeveloperMode } from 'store/settings/advanced'
-import { isDevnet } from 'utils/isDevnet'
 
 export const useNodes = (): UseQueryResult<
   pvm.GetCurrentValidatorsResponse,
   Error
 > => {
-  const network = useSelector(selectActiveNetwork)
   const isDeveloperMode = useSelector(selectIsDeveloperMode)
-  const devnet = isDevnet(network)
 
   return useQuery({
-    queryKey: ['nodes', isDeveloperMode, devnet],
+    queryKey: ['nodes', isDeveloperMode],
     queryFn: async () => {
       const provider = await NetworkService.getAvalancheProviderXP(
-        isDeveloperMode,
-        devnet
+        isDeveloperMode
       )
       return EarnService.getCurrentValidators(provider)
     }

diff --git a/packages/core-mobile/app/hooks/earn/usePChainBalance.ts b/packages/core-mobile/app/hooks/earn/usePChainBalance.ts
@@ -6,8 +6,6 @@ import { refetchIntervals } from 'consts/earn'
 import NetworkService from 'services/network/NetworkService'
 import { selectSelectedCurrency } from 'store/settings/currency'
 import { TokenWithBalancePVM } from '@avalabs/vm-module-types'
-import { isDevnet } from 'utils/isDevnet'
-import { selectActiveNetwork } from 'store/network'
 import { getPChainBalance } from 'services/balance/getPChainBalance'
 
 export const usePChainBalance = (): UseQueryResult<
@@ -17,11 +15,7 @@ export const usePChainBalance = (): UseQueryResult<
   const addressPVM = useSelector(selectActiveAccount)?.addressPVM
   const isDeveloperMode = useSelector(selectIsDeveloperMode)
   const selectedCurrency = useSelector(selectSelectedCurrency)
-  const activeNetwork = useSelector(selectActiveNetwork)
-  const network = NetworkService.getAvalancheNetworkP(
-    isDeveloperMode,
-    isDevnet(activeNetwork)
-  )
+  const network = NetworkService.getAvalancheNetworkP(isDeveloperMode)
 
   return useQuery({
     refetchInterval: refetchIntervals.balance,