fix

Author: onghwan

packages/core-mobile/app/services/earn/EarnService.ts

@@ -29,7 +29,6 @@ import AnalyticsService from 'services/analytics/AnalyticsService'
 import { TokenUnit } from '@avalabs/core-utils-sdk'
 import { Avalanche } from '@avalabs/core-wallets-sdk'
 import { AvaxXP } from 'types/AvaxXP'
-import { NetworkVMType } from '@avalabs/core-chains-sdk'
 import {
   getTransformedTransactions,
   maxGetAtomicUTXOsRetries,
@@ -366,35 +365,47 @@ class EarnService {
     | undefined
   > => {
     try {
-      const currentNetworkAddresses = await WalletService.getXPAddresses({
-        accounts,
-        walletId,
-        walletType,
-        isTestnet,
-        networkType: NetworkVMType.PVM,
-        onlyWithActivity: true
-      })
+      const currentNetworkAddressesPromises = accounts.map(account =>
+        WalletService.getXPExternalAddresses({
+          account,
+          walletId,
+          walletType,
+          isTestnet
+        })
+      )
+      const currentNetworkAddresses = await Promise.all(
+        currentNetworkAddressesPromises
+      )
+      const currentNetworkAddressesArray = currentNetworkAddresses
+        .flat()
+        .map(address => address.address)
       const currentNetworkTransactions =
-        currentNetworkAddresses.length > 0
+        currentNetworkAddressesArray.length > 0
           ? await getTransformedTransactions(
-              currentNetworkAddresses,
+              currentNetworkAddressesArray,
               isTestnet,
               startTimestamp
             )
           : []
 
-      const oppositeNetworkAddresses = await WalletService.getXPAddresses({
-        accounts,
-        walletId,
-        walletType,
-        isTestnet: !isTestnet,
-        networkType: NetworkVMType.PVM,
-        onlyWithActivity: true
-      })
+      const oppositeNetworkAddressesPromises = accounts.map(account =>
+        WalletService.getXPExternalAddresses({
+          account,
+          walletId,
+          walletType,
+          isTestnet: !isTestnet
+        })
+      )
+      const oppositeNetworkAddresses = await Promise.all(
+        oppositeNetworkAddressesPromises
+      )
+      const oppositeNetworkAddressesArray = oppositeNetworkAddresses
+        .flat()
+        .map(address => address.address)
       const oppositeNetworkTransactions =
-        oppositeNetworkAddresses.length > 0
+        oppositeNetworkAddressesArray.length > 0
           ? await getTransformedTransactions(
-              oppositeNetworkAddresses,
+              oppositeNetworkAddressesArray,
               !isTestnet,
               startTimestamp
             )

packages/core-mobile/app/services/profile/ProfileService.ts

@@ -0,0 +1,48 @@
+import { NetworkVMType } from '@avalabs/vm-module-types'
+import Config from 'react-native-config'
+import { NetworkAddresses } from 'services/wallet/types'
+import fetchWithAppCheck from 'utils/httpClient'
+import Logger from 'utils/Logger'
+
+if (!Config.CORE_PROFILE_URL) {
+  Logger.warn(
+    'CORE_PROFILE_URL is missing. Profile service may not work properly.'
+  )
+}
+
+class ProfileService {
+  public async fetchXPAddresses({
+    xpubXP,
+    networkType,
+    isTestnet = false,
+    onlyWithActivity
+  }: {
+    xpubXP: string
+    networkType: NetworkVMType.AVM | NetworkVMType.PVM
+    isTestnet: boolean
+    onlyWithActivity: boolean
+  }): Promise<NetworkAddresses> {
+    try {
+      const res = await fetchWithAppCheck(
+        `${Config.CORE_PROFILE_URL}/v1/get-addresses`,
+        JSON.stringify({
+          networkType: networkType,
+          extendedPublicKey: xpubXP,
+          isTestnet,
+          onlyWithActivity
+        })
+      )
+
+      if (!res.ok) {
+        throw new Error(`${res.status}:${res.statusText}`)
+      }
+
+      return res.json()
+    } catch (err) {
+      Logger.error(`[ProfileService][fetchXPAddresses]${err}`)
+      throw err
+    }
+  }
+}
+
+export default new ProfileService()

packages/core-mobile/app/services/wallet/WalletService.tsx

@@ -1,4 +1,3 @@
-import Config from 'react-native-config'
 import {
   Avalanche,
   BitcoinProvider,
@@ -12,7 +11,6 @@ import {
   CreateImportCTxParams,
   CreateImportPTxParams,
   CreateSendPTxParams,
-  NetworkAddresses,
   PubKeyType,
   SignTransactionRequest,
   Wallet,
@@ -37,15 +35,21 @@ import {
 import { UTCDate } from '@date-fns/utc'
 import { nanoToWei } from 'utils/units/converter'
 import { SpanName } from 'services/sentry/types'
-import { AVALANCHE_DERIVATION_PATH_PREFIX, Curve } from 'utils/publicKeys'
-import fetchWithAppCheck from 'utils/httpClient'
+import {
+  AVALANCHE_DERIVATION_PATH_PREFIX,
+  Curve,
+  getXPAddressIndexFromDerivationPath
+} from 'utils/publicKeys'
 import {
   AVALANCHE_MAINNET_NETWORK,
   AVALANCHE_TESTNET_NETWORK
 } from 'services/network/consts'
 import ModuleManager from 'vmModule/ModuleManager'
 import { Network as VmNetwork } from '@avalabs/vm-module-types'
 import { SeedlessPubKeysStorage } from 'seedless/services/storage/SeedlessPubKeysStorage'
+import { getAddressesFromXpubXP } from 'utils/getAddressesFromXpubXP'
+import { xpAddressWithoutPrefix } from 'common/utils/xpAddressWIthoutPrefix'
+import { AddressIndex } from '@avalabs/types'
 import {
   getAddressDerivationPath,
   getAssetId,
@@ -280,49 +284,6 @@ class WalletService {
     return wallet.getRawXpubXP(accountIndex)
   }
 
-  public async getAddressesFromXpubXP({
-    walletId,
-    walletType,
-    accountIndex,
-    networkType,
-    isTestnet = false,
-    onlyWithActivity
-  }: {
-    walletId: string
-    walletType: WalletType
-    accountIndex: number
-    networkType: NetworkVMType.AVM | NetworkVMType.PVM
-    isTestnet: boolean
-    onlyWithActivity: boolean
-  }): Promise<NetworkAddresses> {
-    const xpubXP = await this.getRawXpubXP({
-      walletId,
-      walletType,
-      accountIndex
-    })
-
-    try {
-      const res = await fetchWithAppCheck(
-        `${Config.CORE_PROFILE_URL}/v1/get-addresses`,
-        JSON.stringify({
-          networkType: networkType,
-          extendedPublicKey: xpubXP,
-          isTestnet,
-          onlyWithActivity
-        })
-      )
-
-      if (!res.ok) {
-        throw new Error(`${res.status}:${res.statusText}`)
-      }
-
-      return res.json()
-    } catch (err) {
-      Logger.error(`[WalletService.ts][getAddressesFromXpubXP]${err}`)
-      throw err
-    }
-  }
-
   /**
    * Get atomic transactions that are in VM memory.
    */
@@ -968,58 +929,39 @@ class WalletService {
    * - **Seedless wallets**: Retrieves addresses from stored public keys
    * - **Other wallet types**: Returns an empty array
    *
-   * @param accounts - Array of accounts to get addresses for
+   * @param account - account to get addresses for
    * @param walletId - Unique identifier of the wallet
    * @param walletType - Type of wallet (Mnemonic, Keystone, Ledger, Seedless, etc.)
    * @param isTestnet - Whether to use testnet or mainnet
-   * @param networkType - Chain type: NetworkVMType.AVM for X-Chain or NetworkVMType.PVM for P-Chain
-   * @param onlyWithActivity - If true, only return addresses that have been used (xpub wallets only)
    *
    * @returns Promise resolving to an array of addresses (e.g., ["avax1...", "avax2..."])
    */
-  async getXPAddresses({
-    accounts,
+  async getXPExternalAddresses({
     walletId,
     walletType,
-    isTestnet,
-    networkType,
-    onlyWithActivity
+    account,
+    isTestnet
   }: {
-    accounts: Account[]
+    account: Account
     walletId: string
     walletType: WalletType
     isTestnet: boolean
-    networkType: NetworkVMType.AVM | NetworkVMType.PVM
-    onlyWithActivity: boolean
-  }): Promise<string[]> {
+  }): Promise<AddressIndex[]> {
     if (this.hasXpub(walletType)) {
-      const promises = accounts
-        .map(account => account.index)
-        .map(accountIndex =>
-          this.getAddressesFromXpubXP({
-            walletId,
-            walletType,
-            networkType,
-            isTestnet,
-            accountIndex,
-            onlyWithActivity
-          })
-        )
-
-      const networkAddresses = await Promise.all(promises)
-      return networkAddresses
-        .map(address => address.externalAddresses)
-        .flat()
-        .map(address => address.address)
+      const networkAddresses = await getAddressesFromXpubXP({
+        isTestnet,
+        walletId,
+        walletType,
+        accountIndex: account.index
+      })
+      return networkAddresses.externalAddresses
     }
 
     if (walletType === WalletType.SEEDLESS) {
       const storedPubKeys = await SeedlessPubKeysStorage.retrieve()
       const publicKeys = storedPubKeys.filter(publicKey =>
-        accounts.some(account =>
-          publicKey.derivationPath.startsWith(
-            AVALANCHE_DERIVATION_PATH_PREFIX + account.index
-          )
+        publicKey.derivationPath.startsWith(
+          AVALANCHE_DERIVATION_PATH_PREFIX + account.index
         )
       )
 
@@ -1028,10 +970,11 @@ class WalletService {
       } as VmNetwork)
       return publicKeys.map(publicKey => {
         const publicKeyXP = Buffer.from(publicKey.key, 'hex')
-        return provider.getAddress(
-          publicKeyXP,
-          networkType === NetworkVMType.AVM ? 'X' : 'P'
-        )
+        const address = provider.getAddress(publicKeyXP, 'P')
+        return {
+          address: xpAddressWithoutPrefix(address),
+          index: getXPAddressIndexFromDerivationPath(publicKey.derivationPath)
+        }
       })
     }
 

packages/core-mobile/app/services/wallet/types.ts

@@ -16,6 +16,7 @@ import {
 } from '@avalabs/vm-module-types'
 import { SolanaProvider } from '@avalabs/core-wallets-sdk'
 import { Curve } from 'utils/publicKeys'
+import { AddressIndex } from '@avalabs/types'
 
 export type SignTransactionRequest =
   | TransactionRequest
@@ -268,3 +269,8 @@ export interface NetworkAddresses {
   externalAddresses: { address: string; index: number; hasActivity: boolean }[]
   internalAddresses: { address: string; index: number; hasActivity: boolean }[]
 }
+
+export type NormalizedXPAddresses = {
+  externalAddresses: AddressIndex[]
+  internalAddresses: AddressIndex[]
+}

packages/core-mobile/app/store/rpc/handlers/account/avalanche_getAccounts/avalanche_getAccounts.test.ts

@@ -12,6 +12,14 @@ jest.mock('store/account/slice', () => {
   }
 })
 
+jest.mock('store/settings/advanced', () => {
+  const actual = jest.requireActual('store/settings/advanced')
+  return {
+    ...actual,
+    selectIsDeveloperMode: () => true
+  }
+})
+
 jest.mock('store/wallet/slice', () => ({
   selectWalletById: () => () => ({
     id: 'wallet-1',
@@ -27,7 +35,8 @@ jest.mock('services/wallet/WalletService', () => ({
       .fn()
       .mockResolvedValue(
         'xpub6D4BDPcP2GT577Vvch3R8wDkScZWzQzMMUm3PWbmWvVJrZwQY4VUNgqFJPMM3No2dFDFGTsxxpG5uJh7n7epu4trkrX7x7DogT5Uv6fcLW5'
-      )
+      ),
+    getXPExternalAddresses: jest.fn().mockResolvedValue([])
   }
 }))
 
@@ -89,7 +98,8 @@ describe('avalanche_getAccounts handler', () => {
             walletType: 'MNEMONIC',
             walletName: 'Test Wallet',
             xpubXP:
-              'xpub6D4BDPcP2GT577Vvch3R8wDkScZWzQzMMUm3PWbmWvVJrZwQY4VUNgqFJPMM3No2dFDFGTsxxpG5uJh7n7epu4trkrX7x7DogT5Uv6fcLW5'
+              'xpub6D4BDPcP2GT577Vvch3R8wDkScZWzQzMMUm3PWbmWvVJrZwQY4VUNgqFJPMM3No2dFDFGTsxxpG5uJh7n7epu4trkrX7x7DogT5Uv6fcLW5',
+            xpAddresses: []
           },
           {
             id: '1',
@@ -107,7 +117,8 @@ describe('avalanche_getAccounts handler', () => {
             walletType: 'MNEMONIC',
             walletName: 'Test Wallet',
             xpubXP:
-              'xpub6D4BDPcP2GT577Vvch3R8wDkScZWzQzMMUm3PWbmWvVJrZwQY4VUNgqFJPMM3No2dFDFGTsxxpG5uJh7n7epu4trkrX7x7DogT5Uv6fcLW5'
+              'xpub6D4BDPcP2GT577Vvch3R8wDkScZWzQzMMUm3PWbmWvVJrZwQY4VUNgqFJPMM3No2dFDFGTsxxpG5uJh7n7epu4trkrX7x7DogT5Uv6fcLW5',
+            xpAddresses: []
           }
         ]
       })
@@ -132,6 +143,7 @@ describe('avalanche_getAccounts handler', () => {
 
       expect(result.success).toBe(true)
       if (result.success) {
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
         const accounts = result.value as any[]
         expect(accounts).toHaveLength(2)
         expect(accounts[0].xpubXP).toBeUndefined()