Merge pull request #6675 from LedgerHQ/bugfix/LIVE-11763

[LIVE-11763][LLM][Stax] Infinite install during OS update

.changeset/thick-dolls-sing.md

@@ -0,0 +1,6 @@
+---
+"live-mobile": patch
+"@ledgerhq/live-common": patch
+---
+
+Fix infinit loop bug in LLM

apps/ledger-live-mobile/src/screens/FirmwareUpdate/index.tsx

@@ -81,13 +81,11 @@ export type FirmwareUpdateProps = {
   device: Device;
   deviceInfo: DeviceInfo;
   firmwareUpdateContext: FirmwareUpdateContext;
-
   /**
    * To adapt the firmware update in case the device is starting its onboarding and it's normal it is not yet seeded.
    * If set to true, short-circuit some steps that are unnecessary
    */
   isBeforeOnboarding?: boolean;
-
   /**
    * Called when the user leaves the firmware update screen
    *
@@ -97,9 +95,8 @@ export type FirmwareUpdateProps = {
    *
    * @param updateState The current state of the update when the user leaves the screen
    */
-  onBackFromUpdate?: (updateState: UpdateStep) => void;
-
-  updateFirmwareAction?: (args: updateFirmwareActionArgs) => Observable<UpdateFirmwareActionState>;
+  onBackFromUpdate?(updateState: UpdateStep): void;
+  updateFirmwareAction?(args: updateFirmwareActionArgs): Observable<UpdateFirmwareActionState>;
 };
 
 type NavigationProps = RootComposite<
@@ -332,6 +329,9 @@ export const FirmwareUpdate = ({
     deviceInfo.languageId,
   ]);
 
+  // this will depend on the steps we go through during the update
+  const [totalNumberOfSteps, setTotalNumberOfSteps] = useState(2);
+
   const defaultSteps: UpdateSteps = useMemo(
     () => ({
       prepareUpdate: {
@@ -386,7 +386,7 @@ export const FirmwareUpdate = ({
         ),
       },
     }),
-    [t, isBeforeOnboarding, productName, restoreSteps],
+    [isBeforeOnboarding, t, productName, restoreSteps],
   );
 
   useEffect(() => {
@@ -460,10 +460,7 @@ export const FirmwareUpdate = ({
     });
   }, [navigation, quitUpdate, isAllowedToClose]);
 
-  // this will depend on the steps we go through during the update
-  const [totalNumberOfSteps, setTotalNumberOfSteps] = useState(2);
-
-  const steps = useMemo(() => {
+  const steps: Item[] = useMemo(() => {
     const newSteps: UpdateSteps = {
       prepareUpdate: { ...defaultSteps.prepareUpdate },
       installUpdate: { ...defaultSteps.installUpdate },
@@ -868,11 +865,10 @@ export const FirmwareUpdate = ({
   );
 };
 
-const FirmwareUpdateScreen = ({ route }: NavigationProps) => {
-  const { params } = route;
-
-  if (!params.device || !params.firmwareUpdateContext || !params.deviceInfo) return null;
-
+export default function FirmwareUpdateScreen({ route: { params } }: NavigationProps) {
+  if (!params.device || !params.firmwareUpdateContext || !params.deviceInfo) {
+    return null;
+  }
   return (
     <Flex flex={1}>
       <FirmwareUpdate
@@ -884,6 +880,4 @@ const FirmwareUpdateScreen = ({ route }: NavigationProps) => {
       />
     </Flex>
   );
-};
-
-export default FirmwareUpdateScreen;
+}

apps/ledger-live-mobile/src/screens/FirmwareUpdate/useUpdateFirmwareAndRestoreSettings.ts

@@ -61,7 +61,7 @@ export const userSolvableErrorClasses: Array<CustomErrorClassType | TransportSta
 export type FirmwareUpdateParams = {
   device: Device;
   deviceInfo: DeviceInfo;
-  updateFirmwareAction?: (args: updateFirmwareActionArgs) => Observable<UpdateFirmwareActionState>;
+  updateFirmwareAction?(args: updateFirmwareActionArgs): Observable<UpdateFirmwareActionState>;
   isBeforeOnboarding?: boolean;
 };
 
@@ -121,7 +121,7 @@ export const useUpdateFirmwareAndRestoreSettings = ({
     staxFetchImageRequest,
   );
 
-  const { triggerUpdate, updateState: updateActionState } = useUpdateFirmware({
+  const { updateState: updateActionState, triggerUpdate } = useUpdateFirmware({
     deviceId: device?.deviceId ?? "",
     updateFirmwareAction,
   });

libs/ledger-live-common/src/deviceSDK/hooks/useUpdateFirmware.ts

@@ -9,8 +9,8 @@ import { bufferTime, filter, map } from "rxjs/operators";
 const STATE_UPDATE_THROTTLE = 500;
 
 export type UseUpdateFirmwareArgs = {
-  updateFirmwareAction?: typeof defaultUpdateFirmwareAction;
   deviceId: string;
+  updateFirmwareAction?: typeof defaultUpdateFirmwareAction;
 };
 
 /**
@@ -20,13 +20,13 @@ export type UseUpdateFirmwareArgs = {
  * @param Args Object containing the arguments of the hook: a deviceId and an optional device action to used (useful for mocking)
  * @returns An object containing the current state of the update and the trigger update function
  */
-export const useUpdateFirmware = ({
-  updateFirmwareAction = defaultUpdateFirmwareAction,
+export function useUpdateFirmware({
   deviceId,
+  updateFirmwareAction = defaultUpdateFirmwareAction,
 }: UseUpdateFirmwareArgs): {
   updateState: UpdateFirmwareActionState;
   triggerUpdate: () => void;
-} => {
+} {
   const [updateState, setUpdateState] = useState<UpdateFirmwareActionState>(initialState);
   const [nonce, setNonce] = useState(0);
 
@@ -43,7 +43,9 @@ export const useUpdateFirmware = ({
           filter(e => e !== undefined),
         )
         .subscribe({
-          next: state => setUpdateState(state),
+          next: (state: UpdateFirmwareActionState) => {
+            setUpdateState(state);
+          },
         });
 
       return () => {
@@ -58,4 +60,4 @@ export const useUpdateFirmware = ({
   }, []);
 
   return { updateState, triggerUpdate };
-};
+}

libs/ledger-live-common/src/deviceSDK/tasks/getDeviceInfo.ts

@@ -85,7 +85,7 @@ export const parseDeviceInfo = (firmwareInfo: FirmwareInfo): DeviceInfo => {
 
   const isOSU = rawVersion.includes("-osu");
   const version = rawVersion.replace("-osu", "");
-  const m = rawVersion.match(/([0-9]+.[0-9]+)(.[0-9]+)?(-(.*))?/);
+  const m = rawVersion.match(/([0-9]+.[0-9]+(.[0-9]+){0,1})?(-(.*))?/);
   const [, majMin, , , postDash] = m || [];
   const providerName = PROVIDERS[postDash] ? postDash : null;
   const flag = flags.length > 0 ? flags[0] : 0;

libs/ledger-live-common/src/deviceSDK/tasks/updateFirmware.test.ts

@@ -2,20 +2,20 @@ import { getFlashMcuOrBootloaderDetails } from "./updateFirmware";
 
 test("getFlashMcuOrBootloaderDetails", () => {
   // MCU Update
-  expect(getFlashMcuOrBootloaderDetails("1.91", "1.91")).toEqual({
-    bootloaderVersion: "1.91",
+  expect(getFlashMcuOrBootloaderDetails("1.91.0", "1.91.0")).toEqual({
+    bootloaderVersion: "1.91.0",
     isMcuUpdate: true,
   });
 
   // Bootloader Update
-  expect(getFlashMcuOrBootloaderDetails("1.90", "1.91")).toEqual({
-    bootloaderVersion: "1.91",
+  expect(getFlashMcuOrBootloaderDetails("1.90.1", "1.91.0")).toEqual({
+    bootloaderVersion: "1.91.0",
     isMcuUpdate: false,
   });
 
   // Bootloader version majMin formatting
-  expect(getFlashMcuOrBootloaderDetails("1.90", "1.91.whatever-it-doesnt-matter")).toEqual({
-    bootloaderVersion: "1.91",
+  expect(getFlashMcuOrBootloaderDetails("1.90.1", "1.91.0.whatever-it-doesnt-matter")).toEqual({
+    bootloaderVersion: "1.91.0",
     isMcuUpdate: false,
   });
 });

libs/ledger-live-common/src/deviceSDK/tasks/updateFirmware.ts

@@ -187,10 +187,8 @@ export function getFlashMcuOrBootloaderDetails(
   mcuFromBootloaderVersion: string,
 ): { bootloaderVersion: string; isMcuUpdate: boolean } {
   // converts the version into the majMin format
-  const bootloaderVersion = (mcuFromBootloaderVersion || "").split(".").slice(0, 2).join(".");
-
+  const bootloaderVersion = (mcuFromBootloaderVersion ?? "").split(".").slice(0, 3).join(".");
   const isMcuUpdate = deviceMajMin === bootloaderVersion;
-
   return { bootloaderVersion, isMcuUpdate };
 }
 
@@ -227,14 +225,14 @@ const flashMcuOrBootloader = (
 
     ManagerAPI.retrieveMcuVersion(updateContext.final).then(mcuVersion => {
       if (mcuVersion && !subscriber.closed) {
-        const majMinRegexMatch = firmwareInfo.rawVersion.match(/([0-9]+.[0-9]+)(.[0-9]+)?(-(.*))?/);
+        const majMinRegexMatch = firmwareInfo.rawVersion.match(
+          /([0-9]+.[0-9]+(.[0-9]+){0,1})?(-(.*))?/,
+        );
         const [, majMin] = majMinRegexMatch ?? [];
-
         const { bootloaderVersion, isMcuUpdate } = getFlashMcuOrBootloaderDetails(
           majMin,
           mcuVersion.from_bootloader_version,
         );
-
         flashMcuOrBootloaderCommand(transportRef.current, {
           targetId: firmwareInfo.targetId,
           version: isMcuUpdate ? mcuVersion.name : bootloaderVersion,

libs/ledger-live-common/src/hw/getDeviceInfo.ts

@@ -9,9 +9,11 @@ import { PROVIDERS } from "../manager/provider";
 import { isDashboardName } from "./isDashboardName";
 import { DeviceNotOnboarded } from "../errors";
 import type { DeviceInfo } from "@ledgerhq/types-live";
+
 const ManagerAllowedFlag = 0x08;
 const PinValidatedFlag = 0x80;
-export default async function getDeviceInfo(transport: Transport): Promise<DeviceInfo> {
+
+export default async function (transport: Transport): Promise<DeviceInfo> {
   const tracer = new LocalTracer("hw", {
     ...transport.getTraceContext(),
     function: "getDeviceInfo",