Merge branch 'develop' of github.com:LedgerHQ/ledger-live into feat/s…

…upport-app-install
LedgerHQ · Nov 21, 2024 · 4000bdb · 4000bdb
2 parents b9bf19b + d347e83
commit 4000bdb
Show file tree

Hide file tree

Showing 26 changed files with 368 additions and 17,955 deletions.
diff --git a/.changeset/eighty-dryers-hide.md b/.changeset/eighty-dryers-hide.md
@@ -0,0 +1,5 @@
+---
+"@ledgerhq/coin-framework": minor
+---
+
+feat: scanAccount handle scheme arg
diff --git a/.changeset/kind-masks-unite.md b/.changeset/kind-masks-unite.md
@@ -0,0 +1,7 @@
+---
+"@ledgerhq/coin-polkadot": minor
+"@ledgerhq/coin-evm": minor
+"@ledgerhq/coin-tester": minor
+---
+
+Coin-tester clean up. Fixing italian typo (sorry pasta bros), fixing Polkadot coin-tester log noise & docker-compose.
diff --git a/apps/ledger-live-desktop/tests/enum/Account.ts b/apps/ledger-live-desktop/tests/enum/Account.ts
@@ -9,6 +9,7 @@ export class Account {
     public readonly accountType?: AccountType,
     public readonly index?: number,
     public readonly ensName?: string,
+    public readonly derivationMode?: string,
   ) {}
 
   static readonly BTC_NATIVE_SEGWIT_1 = new Account(
@@ -17,6 +18,8 @@ export class Account {
     "bc1qm4mm7usmutz9sryheuytjpzj0yuy83pkg49qzk",
     undefined,
     0,
+    undefined,
+    "native_segwit",
   );
 
   static readonly BTC_NATIVE_SEGWIT_2 = new Account(
@@ -25,67 +28,81 @@ export class Account {
     "bc1q7ezsfc44adw2gyzqjmwhuh2e83uk8u5hrw590r",
     undefined,
     1,
+    undefined,
+    "native_segwit",
   );
 
   static readonly BTC_LEGACY_1 = new Account(
     Currency.BTC,
-    "Bitcoin Legacy 1",
+    "Bitcoin 1",
     "1FMx2XwRHKXhbJcaekgPqN111wtRftkHyw",
     undefined,
     0,
+    undefined,
+    "",
   );
 
   static readonly BTC_LEGACY_2 = new Account(
     Currency.BTC,
-    "Bitcoin Legacy 2",
+    "Bitcoin 2",
     "1Nen8hLiZysV6TWi6o6hTBp6dtkRXrJyWh",
     undefined,
     1,
+    undefined,
+    "",
   );
 
   static readonly BTC_SEGWIT_1 = new Account(
     Currency.BTC,
-    "Bitcoin Segwit 1",
+    "Bitcoin 1",
     "3C7fQ47BiZuZN7V2WTgHLq4sqpb5BEp91i",
     undefined,
     0,
+    undefined,
+    "segwit",
   );
 
   static readonly BTC_SEGWIT_2 = new Account(
     Currency.BTC,
-    "Bitcoin Segwit 2",
+    "Bitcoin 2",
     "3B5psxZfUkU6AzPJoirgPQS7dC9vv7ohcK",
     undefined,
     1,
+    undefined,
+    "segwit",
   );
 
   static readonly BTC_TAPROOT_1 = new Account(
     Currency.BTC,
-    "Bitcoin Taproot 1",
+    "Bitcoin 1",
     "bc1pv4aytu7u4pk4nvelymxp65vndxqh4e3xsn0v7cguy6t98k5vynks5td23j",
     undefined,
     0,
+    undefined,
+    "taproot",
   );
 
   static readonly BTC_TAPROOT_2 = new Account(
     Currency.BTC,
-    "Bitcoin Taproot 2",
+    "Bitcoin 2",
     "bc1pywrw64mkvpzxkje5fkcz7vafj03yyzyvx4vg8wy2klvq8wtyfe7sq2jgzd",
     undefined,
     1,
+    undefined,
+    "taproot",
   );
 
   static readonly tBTC_1 = new Account(
     Currency.tBTC,
-    "Bitcoin Testnet 1",
+    "Bitcoin 1",
     "tb1qxmwe6n93fls8r69837cmyt6ua406xaen9hy24d",
     undefined,
     0,
   );
 
   static readonly tBTC_2 = new Account(
     Currency.tBTC,
-    "Bitcoin Testnet 2",
+    "Bitcoin 2",
     "tb1qyjr6hsx3wvsdq998zvn5cusqkdyfvvnpnsz6a5",
     undefined,
     1,

diff --git a/apps/ledger-live-desktop/tests/specs/speculos/send.tx.spec.ts b/apps/ledger-live-desktop/tests/specs/speculos/send.tx.spec.ts
@@ -507,11 +507,24 @@ test.describe("Verify send max user flow", () => {
 for (const transaction of transactionAddressValid) {
   test.describe("Send funds step 1 (Recipient) - positive cases (Button enabled)", () => {
     test.use({
-      userdata: "speculos-checkSendAddress", //todo: Replace by cli when issue with derivation is fix - LIVE-14599
+      userdata: "skip-onboarding",
+      speculosApp: transaction.transaction.accountToDebit.currency.speculosApp,
+      cliCommands: [
+        {
+          command: commandCLI.liveData,
+          args: {
+            currency: transaction.transaction.accountToDebit.currency.currencyId,
+            index: transaction.transaction.accountToDebit.index,
+            scheme: transaction.transaction.accountToDebit.derivationMode,
+            add: true,
+            appjson: "",
+          },
+        },
+      ],
     });
 
     test(
-      `Check button enabled (${transaction.transaction.amount} from ${transaction.transaction.accountToDebit.accountName} to ${transaction.transaction.accountToCredit.accountName}) - valid address input`,
+      `Check button enabled (${transaction.transaction.amount} from ${transaction.transaction.accountToDebit.accountName} to ${transaction.transaction.accountToCredit.accountName}) - valid address input (${transaction.transaction.accountToDebit.address})`,
       {
         annotation: {
           type: "TMS",

diff --git a/apps/ledger-live-desktop/tests/specs/speculos/swap.spec.ts b/apps/ledger-live-desktop/tests/specs/speculos/swap.spec.ts
@@ -406,7 +406,7 @@ for (const { swap, xrayTicket } of tooLowAmountForQuoteSwaps) {
           await app.swap.verifySwapAmountErrorMessageIsDisplayed(
             electronApp,
             swap.accountToDebit,
-            "No quotes available.",
+            "Not enough balance, including network fee.",
           );
         }
       },