test(e2e): llm addfunction to get address from speculos

Author: cunhabruno

e2e/mobile/models/send.ts

@@ -31,10 +31,16 @@ export async function verifyAppValidationSendInfo(transaction: TransactionType,
   }
 
   if (currenciesForValidationRecipient.includes(currency)) {
+    if (!addressRecipient) {
+      throw new Error("Recipient address is not set");
+    }
     await app.deviceValidation.expectAddress(addressRecipient);
   }
 
   if (currenciesForValidationSender.includes(currency)) {
+    if (!addressSender) {
+      throw new Error("Sender address is not set");
+    }
     await app.deviceValidation.expectAddress(addressSender);
   }
 

e2e/mobile/models/stake.ts

@@ -80,7 +80,12 @@ export async function verifyStakeOperationDetailsInfo(
     await app.operationDetails.checkRecipientAsProvider(provider);
   }
   if (currenciesForSender.includes(currency)) {
-    await app.operationDetails.checkSender(delegation.account.address);
+    const address = delegation.account.address;
+    if (address) {
+      await app.operationDetails.checkSender(address);
+    } else {
+      throw new Error("Account address is undefined");
+    }
   }
   if (fees) {
     await app.operationDetails.checkFees(fees);

e2e/mobile/page/trade/operationDetails.page.ts

@@ -1,4 +1,4 @@
-import { getAccountAddress, Account } from "@ledgerhq/live-common/lib/e2e/enum/Account";
+import { Account } from "@ledgerhq/live-common/lib/e2e/enum/Account";
 
 export default class OperationDetailsPage {
   titleId = "operationDetails-title";
@@ -37,13 +37,12 @@ export default class OperationDetailsPage {
     await scrollToId(this.recipientId, this.operationDetailsScrollViewId);
     const recipientElement = getElementById(this.recipientId);
 
-    let expected: string;
-    if (await IsIdVisible(this.operationDetailsConfirmed)) {
-      expected = getAccountAddress(recipient);
+    const expected = recipient.address;
+    if (expected) {
+      await detoxExpect(recipientElement).toHaveText(expected);
     } else {
-      expected = recipient.address;
+      throw new Error("Recipient address is undefined");
     }
-    await detoxExpect(recipientElement).toHaveText(expected);
   }
 
   @Step("Check recipient as provider")

e2e/mobile/page/trade/receive.page.ts

@@ -108,10 +108,7 @@ export default class ReceivePage {
   }
 
   @Step("Verify address")
-  async verifyAddress(address: string | undefined): Promise<void> {
-    if (!address) {
-      throw new Error("Address is not set");
-    }
+  async verifyAddress(address: string): Promise<void> {
     await detoxExpect(getElementById(this.accountAddress)).toHaveText(address);
   }
 

e2e/mobile/specs/deposit/deposit.ts

@@ -17,16 +17,6 @@ const liveDataWithAddressCommand = (account: Account) => async (userdataPath?: s
     add: true,
     appjson: userdataPath,
   });
-
-  const { address } = await CLI.getAddress({
-    currency: account.currency.speculosApp.name,
-    path: account.accountPath,
-    derivationMode: account.derivationMode,
-  });
-
-  account.address = address;
-
-  return address;
 };
 
 setEnv("DISABLE_TRANSACTION_BROADCAST", true);
@@ -66,11 +56,13 @@ export async function runCreateNewAccountAndDepositTest(
       await app.receive.continueCreateAccount();
       await app.receive.selectDontVerifyAddress();
       await app.receive.selectReconfirmDontVerify();
+      const address = await CLI.getAddressForAccount(newAccount);
+
       await app.receive.expectReceivePageIsDisplayed(
         newAccount.currency.ticker,
         newAccount.accountName,
       );
-      await app.receive.verifyAddress(newAccount.address);
+      await app.receive.verifyAddress(address);
     });
   });
 }
@@ -162,7 +154,8 @@ export async function runDepositInExistingAccountTest(
       await app.receive.selectDontVerifyAddress();
       await app.receive.selectReconfirmDontVerify();
       await app.receive.expectReceivePageIsDisplayed(account.currency.ticker, account.accountName);
-      await app.receive.verifyAddress(account.address);
+      const address = await CLI.getAddressForAccount(account);
+      await app.receive.verifyAddress(address);
     });
   });
 }

e2e/mobile/specs/earn/earn.ts

@@ -87,7 +87,12 @@ export async function runStartETHStakingFromEarnDashboardTest(
         await beforeAllFunction({
           userdata: "skip-onboarding",
           speculosApp: account.currency.speculosApp,
-          cliCommands: [liveDataCommand(account.currency.speculosApp, account.index)],
+          cliCommands: [
+            liveDataCommand(account.currency.speculosApp, account.index),
+            async () => {
+              account.address = await CLI.getAddressForAccount(account);
+            },
+          ],
         });
       });
 

e2e/mobile/specs/send/send.ts

@@ -26,17 +26,14 @@ const beforeAllFunction = async (transaction: TransactionType) => {
           add: true,
           appjson: userdataPath,
         });
-
-        const { address } = await CLI.getAddress({
-          currency: transaction.accountToCredit.currency.speculosApp.name,
-          path: transaction.accountToCredit.accountPath,
-          derivationMode: transaction.accountToCredit.derivationMode,
-        });
-
-        transaction.accountToCredit.address = address;
-        transaction.recipientAddress = address;
-
-        return address;
+        transaction.accountToDebit.address = await CLI.getAddressForAccount(
+          transaction.accountToDebit,
+        );
+
+        transaction.accountToCredit.address = await CLI.getAddressForAccount(
+          transaction.accountToCredit,
+        );
+        transaction.recipientAddress = transaction.accountToCredit.address;
       },
     ],
   });
@@ -66,14 +63,9 @@ const beforeAllInvalidAddressFunction = async (
           transaction.accountToCredit.accountName !== Account.EMPTY.accountName &&
           transaction.accountToCredit.accountName !== Account.BTC_NATIVE_SEGWIT_1.accountName
         ) {
-          const { address } = await CLI.getAddress({
-            currency: transaction.accountToCredit.currency.id,
-            path: transaction.accountToCredit.accountPath,
-            derivationMode: transaction.accountToCredit.derivationMode,
-          });
-
-          transaction.accountToCredit.address = address;
-          return address;
+          transaction.accountToCredit.address = await CLI.getAddressForAccount(
+            transaction.accountToCredit,
+          );
         }
 
         if (overrideRecipient !== undefined) {

e2e/mobile/specs/subAccount/subAccount.ts

@@ -47,18 +47,16 @@ const beforeAllFunction = async (transaction: TransactionType, setAccountToCredi
                 add: true,
               });
 
-              const parentAccount = transaction.accountToCredit.parentAccount;
-              invariant(parentAccount, "Parent account is required");
+              const parentAccountToCredit = transaction.accountToCredit.parentAccount;
+              invariant(parentAccountToCredit, "Parent account to credit is required");
+              const parentAccountToDebit = transaction.accountToDebit.parentAccount;
+              invariant(parentAccountToDebit, "Parent account to debit is required");
 
-              const { address } = await CLI.getAddress({
-                currency: parentAccount.currency.id,
-                path: parentAccount.accountPath,
-                derivationMode: parentAccount.derivationMode,
-              });
-
-              transaction.accountToCredit.address = address;
+              transaction.accountToCredit.address = await CLI.getAddressForAccount(
+                transaction.accountToCredit,
+              );
 
-              return address;
+              parentAccountToDebit.address = await CLI.getAddressForAccount(parentAccountToDebit);
             },
           ]
         : []),

e2e/mobile/utils/cliUtils.ts

@@ -15,6 +15,7 @@ import {
   SpeculosHttpTransportOpts,
 } from "@ledgerhq/live-dmk-speculos";
 import { isRemoteIos } from "../helpers/commonHelpers";
+import { Account } from "@ledgerhq/live-common/e2e/enum/Account";
 
 export type LiveDataOpts = {
   currency: string;
@@ -263,4 +264,13 @@ export const CLI = {
       return JSON.parse(lastLine);
     });
   },
+  getAddressForAccount: async (account: Account) => {
+    const addressInfo = await CLI.getAddress({
+      currency: account.currency.speculosApp.name,
+      path: account.accountPath,
+      derivationMode: account.derivationMode,
+    });
+    account.address = addressInfo.address;
+    return addressInfo.address;
+  },
 };

libs/ledger-live-common/src/e2e/enum/Account.ts

@@ -1,9 +1,8 @@
+import { Addresses } from "./Addresses";
 import { Currency } from "./Currency";
 import { TokenType } from "./TokenType";
 
 export class Account {
-  public address?: string;
-
   constructor(
     public readonly currency: Currency,
     public readonly accountName: string,
@@ -13,6 +12,7 @@ export class Account {
     public readonly ensName?: string,
     public readonly derivationMode?: string,
     public readonly parentAccount?: Account,
+    public address?: string,
   ) {}
 
   static readonly ADA_1 = new Account(Currency.ADA, "Cardano 1", 0, "1852'/1815'/0'/0/3");
@@ -234,8 +234,19 @@ export class TokenAccount extends Account {
     parentAccount: Account,
     ensName?: string,
     derivationMode?: string,
+    address?: string,
   ) {
-    super(currency, accountName, index, path, tokenType, ensName, derivationMode, parentAccount);
+    super(
+      currency,
+      accountName,
+      index,
+      path,
+      tokenType,
+      ensName,
+      derivationMode,
+      parentAccount,
+      address,
+    );
   }
 
   static readonly ETH_LIDO = new TokenAccount(
@@ -281,6 +292,9 @@ export class TokenAccount extends Account {
     Account.SOL_1.accountPath,
     TokenType.SPL,
     Account.SOL_1,
+    undefined,
+    undefined,
+    Addresses.SOL_GIGA_1_ATA_ADDRESS,
   );
   static readonly SOL_GIGA_2 = new TokenAccount(
     Currency.SOL_GIGA,