refactor: new X/P chains account model (#499)

Author: meeh0w

apps/legacy/package.json

@@ -15,28 +15,28 @@
     "typecheck": "yarn tsc --skipLibCheck --noEmit"
   },
   "dependencies": {
-    "@avalabs/avalanche-module": "2.2.1",
+    "@avalabs/avalanche-module": "3.0.0",
     "@avalabs/avalanchejs": "5.1.0-alpha.2",
-    "@avalabs/bitcoin-module": "2.2.1",
+    "@avalabs/bitcoin-module": "3.0.0",
     "@avalabs/bridge-unified": "4.3.0",
-    "@avalabs/core-bridge-sdk": "3.1.0-alpha.67",
-    "@avalabs/core-chains-sdk": "3.1.0-alpha.67",
-    "@avalabs/core-coingecko-sdk": "3.1.0-alpha.67",
-    "@avalabs/core-covalent-sdk": "3.1.0-alpha.67",
-    "@avalabs/core-etherscan-sdk": "3.1.0-alpha.67",
-    "@avalabs/core-gasless-sdk": "3.1.0-alpha.67",
+    "@avalabs/core-bridge-sdk": "3.1.0-alpha.69",
+    "@avalabs/core-chains-sdk": "3.1.0-alpha.69",
+    "@avalabs/core-coingecko-sdk": "3.1.0-alpha.69",
+    "@avalabs/core-covalent-sdk": "3.1.0-alpha.69",
+    "@avalabs/core-etherscan-sdk": "3.1.0-alpha.69",
+    "@avalabs/core-gasless-sdk": "3.1.0-alpha.69",
     "@avalabs/core-k2-components": "4.18.0-alpha.53",
-    "@avalabs/core-snowtrace-sdk": "3.1.0-alpha.67",
-    "@avalabs/core-token-prices-sdk": "3.1.0-alpha.67",
-    "@avalabs/core-utils-sdk": "3.1.0-alpha.67",
-    "@avalabs/core-wallets-sdk": "3.1.0-alpha.67",
-    "@avalabs/evm-module": "2.2.1",
-    "@avalabs/glacier-sdk": "3.1.0-alpha.67",
-    "@avalabs/hvm-module": "2.2.1",
+    "@avalabs/core-snowtrace-sdk": "3.1.0-alpha.69",
+    "@avalabs/core-token-prices-sdk": "3.1.0-alpha.69",
+    "@avalabs/core-utils-sdk": "3.1.0-alpha.69",
+    "@avalabs/core-wallets-sdk": "3.1.0-alpha.69",
+    "@avalabs/evm-module": "3.0.0",
+    "@avalabs/glacier-sdk": "3.1.0-alpha.69",
+    "@avalabs/hvm-module": "3.0.0",
     "@avalabs/hw-app-avalanche": "1.1.1",
-    "@avalabs/svm-module": "2.2.1",
-    "@avalabs/types": "3.1.0-alpha.67",
-    "@avalabs/vm-module-types": "2.2.1",
+    "@avalabs/svm-module": "3.0.0",
+    "@avalabs/types": "3.1.0-alpha.69",
+    "@avalabs/vm-module-types": "3.0.0",
     "@blockaid/client": "0.10.0",
     "@coinbase/cbpay-js": "1.6.0",
     "@core/common": "workspace:*",

apps/legacy/src/components/keystone/KeystoneConnector.tsx

@@ -90,8 +90,8 @@ export function KeystoneConnector({ onSuccess }: KeystoneConnectorProps) {
   const getXPublicKey = useCallback(async () => {
     try {
       const mfp = await getMasterFingerprint();
-      const xpubValue = await getExtendedPublicKey();
-      const xpubXPValue = await getExtendedPublicKey(ChainIDAlias.X);
+      const xpubValue = await getExtendedPublicKey(ChainIDAlias.C, 0);
+      const xpubXPValue = await getExtendedPublicKey(ChainIDAlias.X, 0);
       capture('OnboardingKeystone3Connected');
       onSuccess({
         xpub: xpubValue,

apps/next/package.json

@@ -17,12 +17,12 @@
   },
   "dependencies": {
     "@avalabs/avalanchejs": "5.1.0-alpha.2",
-    "@avalabs/core-chains-sdk": "3.1.0-alpha.67",
-    "@avalabs/core-utils-sdk": "3.1.0-alpha.67",
-    "@avalabs/core-wallets-sdk": "3.1.0-alpha.67",
+    "@avalabs/core-chains-sdk": "3.1.0-alpha.69",
+    "@avalabs/core-utils-sdk": "3.1.0-alpha.69",
+    "@avalabs/core-wallets-sdk": "3.1.0-alpha.69",
     "@avalabs/k2-alpine": "1.235.0",
-    "@avalabs/types": "3.1.0-alpha.67",
-    "@avalabs/vm-module-types": "2.2.1",
+    "@avalabs/types": "3.1.0-alpha.69",
+    "@avalabs/vm-module-types": "3.0.0",
     "@core/common": "workspace:*",
     "@core/messaging": "workspace:*",
     "@core/service-worker": "workspace:*",

apps/next/src/components/ConnectLedger/ConnectAvalanche.tsx

@@ -69,7 +69,7 @@ export const ConnectAvalanche: FC<ConnectionStepProps> = ({
           onStatusChange={setStatus}
           setDerivationPathSpec={setDerivationPathSpec}
           derivationPathSpec={derivationPathSpec}
-          numberOfKeys={3}
+          numberOfKeys={1}
         />
       </FullscreenModalContent>
       <FullscreenModalActions>

apps/next/src/components/ConnectLedger/LedgerConnector/hooks/useLedgerPublicKeyFetcher/useLedgerBasePublicKeyFetcher.ts

@@ -3,21 +3,18 @@ import {
   DerivationPath,
   getAddressPublicKeyFromXPub,
 } from '@avalabs/core-wallets-sdk';
-import { VM } from '@avalabs/avalanchejs';
 
 import {
   LedgerAppType,
   REQUIRED_LEDGER_VERSION,
   useLedgerContext,
   useDuplicatedWalletChecker,
 } from '@core/ui';
+import { EVM_BASE_DERIVATION_PATH, SecretType } from '@core/types';
 import {
-  AddressPublicKeyJson,
-  AVALANCHE_BASE_DERIVATION_PATH,
-  EVM_BASE_DERIVATION_PATH,
-  SecretType,
-} from '@core/types';
-import { isLedgerVersionCompatible } from '@core/common';
+  getAvalancheExtendedKeyPath,
+  isLedgerVersionCompatible,
+} from '@core/common';
 
 import {
   DerivationStatus,
@@ -32,6 +29,10 @@ import { buildAddressPublicKey, buildExtendedPublicKey } from '../../util';
 export const useLedgerBasePublicKeyFetcher: UseLedgerPublicKeyFetcher = (
   derivationPathSpec,
 ) => {
+  if (!derivationPathSpec) {
+    throw new Error('Derivation path spec is required');
+  }
+
   const {
     appType,
     avaxAppVersion,
@@ -40,109 +41,78 @@ export const useLedgerBasePublicKeyFetcher: UseLedgerPublicKeyFetcher = (
     wasTransportAttempted,
     initLedgerTransport,
     getExtendedPublicKey,
-    getPublicKey,
   } = useLedgerContext();
   const checkIfWalletExists = useDuplicatedWalletChecker();
 
   const [error, setError] = useState<ErrorType>();
   const [status, setStatus] = useState<DerivationStatus>('waiting');
 
-  const getPublicKeyFromLedger = useCallback(
-    async (accountIndex: number, vm: VM): Promise<AddressPublicKeyJson> => {
-      const publicKey = await getPublicKey(
-        accountIndex,
-        DerivationPath.LedgerLive,
-        vm,
-      );
-
-      return buildAddressPublicKey(publicKey, vm, accountIndex, 'secp256k1');
-    },
-    [getPublicKey],
-  );
-
-  // Used with LedgerLive derivation path, as with such we cannot use the extended public keys
-  const getKeysDirectlyFromLedger = useCallback(
+  const getExtendedPublicKeys = useCallback(
     async (indexes: number[]) => {
-      const keys: PublicKey[] = [];
+      const xpExtendedPublicKeys: { index: number; key: string }[] = [];
 
-      // We cannot send multiple requests to the ledger at once, so we need to do one at a time
       for (const index of indexes) {
-        const evmKey = await getPublicKeyFromLedger(index, 'EVM');
-        keys.push({
+        xpExtendedPublicKeys.push({
           index,
-          vm: 'EVM',
-          key: evmKey,
-        });
-
-        const xpKey = await getPublicKeyFromLedger(index, 'AVM');
-        keys.push({
-          index,
-          vm: 'AVM',
-          key: xpKey,
+          key: await getExtendedPublicKey(getAvalancheExtendedKeyPath(index)),
         });
       }
 
       return {
-        addressPublicKeys: keys,
+        evm: await getExtendedPublicKey(EVM_BASE_DERIVATION_PATH),
+        xp: xpExtendedPublicKeys,
       };
     },
-    [getPublicKeyFromLedger],
+    [getExtendedPublicKey],
   );
 
-  // Used with BIP44 derivation path, as it's way faster to get the keys from the extended public keys
-  // and derive address public keys from them than to query the device many times more.
-  //
-  // Having the extended public keys also allows us to derive further addresses without connecting the device
-  // later on.
-  const getKeysFromExtendedPublicKeys = useCallback(
+  const getPublicKeys = useCallback(
     async (indexes: number[]) => {
-      const evmExtendedPublicKey = await getExtendedPublicKey(
-        EVM_BASE_DERIVATION_PATH,
-      );
-      const xpExtendedPublicKey = await getExtendedPublicKey(
-        AVALANCHE_BASE_DERIVATION_PATH,
-      );
+      const publicKeys: PublicKey[] = [];
+      const { evm, xp: xpExtendedKeys } = await getExtendedPublicKeys(indexes);
 
-      const keys: PublicKey[] = [];
-
-      // We cannot send multiple requests to the ledger at once, so we need to do one at a time
       for (const index of indexes) {
-        const evmKey = await getAddressPublicKeyFromXPub(
-          evmExtendedPublicKey,
-          index,
-        );
-        keys.push({
+        const evmKey = await getAddressPublicKeyFromXPub(evm, index);
+        publicKeys.push({
           index,
           vm: 'EVM',
-          key: buildAddressPublicKey(evmKey, 'EVM', index, 'secp256k1'),
+          key: buildAddressPublicKey(
+            evmKey,
+            'EVM',
+            index,
+            'secp256k1',
+            derivationPathSpec,
+          ),
         });
+      }
 
-        const xpKey = await getAddressPublicKeyFromXPub(
-          xpExtendedPublicKey,
-          index,
-        );
-        keys.push({
+      for (const { key: xpubXP, index } of xpExtendedKeys) {
+        const addressPublicKey = await getAddressPublicKeyFromXPub(xpubXP, 0);
+
+        publicKeys.push({
           index,
           vm: 'AVM',
-          key: buildAddressPublicKey(xpKey, 'AVM', index, 'secp256k1'),
+          key: buildAddressPublicKey(
+            addressPublicKey,
+            'AVM',
+            index,
+            'secp256k1',
+            derivationPathSpec,
+          ),
         });
       }
 
       return {
         extendedPublicKeys: [
-          buildExtendedPublicKey(
-            evmExtendedPublicKey,
-            EVM_BASE_DERIVATION_PATH,
-          ),
-          buildExtendedPublicKey(
-            xpExtendedPublicKey,
-            AVALANCHE_BASE_DERIVATION_PATH,
+          buildExtendedPublicKey(evm, EVM_BASE_DERIVATION_PATH),
+          ...xpExtendedKeys.map(({ key, index }) =>
+            buildExtendedPublicKey(key, getAvalancheExtendedKeyPath(index)),
           ),
         ],
-        addressPublicKeys: keys,
+        addressPublicKeys: publicKeys,
       };
     },
-    [getExtendedPublicKey],
+    [getExtendedPublicKeys, derivationPathSpec],
   );
 
   const assertUniqueWallet = useCallback(
@@ -177,10 +147,7 @@ export const useLedgerBasePublicKeyFetcher: UseLedgerPublicKeyFetcher = (
   const retrieveKeys = useCallback(
     async (indexes: number[]) => {
       try {
-        const isLedgerLive = derivationPathSpec === DerivationPath.LedgerLive;
-        const keys = isLedgerLive
-          ? await getKeysDirectlyFromLedger(indexes)
-          : await getKeysFromExtendedPublicKeys(indexes);
+        const keys = await getPublicKeys(indexes);
 
         await assertUniqueWallet(keys);
 
@@ -191,13 +158,7 @@ export const useLedgerBasePublicKeyFetcher: UseLedgerPublicKeyFetcher = (
         throw err;
       }
     },
-    [
-      derivationPathSpec,
-      getKeysDirectlyFromLedger,
-      getKeysFromExtendedPublicKeys,
-      popDeviceSelection,
-      assertUniqueWallet,
-    ],
+    [getPublicKeys, popDeviceSelection, assertUniqueWallet],
   );
 
   // Attempt to automatically connect as soon as we establish the transport.

apps/next/src/components/ConnectLedger/LedgerConnector/hooks/useLedgerPublicKeyFetcher/useLedgerSolanaPublicKeyFetcher.ts

@@ -35,7 +35,13 @@ export const useLedgerSolanaPublicKeyFetcher: UseLedgerPublicKeyFetcher =
           'SVM',
         );
 
-        return buildAddressPublicKey(publicKey, 'SVM', accountIndex, 'ed25519');
+        return buildAddressPublicKey(
+          publicKey,
+          'SVM',
+          accountIndex,
+          'ed25519',
+          DerivationPath.LedgerLive,
+        );
       },
       [getPublicKey],
     );

apps/next/src/components/ConnectLedger/LedgerConnector/util/buildAddressPublicKey.ts

@@ -2,22 +2,21 @@ import { hex } from '@scure/base';
 import {
   DerivationPath,
   getAddressDerivationPath,
-  getSolanaDerivationPath,
 } from '@avalabs/core-wallets-sdk';
 import { VM } from '@avalabs/avalanchejs';
 import { AddressPublicKeyJson, Curve } from '@core/types';
 
-export const buildAddressPublicKey = (
+export function buildAddressPublicKey(
   key: Buffer,
   vm: VM | 'SVM',
   accountIndex: number,
   curve: Curve,
-): AddressPublicKeyJson => ({
-  curve,
-  derivationPath:
-    vm === 'SVM'
-      ? getSolanaDerivationPath(accountIndex)
-      : getAddressDerivationPath(accountIndex, DerivationPath.LedgerLive, vm),
-  type: 'address-pubkey',
-  key: hex.encode(Uint8Array.from(key)),
-});
+  pathSpec: DerivationPath,
+): AddressPublicKeyJson {
+  return {
+    curve,
+    derivationPath: getAddressDerivationPath(accountIndex, vm, { pathSpec }),
+    type: 'address-pubkey',
+    key: hex.encode(Uint8Array.from(key)),
+  };
+}

apps/next/src/components/ledger/LedgerIncorrectDevice/LedgerIncorrectDevice.tsx

@@ -0,0 +1,43 @@
+import { useTranslation } from 'react-i18next';
+import { FiAlertCircle } from 'react-icons/fi';
+import { FC, useEffect, useState } from 'react';
+import { Stack, Typography, useTheme } from '@avalabs/k2-alpine';
+
+import { useIsIncorrectDevice, useLedgerContext } from '@core/ui';
+
+import { Page } from '@/components/Page';
+import { SlideUpDialog } from '@/components/Dialog';
+
+export const LedgerIncorrectDevice: FC = () => {
+  const { t } = useTranslation();
+  const [isDialogOpen, setIsDialogOpen] = useState(false);
+  const { closeCurrentApp } = useLedgerContext();
+  const isIncorrectDevice = useIsIncorrectDevice();
+  const theme = useTheme();
+
+  useEffect(() => {
+    if (isIncorrectDevice) {
+      setIsDialogOpen(true);
+      closeCurrentApp();
+    }
+  }, [isIncorrectDevice, closeCurrentApp]);
+
+  return (
+    <SlideUpDialog open={isDialogOpen}>
+      <Page
+        title={t('Incorrect Ledger')}
+        withBackButton={false}
+        withViewSwitcher={false}
+      >
+        <Typography variant="body3">
+          {t(
+            'This Ledger was not used to create this wallet. Please connect the original Ledger device to continue.',
+          )}
+        </Typography>
+        <Stack sx={{ mt: '48px', mb: '16px' }}>
+          <FiAlertCircle color={theme.palette.error.main} />
+        </Stack>
+      </Page>
+    </SlideUpDialog>
+  );
+};

apps/next/src/components/ledger/LedgerIncorrectDevice/index.ts

@@ -0,0 +1 @@
+export * from './LedgerIncorrectDevice';

apps/next/src/components/ledger/index.ts

@@ -1 +1,2 @@
 export * from './LedgerRegisterBtcWalletPolicy';
+export * from './LedgerIncorrectDevice';