Simplify the add ledger account message

alephium · Oct 14, 2024 · 6b37bd8 · 6b37bd8
1 parent 413e1db
commit 6b37bd8
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 43 deletions.
diff --git a/packages/extension/src/background/accountMessaging.ts b/packages/extension/src/background/accountMessaging.ts
@@ -91,9 +91,9 @@ export const handleAccountMessage: HandleMessage<AccountMessage> = async ({
         throw Error("you need an open session")
       }
 
-      const { account, hdIndex, networkId } = msg.data
+      const { account } = msg.data
       try {
-        const baseAccount = await wallet.importLedgerAccount(account, hdIndex, networkId)
+        const baseAccount = await wallet.importLedgerAccount(account)
         return sendMessageToUi({
           type: "ALPH_NEW_LEDGER_ACCOUNT_RES",
           data: {
@@ -105,7 +105,7 @@ export const handleAccountMessage: HandleMessage<AccountMessage> = async ({
 
         analytics.track("createAccount", {
           status: "failure",
-          networkId: networkId,
+          networkId: account.networkId,
           errorMessage: error,
         })
 

diff --git a/packages/extension/src/background/wallet.ts b/packages/extension/src/background/wallet.ts
@@ -258,19 +258,7 @@ export class Wallet extends AccountDiscovery {
     }
   }
 
-  public async importLedgerAccount(account: Account, hdIndex: number, networkId: string): Promise<BaseWalletAccount> {
-    const walletAccount: WalletAccount = {
-      address: account.address,
-      networkId: networkId,
-      signer: {
-        type: "ledger" as const,
-        publicKey: account.publicKey,
-        keyType: account.keyType,
-        derivationIndex: hdIndex,
-        group: groupOfAddress(account.address)
-      },
-      type: "alephium",
-    }
+  public async importLedgerAccount(walletAccount: WalletAccount): Promise<BaseWalletAccount> {
     await this.walletStore.push([walletAccount])
     await this.selectAccount(walletAccount)
     return walletAccount

diff --git a/packages/extension/src/shared/messages/AccountMessage.ts b/packages/extension/src/shared/messages/AccountMessage.ts
@@ -1,4 +1,4 @@
-import { KeyType, Account } from "@alephium/web3";
+import { KeyType } from "@alephium/web3";
 import {
   ArgentAccountType,
   BaseWalletAccount,
@@ -15,7 +15,7 @@ export type AccountMessage =
       }
     }
   | { type: "ALPH_NEW_ACCOUNT_REJ"; data: { error: string } }
-  | { type: "ALPH_NEW_LEDGER_ACCOUNT"; data: { account: Account; hdIndex: number, networkId: string } }
+  | { type: "ALPH_NEW_LEDGER_ACCOUNT"; data: { account: WalletAccount } }
   | {
       type: "ALPH_NEW_LEDGER_ACCOUNT_RES"
       data: {

diff --git a/packages/extension/src/ui/features/accounts/useAddAccount.ts b/packages/extension/src/ui/features/accounts/useAddAccount.ts
@@ -1,4 +1,4 @@
-import { KeyType, Account } from "@alephium/web3"
+import { KeyType } from "@alephium/web3"
 import { useCallback } from "react"
 import { useNavigate } from "react-router-dom"
 
@@ -7,6 +7,7 @@ import { getAccounts, selectAccount } from "../../services/backgroundAccounts"
 import { recover } from "../recovery/recovery.service"
 import { createAccount } from "./accounts.service"
 import { importNewLedgerAccount } from '../../services/backgroundAccounts'
+import { WalletAccount } from "../../../shared/wallet.model"
 
 export const useAddAccount = () => {
   const navigate = useNavigate()
@@ -22,10 +23,10 @@ export const useAddAccount = () => {
   return { addAccount }
 }
 
-export const addLedgerAccount = async (networkId: string, account: Account, hdIndex: number) => {
-  await importNewLedgerAccount(account, hdIndex, networkId)
+export const addLedgerAccount = async (account: WalletAccount) => {
+  await importNewLedgerAccount(account)
   // switch background wallet to the account that was selected
-  await selectAccount({ address: account.address, networkId: networkId })
+  await selectAccount({ address: account.address, networkId: account.networkId })
 }
 
 export const getAllLedgerAccounts = async (networkId: string) => {

diff --git a/packages/extension/src/ui/features/ledger/start.tsx b/packages/extension/src/ui/features/ledger/start.tsx
@@ -81,10 +81,10 @@ export const LedgerStartScreen: FC = () => {
 
             setDetecting(true)
             try {
-              const [account, hdIndex] = await LedgerAlephium
+              const account = await LedgerAlephium
                 .create()
                 .then((ledger) => ledger.createNewAccount(networkId, addressGroup, keyType ?? "default"))
-              addLedgerAccount(networkId, account, hdIndex)
+              addLedgerAccount(account)
               navigate(routes.ledgerDone())
             } catch (e) {
               console.error(e)

diff --git a/packages/extension/src/ui/features/ledger/utils.ts b/packages/extension/src/ui/features/ledger/utils.ts
@@ -69,12 +69,12 @@ export class LedgerAlephium extends AccountDiscovery {
     const existingLedgerAccounts = await getAllLedgerAccounts(networkId)
     var index = 0
     while (true) {
-      const [newAccount, hdIndex] = await this.getAccount(index, targetAddressGroup, keyType)
+      const newAccount = await this.deriveAccount(networkId, index, keyType, targetAddressGroup)
       if (existingLedgerAccounts.find((account) => account.address === newAccount.address) === undefined) {
         await this.app.close()
-        return [newAccount, hdIndex] as const
+        return newAccount
       }
-      index = hdIndex + 1
+      index = newAccount.signer.derivationIndex + 1
     }
   }
 
@@ -118,11 +118,3 @@ export class LedgerAlephium extends AccountDiscovery {
     return getNextPathIndex(indexes)
   }
 }
-
-const isAddressGroupMatched = (account: WalletAccount, targetAddressGroup: number | undefined) => {
-  if (targetAddressGroup === undefined) {
-    return true
-  } else {
-    return account.signer.group === targetAddressGroup
-  }
-}
diff --git a/packages/extension/src/ui/features/settings/DeveloperSettings.tsx b/packages/extension/src/ui/features/settings/DeveloperSettings.tsx
@@ -65,11 +65,7 @@ const DeveloperSettings: FC = () => {
       const result = await LedgerAlephium.create().then((ledger) => ledger.discoverActiveAccounts(currentNetwork.id))
       const discoveredAccounts = mapWalletAccountsToAccounts(result)
       for (const account of discoveredAccounts) {
-        await addLedgerAccount(
-          currentNetwork.id,
-          { keyType: account.signer.keyType, address: account.address, group: account.signer.group, publicKey: account.signer.publicKey },
-          account.signer.derivationIndex
-        )
+        await addLedgerAccount(account)
         setAccountName(account.networkId, account.address, getDefaultAccountNameByIndex(account, accountIndex))
         accountIndex++
       }

diff --git a/packages/extension/src/ui/services/backgroundAccounts.ts b/packages/extension/src/ui/services/backgroundAccounts.ts
@@ -1,4 +1,4 @@
-import { KeyType, Account } from "@alephium/web3"
+import { KeyType } from "@alephium/web3"
 import { sendMessage, waitForMessage } from "../../shared/messages"
 import {
   ArgentAccountType,
@@ -33,8 +33,8 @@ export const discoverAccounts = async (networkId: string) => {
   }
 }
 
-export const importNewLedgerAccount = async (account: Account, hdIndex: number, networkId: string) => {
-  sendMessage({ type: "ALPH_NEW_LEDGER_ACCOUNT", data: { account, hdIndex, networkId } })
+export const importNewLedgerAccount = async (account: WalletAccount) => {
+  sendMessage({ type: "ALPH_NEW_LEDGER_ACCOUNT", data: { account } })
   try {
     return await Promise.race([
       waitForMessage("ALPH_NEW_LEDGER_ACCOUNT_RES"),