@onekeyfe/hd-core 1.2.0-alpha.183 → 1.2.0-alpha.185

package/src/data/messages/messages-protocol-v2.json

@@ -446,6 +446,9 @@
         "MessageType_DeviceCertificateSignature": 60423,
         "MessageType_DeviceCertificateSign": 60424,
         "MessageType_DeviceMiscUsbMscControl": 60440,
+        "MessageType_DeviceFindMyTokenState": 60450,
+        "MessageType_DeviceFindMyTokenUpdate": 60451,
+        "MessageType_DeviceFindMyTokenStateGet": 60452,
         "MessageType_DeviceInfoGet": 60600,
         "MessageType_DeviceInfo": 60601,
         "MessageType_DeviceStatusGet": 60602,
@@ -5404,6 +5407,10 @@
         "request_id": {
           "type": "bytes",
           "id": 5
+        },
+        "source_fingerprint": {
+          "type": "uint32",
+          "id": 6
         }
       }
     },
@@ -5539,6 +5546,14 @@
         "tx_type": {
           "type": "uint32",
           "id": 10
+        },
+        "expected_address": {
+          "type": "bytes",
+          "id": 12
+        },
+        "source_fingerprint": {
+          "type": "uint32",
+          "id": 13
         }
       }
     },
@@ -5619,6 +5634,14 @@
           "rule": "repeated",
           "type": "EthereumAccessListOneKey",
           "id": 11
+        },
+        "expected_address": {
+          "type": "bytes",
+          "id": 12
+        },
+        "source_fingerprint": {
+          "type": "uint32",
+          "id": 13
         }
       }
     },
@@ -5795,6 +5818,10 @@
         "chain_id": {
           "type": "uint64",
           "id": 3
+        },
+        "source_fingerprint": {
+          "type": "uint32",
+          "id": 4
         }
       }
     },
@@ -9474,6 +9501,10 @@
           "rule": "required",
           "type": "bytes",
           "id": 2
+        },
+        "source_fingerprint": {
+          "type": "uint32",
+          "id": 3
         }
       }
     },
@@ -9518,6 +9549,10 @@
         "application_domain": {
           "type": "bytes",
           "id": 5
+        },
+        "source_fingerprint": {
+          "type": "uint32",
+          "id": 6
         }
       }
     },
@@ -9535,6 +9570,10 @@
           "rule": "required",
           "type": "bytes",
           "id": 2
+        },
+        "source_fingerprint": {
+          "type": "uint32",
+          "id": 3
         }
       }
     },
@@ -11764,6 +11803,27 @@
         }
       }
     },
+    "DeviceFindMyTokenUpdate": {
+      "fields": {
+        "token": {
+          "rule": "required",
+          "type": "bytes",
+          "id": 1
+        }
+      }
+    },
+    "DeviceFindMyTokenStateGet": {
+      "fields": {}
+    },
+    "DeviceFindMyTokenState": {
+      "fields": {
+        "burned": {
+          "rule": "required",
+          "type": "bool",
+          "id": 1
+        }
+      }
+    },
     "DeviceFactoryAck": {
       "values": {
         "FACTORY_ACK_SUCCESS": 0,
@@ -11893,6 +11953,13 @@
         "FW_MGMT_UPDATER_TASK_STATUS_FAILED_ENTRY_OUT_OF_BOUNDS": 10
       }
     },
+    "DeviceFirmwareUpdatePhase": {
+      "values": {
+        "FW_MGMT_UPDATER_PHASE_PREPARE": 0,
+        "FW_MGMT_UPDATER_PHASE_INSTALL": 1,
+        "FW_MGMT_UPDATER_PHASE_VERIFY": 2
+      }
+    },
     "DeviceFirmwareTarget": {
       "fields": {
         "target_id": {
@@ -11917,7 +11984,26 @@
       }
     },
     "DeviceFirmwareUpdateRequest": {
-      "fields": {}
+      "fields": {
+        "reboot_after_update": {
+          "type": "bool",
+          "id": 1
+        }
+      }
+    },
+    "DeviceFirmwareUpdatePhaseInfo": {
+      "fields": {
+        "phase": {
+          "rule": "required",
+          "type": "DeviceFirmwareUpdatePhase",
+          "id": 1
+        },
+        "progress_percent": {
+          "rule": "required",
+          "type": "uint32",
+          "id": 2
+        }
+      }
     },
     "DeviceFirmwareUpdateRecord": {
       "fields": {
@@ -11930,6 +12016,14 @@
           "type": "DeviceFirmwareUpdateTaskStatus",
           "id": 10
         },
+        "progress_percent": {
+          "type": "uint32",
+          "id": 11
+        },
+        "phase_info": {
+          "type": "DeviceFirmwareUpdatePhaseInfo",
+          "id": 12
+        },
         "payload_version": {
           "type": "uint32",
           "id": 20
@@ -11946,6 +12040,14 @@
           "type": "bool",
           "id": 10
         },
+        "progress_percent": {
+          "type": "bool",
+          "id": 11
+        },
+        "phase_info": {
+          "type": "bool",
+          "id": 12
+        },
         "payload_version": {
           "type": "bool",
           "id": 20
@@ -12713,6 +12815,10 @@
         "text_id": {
           "type": "uint32",
           "id": 3
+        },
+        "text_arg": {
+          "type": "string",
+          "id": 4
         }
       }
     },
@@ -12780,6 +12886,10 @@
         "title_id": {
           "type": "uint32",
           "id": 8
+        },
+        "title_arg": {
+          "type": "string",
+          "id": 9
         }
       }
     },

package/src/device/Device.ts

@@ -2005,7 +2005,8 @@ export class Device extends EventEmitter {
     passphraseState?: string,
     useEmptyPassphrase?: boolean,
     skipPassphraseCheck?: boolean,
-    deriveCardano?: boolean
+    deriveCardano?: boolean,
+    mainPinSelected?: boolean
   ) {
     if (this.isUnacquired()) return false;
 
@@ -2016,6 +2017,7 @@ export class Device extends EventEmitter {
         onlyMainPin: useEmptyPassphrase,
         deriveCardano,
         rejectAttachPinForMainWallet: useEmptyPassphrase === true,
+        mainPinSelected,
       });
 
     // Main wallet and unlock Attach Pin, throw safe error

package/src/events/ui-request.ts

@@ -189,6 +189,9 @@ export interface FirmwareProgress {
     totalBytes?: number;
     rateBytesPerSecond?: number;
     elapsedMs?: number;
+    installTargetId?: number;
+    installPhase?: 'prepare' | 'install' | 'verify';
+    installPhaseProgress?: number;
   };
 }
 

package/src/protocols/protocol-v2/unlockPolicyRunner.ts

@@ -14,10 +14,14 @@ const Log = getLogger(LoggerNames.Core);
 
 export type ProtocolV2UnlockContext = {
   preflightCompleted: boolean;
+  preflightStatusRefreshed?: boolean;
+  preflightMainPinSelected?: boolean;
 };
 
 export const createProtocolV2UnlockContext = (): ProtocolV2UnlockContext => ({
   preflightCompleted: false,
+  preflightStatusRefreshed: false,
+  preflightMainPinSelected: false,
 });
 
 type RunnableMethod = Pick<
@@ -100,11 +104,12 @@ export async function runMethodWithUnlockPolicy<T = unknown>(
     await afterStatusBeforeUnlock?.();
 
     if (!status.unlocked) {
+      const preUnlockPinType = resolvePreUnlockPinType(method);
       const unlockInteraction: HardwareUiInteractionMeta | undefined = shouldCoordinateUi
         ? uiCoordinator.enterUnlockInteraction(method.name)
         : undefined;
       const unlockedStatus = await device.unlockDevice(
-        resolvePreUnlockPinType(method),
+        preUnlockPinType,
         shouldCoordinateUi
           ? { emitUiEvent: false, interaction: unlockInteraction }
           : {
@@ -120,9 +125,11 @@ export async function runMethodWithUnlockPolicy<T = unknown>(
           'Protocol V2 device remained locked after the unlock flow.'
         );
       }
+      context.preflightMainPinSelected = preUnlockPinType === DeviceSessionPinType.Main;
       Log.debug('Protocol V2 pre-unlock completed', { method: method.name });
     }
 
+    context.preflightStatusRefreshed = true;
     context.preflightCompleted = true;
   }
 

package/src/protocols/protocol-v2/walletSession.ts

@@ -83,15 +83,21 @@ const buildDeviceSessionGetRequest = ({
         ],
 });
 
-const askDevicePassphrase = async (device: Device, requestPayload: DeviceSessionAskPassphrase) => {
+const askDevicePassphrase = async (
+  device: Device,
+  requestPayload: DeviceSessionAskPassphrase,
+  onStatusRefreshed?: () => void
+) => {
   await device.commands.typedCall('DeviceSessionAskPassphrase', 'Success', requestPayload);
   await refreshProtocolV2DeviceStatus(device);
+  onStatusRefreshed?.();
 };
 
 const selectDeviceSession = async (
   device: Device,
   expectedPassphraseState?: string,
-  deriveCardano?: boolean
+  deriveCardano?: boolean,
+  onStatusRefreshed?: () => void
 ) => {
   const existsAttachPinUser = device.features?.attachToPinEnabled === true;
   const metadata = {
@@ -153,14 +159,19 @@ const selectDeviceSession = async (
       emitUiEvent: false,
       interaction: attachPinInteraction,
     });
+    onStatusRefreshed?.();
     return getDeviceSession(device, buildDeviceSessionGetRequest({ deriveCardano }));
   }
 
   if (hasHostPassphrase) {
-    await askDevicePassphrase(device, {
-      passphrase: hostPassphrase,
-      on_device: false,
-    });
+    await askDevicePassphrase(
+      device,
+      {
+        passphrase: hostPassphrase,
+        on_device: false,
+      },
+      onStatusRefreshed
+    );
     return getDeviceSession(device, buildDeviceSessionGetRequest({ deriveCardano }));
   }
 
@@ -172,7 +183,7 @@ const selectDeviceSession = async (
     ...metadata,
     ...(passphraseOnDeviceInteraction ? { interaction: passphraseOnDeviceInteraction } : {}),
   });
-  await askDevicePassphrase(device, { on_device: true });
+  await askDevicePassphrase(device, { on_device: true }, onStatusRefreshed);
   return getDeviceSession(device, buildDeviceSessionGetRequest({ deriveCardano }));
 };
 
@@ -191,6 +202,8 @@ export async function getProtocolV2WalletSession(
     deriveCardano?: boolean;
     /** Read the wallet already selected by Attach PIN without reopening wallet selection. */
     readCurrentAttachPinSession?: boolean;
+    /** The current call already selected the Main PIN during its unlock preflight. */
+    mainPinSelected?: boolean;
   }
 ) {
   const forceWalletSelection =
@@ -227,10 +240,16 @@ export async function getProtocolV2WalletSession(
       : undefined;
   let response;
   let resumed = false;
-  let mainPinSelected =
-    options?.onlyMainPin === true &&
-    device.features?.unlocked === true &&
-    device.features?.unlockedAttachPin === false;
+  let walletStatusRefreshed = false;
+  const markWalletStatusRefreshed = () => {
+    walletStatusRefreshed = true;
+  };
+  let mainPinAuthenticated =
+    options?.mainPinSelected === true ||
+    (options?.onlyMainPin === true &&
+      device.features?.unlocked === true &&
+      device.features?.unlockedAttachPin === false);
+  let standardWalletSelected = options?.mainPinSelected === true;
 
   const clearCurrentWalletSession = () => {
     if (options?.onlyMainPin) {
@@ -242,6 +261,7 @@ export async function getProtocolV2WalletSession(
 
   const rejectMismatchedAttachPinWallet = async () => {
     const features = await refreshProtocolV2DeviceStatus(device);
+    markWalletStatusRefreshed();
     if (features.unlockedAttachPin !== true) {
       return;
     }
@@ -265,30 +285,42 @@ export async function getProtocolV2WalletSession(
   }
 
   const selectMainPin = async (force = false) => {
-    if (force || !mainPinSelected) {
+    if (force || !mainPinAuthenticated) {
       await device.unlockDevice(DeviceSessionPinType.Main, {
         source: 'wallet-session-coordinator',
         reason: expectedPassphraseState ? 'session-recovery' : 'open-wallet',
         deviceOnly: true,
       });
-      mainPinSelected = true;
+      markWalletStatusRefreshed();
+      mainPinAuthenticated = true;
+      standardWalletSelected = true;
     }
   };
 
   const selectStandardWallet = async () => {
-    // Main PIN authenticates the device; an empty host passphrase selects the standard derivation.
-    await selectMainPin();
     if (device.features?.passphraseProtection === true) {
-      await askDevicePassphrase(device, {
-        passphrase: '',
-        on_device: false,
-      });
+      // Main PIN authenticates the device; an empty host passphrase selects the standard derivation.
+      await selectMainPin();
+      await askDevicePassphrase(
+        device,
+        {
+          passphrase: '',
+          on_device: false,
+        },
+        markWalletStatusRefreshed
+      );
+      standardWalletSelected = true;
+    } else if (!standardWalletSelected) {
+      // Without passphrase protection there is no empty-passphrase selector.
+      // Main PIN selection is the only authoritative switch back to the standard wallet.
+      await selectMainPin(true);
     }
   };
 
   if (readCurrentAttachPinSession) {
     const status = await requestProtocolV2DeviceStatus(device);
     device.updateProtocolV2Status(status);
+    markWalletStatusRefreshed();
     if (
       status.unlocked !== true ||
       status.passphrase_enabled !== true ||
@@ -372,7 +404,12 @@ export async function getProtocolV2WalletSession(
       device.clearInternalState();
       throw ERRORS.TypedError(HardwareErrorCode.WalletSessionInvalid);
     }
-    response = await selectDeviceSession(device, expectedPassphraseState, options?.deriveCardano);
+    response = await selectDeviceSession(
+      device,
+      expectedPassphraseState,
+      options?.deriveCardano,
+      markWalletStatusRefreshed
+    );
   }
 
   let { message } = response;
@@ -402,7 +439,12 @@ export async function getProtocolV2WalletSession(
       );
     } else {
       device.clearInternalState();
-      response = await selectDeviceSession(device, expectedPassphraseState, options?.deriveCardano);
+      response = await selectDeviceSession(
+        device,
+        expectedPassphraseState,
+        options?.deriveCardano,
+        markWalletStatusRefreshed
+      );
     }
     message = response.message;
     try {
@@ -438,7 +480,7 @@ export async function getProtocolV2WalletSession(
   let unlockedAttachPin: boolean | undefined;
   if (readCurrentAttachPinSession) {
     unlockedAttachPin = true;
-  } else if (mainPinSelected) {
+  } else if (mainPinAuthenticated) {
     unlockedAttachPin = false;
   }
 
@@ -447,6 +489,7 @@ export async function getProtocolV2WalletSession(
     newSession: message.session_id,
     unlockedAttachPin,
     resumed,
+    walletStatusRefreshed,
   };
 }
 

package/src/types/settings.ts

@@ -77,7 +77,8 @@ export type IProtocolV2Resources = {
 /** STM32 firmware config */
 export type IFirmwareReleaseInfo = {
   required: boolean;
-  url: string;
+  /** Legacy release artifact URL. Protocol V2 releases use component URLs. */
+  url?: string;
   /**
    * Firmware type (bitcoinonly or universal)
    * This field is not present in the remote config, but will be inferred from the firmware field name
@@ -106,7 +107,8 @@ export type IFirmwareReleaseInfo = {
   bootloaderChangelog?: {
     [k in ILocale]: string;
   };
-  fingerprint: string;
+  /** Legacy release artifact SHA-256. Protocol V2 releases use component fingerprints. */
+  fingerprint?: string;
   expectedSize?: number;
   version: IVersionArray;
   changelog: {

package/src/utils/deviceFeaturesUtils.ts

@@ -110,6 +110,7 @@ export const getPassphraseStateWithRefreshDeviceInfo = async (
     initSession?: boolean;
     deriveCardano?: boolean;
     rejectAttachPinForMainWallet?: boolean;
+    mainPinSelected?: boolean;
   }
 ) => {
   if (device.isProtocolV2()) {
@@ -127,6 +128,7 @@ export const getPassphraseStateWithRefreshDeviceInfo = async (
       onlyMainPin: options?.onlyMainPin,
       deriveCardano: options?.deriveCardano,
       rejectAttachPinForMainWallet: options?.rejectAttachPinForMainWallet,
+      mainPinSelected: options?.mainPinSelected,
     });
   }
 
@@ -194,6 +196,7 @@ export const getPassphraseState = async (
     initSession?: boolean;
     deriveCardano?: boolean;
     rejectAttachPinForMainWallet?: boolean;
+    mainPinSelected?: boolean;
   }
 ): Promise<{
   passphraseState: string | undefined;
@@ -216,6 +219,7 @@ export const getPassphraseState = async (
       onlyMainPin: options?.onlyMainPin,
       deriveCardano: options?.deriveCardano,
       rejectAttachPinForMainWallet: options?.rejectAttachPinForMainWallet,
+      mainPinSelected: options?.mainPinSelected,
     });
   }