🏗️ adding findLatestAppCandidate function to have the latest app vers…

…ion + latest firmware version
LedgerHQ · Jul 25, 2024 · 0809ef2 · 0809ef2
1 parent 052bdba
commit 0809ef2
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/apps/ledger-live-desktop/tests/utils/speculos.ts b/apps/ledger-live-desktop/tests/utils/speculos.ts
@@ -4,7 +4,7 @@ import {
   listAppCandidates,
   createSpeculosDevice,
   releaseSpeculosDevice,
-  findAppCandidate,
+  findLatestAppCandidate,
   SpeculosTransport,
 } from "@ledgerhq/live-common/load/speculos";
 import { SpeculosDevice } from "@ledgerhq/speculos-transport";
@@ -202,7 +202,7 @@ export async function startSpeculos(
   }
 
   const { appQuery, dependency, onSpeculosDeviceCreated } = spec;
-  const appCandidate = findAppCandidate(appCandidates, appQuery);
+  const appCandidate = findLatestAppCandidate(appCandidates, appQuery);
   if (!appCandidate) {
     console.warn("no app found for " + testName);
     console.warn(appQuery);

diff --git a/libs/ledger-live-common/src/load/speculos.ts b/libs/ledger-live-common/src/load/speculos.ts
@@ -123,6 +123,20 @@ export function appCandidatesMatches(appCandidate: AppCandidate, search: AppSear
       (search.appVersion && semver.satisfies(appCandidate.appVersion, search.appVersion)))
   );
 }
+
+export const findLatestAppCandidate = (
+  appCandidates: AppCandidate[],
+  search: AppSearch,
+): AppCandidate | null => {
+  let apps = appCandidates.filter(c => appCandidatesMatches(c, search));
+  if (apps.length === 0) {
+    return null;
+  }
+
+  apps = apps.sort((a, b) => semver.rcompare(a.appVersion, b.appVersion));
+  return apps[0];
+};
+
 export const findAppCandidate = (
   appCandidates: AppCandidate[],
   search: AppSearch,