@onekeyfe/hd-core 1.2.0-alpha.12 → 1.2.0-alpha.13

package/src/api/FirmwareUpdateV4.ts

@@ -379,6 +379,25 @@ const parseProtocolV2OkppHeader = (bytes: Uint8Array): ProtocolV2OkppHeader | nu
   };
 };
 
+export const assertProtocolV2ReconnectIdentity = (
+  expectedDeviceId?: string,
+  actualDeviceId?: string
+) => {
+  if (!expectedDeviceId) return;
+  if (!actualDeviceId) {
+    throw ERRORS.TypedError(
+      HardwareErrorCode.DeviceNotFound,
+      'Protocol V2 reconnect identity unavailable'
+    );
+  }
+  if (actualDeviceId !== expectedDeviceId) {
+    throw ERRORS.TypedError(
+      HardwareErrorCode.DeviceNotFound,
+      `Protocol V2 reconnect identity mismatch: expected ${expectedDeviceId}, received ${actualDeviceId}`
+    );
+  }
+};
+
 /**
  * FirmwareUpdateV4 is the complete Protocol V2 firmware update flow.
  *
@@ -388,6 +407,8 @@ const parseProtocolV2OkppHeader = (bytes: Uint8Array): ProtocolV2OkppHeader | nu
  * - completion waits for target status to finish, reboots to normal, then polls DeviceInfo
  */
 export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareUpdateV4Params> {
+  private protocolV2ExpectedDeviceId?: string;
+
   init() {
     this.allowDeviceMode = [UI_REQUEST.BOOTLOADER, UI_REQUEST.NOT_INITIALIZE];
     this.requireDeviceMode = [];
@@ -476,6 +497,7 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
 
   private async runProtocolV2() {
     const deviceFeatures = await this.getProtocolV2DeviceFeatures();
+    this.protocolV2ExpectedDeviceId = deviceFeatures.deviceId ?? undefined;
     const deviceFirmwareType = getFirmwareType(deviceFeatures);
     const firmwareType = this.params.firmwareType ?? deviceFirmwareType;
 
@@ -917,6 +939,10 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
           timeoutMs: PROTOCOL_V2_SHORT_RESPONSE_TIMEOUT,
         });
         const features = this.device.updateProtocolV2Features(deviceInfo);
+        assertProtocolV2ReconnectIdentity(
+          this.protocolV2ExpectedDeviceId,
+          features.deviceId ?? undefined
+        );
         if (features?.bootloaderMode) {
           return features;
         }
@@ -1134,6 +1160,10 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
       request: PROTOCOL_V2_VERSIONS_DEVICE_INFO_REQUEST,
     });
     const features = this.device.updateProtocolV2Features(deviceInfo);
+    assertProtocolV2ReconnectIdentity(
+      this.protocolV2ExpectedDeviceId,
+      features.deviceId ?? undefined
+    );
     if (this.isProtocolV2NormalModeFeatures(features)) {
       Log.log('Protocol V2 firmware install finished; device is back in normal mode');
       return true;
@@ -1288,6 +1318,10 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
           request: PROTOCOL_V2_VERSIONS_DEVICE_INFO_REQUEST,
         });
         const features = this.device.updateProtocolV2Features(deviceInfo);
+        assertProtocolV2ReconnectIdentity(
+          this.protocolV2ExpectedDeviceId,
+          features.deviceId ?? undefined
+        );
         if (features.bootloaderMode || features.mode === 'bootloader') {
           throw ERRORS.TypedError(
             HardwareErrorCode.DeviceNotFound,
@@ -1334,6 +1368,10 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
       this.device.commands.disposed = false;
       this.device.getCommands().mainId = this.device.mainId ?? '';
       await this.device.initialize();
+      assertProtocolV2ReconnectIdentity(
+        this.protocolV2ExpectedDeviceId,
+        this.device.getCurrentDeviceId()
+      );
       return;
     }
 
@@ -1355,6 +1393,10 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
     this.device.commands.disposed = false;
     this.device.getCommands().mainId = this.device.mainId ?? '';
     await this.device.initialize();
+    assertProtocolV2ReconnectIdentity(
+      this.protocolV2ExpectedDeviceId,
+      this.device.getCurrentDeviceId()
+    );
   }
 
   private async protocolV2CommonUpdateProcess(params: ProtocolV2FileTransferParams) {
@@ -1416,12 +1458,10 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
         overwrite,
         progress
       );
-      const processedByte = Number(writeRes.message.processed_byte);
-      const nextOffset =
-        Number.isFinite(processedByte) && processedByte > offset
-          ? processedByte
-          : offset + chunkLength;
-      if (nextOffset <= offset || nextOffset > payload.byteLength) {
+      const rawProcessedByte = writeRes.message.processed_byte;
+      const processedByte = Number(rawProcessedByte);
+      const nextOffset = rawProcessedByte === undefined ? offset + chunkLength : processedByte;
+      if (!Number.isFinite(nextOffset) || nextOffset <= offset || nextOffset > chunkEnd) {
         throw ERRORS.TypedError(
           HardwareErrorCode.EmmcFileWriteFirmwareError,
           `invalid processed_byte ${writeRes.message.processed_byte} for offset ${offset}`

package/src/api/cardano/CardanoSignMessage.ts

@@ -14,7 +14,7 @@ export default class CardanoSignMessage extends BaseMethod<CardanoSignMessagePar
   init() {
     this.checkDeviceId = true;
     this.allowDeviceMode = [...this.allowDeviceMode, UI_REQUEST.NOT_INITIALIZE];
-    this.allowUsePreInitialize = true;
+    this.allowUsePreInitialize = false;
 
     const { payload } = this;
     validateParams(payload, [

package/src/api/cardano/CardanoSignTransaction.ts

@@ -48,7 +48,7 @@ export default class CardanoSignTransaction extends BaseMethod<any> {
   init() {
     this.checkDeviceId = true;
     this.allowDeviceMode = [...this.allowDeviceMode, UI_REQUEST.NOT_INITIALIZE];
-    this.allowUsePreInitialize = true;
+    this.allowUsePreInitialize = false;
 
     this.hasBundle = !!this.payload?.bundle;
 

package/src/api/helpers/protocolV2FileWrite.ts

@@ -129,17 +129,21 @@ export async function writeProtocolV2File(options: ProtocolV2FileWriteOptions) {
     );
     options.throwIfAborted?.();
     lastMessage = response.message;
-    const processedByte = Number(response.message?.processed_byte);
-    written =
-      Number.isFinite(processedByte) && processedByte > offset
-        ? processedByte - startOffset
-        : written + chunk.byteLength;
-    if (written > dataLength) {
+    const rawProcessedByte = response.message?.processed_byte;
+    const processedByte = Number(rawProcessedByte);
+    if (
+      rawProcessedByte !== undefined &&
+      (!Number.isFinite(processedByte) ||
+        processedByte <= offset ||
+        processedByte > offset + chunk.byteLength)
+    ) {
       throw ERRORS.TypedError(
         HardwareErrorCode.RuntimeError,
         `FilesystemFileWrite invalid processed_byte ${processedByte}`
       );
     }
+    written =
+      rawProcessedByte === undefined ? written + chunk.byteLength : processedByte - startOffset;
     chunks += 1;
     const elapsedMs = Date.now() - startTime;
     const transferredBytes = Math.min(written, dataLength);

package/src/api/index.ts

@@ -61,7 +61,6 @@ export { default as deviceSettingsPageShow } from './protocol-v2/DeviceSettingsP
 export { default as deviceUploadWallpaper } from './protocol-v2/DeviceUploadWallpaper';
 export { default as filesystemPermissionFix } from './protocol-v2/FilesystemPermissionFix';
 export { default as filesystemFormat } from './protocol-v2/FilesystemFormat';
-export { default as filesystemDiskControl } from './protocol-v2/FilesystemDiskControl';
 export { default as fileRead } from './FileRead';
 export { default as fileWrite } from './FileWrite';
 export { default as fileDelete } from './FileDelete';

package/src/api/protocol-v2/DeviceUploadWallpaper.ts

@@ -4,11 +4,12 @@ import { bytesToHex } from '@noble/hashes/utils';
 import { BaseMethod } from '../BaseMethod';
 import { invalidParameter } from '../helpers/filesystemValidation';
 import { writeProtocolV2File } from '../helpers/protocolV2FileWrite';
+import { UI_REQUEST, createUiMessage } from '../../events/ui-request';
 import {
-  encodePro2Wallpaper,
   PRO2_WALLPAPER_HEIGHT,
   PRO2_WALLPAPER_WIDTH,
   type Pro2WallpaperColorFormat,
+  encodePro2Wallpaper,
 } from '../../utils/pro2Wallpaper';
 
 export type DeviceUploadWallpaperParams = {
@@ -90,7 +91,7 @@ export default class DeviceUploadWallpaper extends BaseMethod<DeviceUploadWallpa
 
   private async upload() {
     if (this.uploaded) return;
-    const encoded = this.encoded;
+    const { encoded } = this;
     if (!encoded) throw invalidParameter('Wallpaper data has not been initialized.');
 
     await writeProtocolV2File({
@@ -102,12 +103,17 @@ export default class DeviceUploadWallpaper extends BaseMethod<DeviceUploadWallpa
       overwrite: true,
       append: false,
       throwIfAborted: () => this.throwIfAborted(),
+      onProgress: payload => {
+        if (typeof this.postMessage === 'function') {
+          this.postMessage(createUiMessage(UI_REQUEST.DEVICE_PROGRESS, payload));
+        }
+      },
     });
     this.uploaded = true;
   }
 
   async run(): Promise<DeviceUploadWallpaperResponse> {
-    const encoded = this.encoded;
+    const { encoded } = this;
     if (!encoded) throw invalidParameter('Wallpaper data has not been initialized.');
     await this.ensureDirectory();
     await this.upload();

package/src/api/protocol-v2/helpers.ts

@@ -118,9 +118,6 @@ export const isProtocolV2DeviceDisconnectedError = (error: unknown) => {
     message.includes('connection has timed out unexpectedly') ||
     message.includes('connection error has occured') ||
     message.includes('connection error has occurred') ||
-    message.includes('transferIn') ||
-    message.includes('transferin') ||
-    message.includes('usbdevice') ||
     message.includes('multiplatformbleadapter') ||
     message.includes('multipalformebleadapter') ||
     compactMessage.includes('rxerrorerror6') ||

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

@@ -485,7 +485,6 @@
         "MessageType_DeviceSessionGet": 60606,
         "MessageType_DeviceSession": 60607,
         "MessageType_DeviceSessionAskPin": 60608,
-        "MessageType_DeviceSessionPinResult": 60609,
         "MessageType_FilesystemPermissionFix": 60800,
         "MessageType_FilesystemPathInfo": 60801,
         "MessageType_FilesystemPathInfoQuery": 60802,
@@ -6161,6 +6160,33 @@
         "PromptTemporarily": 2
       }
     },
+    "Initialize": {
+      "fields": {
+        "session_id": {
+          "type": "bytes",
+          "id": 1
+        },
+        "_skip_passphrase": {
+          "type": "bool",
+          "id": 2,
+          "options": {
+            "deprecated": true
+          }
+        },
+        "derive_cardano": {
+          "type": "bool",
+          "id": 3
+        },
+        "passphrase_state": {
+          "type": "string",
+          "id": 8000
+        },
+        "is_contains_attach": {
+          "type": "bool",
+          "id": 8001
+        }
+      }
+    },
     "StartSession": {
       "fields": {
         "session_id": {
@@ -6183,6 +6209,12 @@
     "EndSession": {
       "fields": {}
     },
+    "GetFeatures": {
+      "fields": {}
+    },
+    "OnekeyGetFeatures": {
+      "fields": {}
+    },
     "OneKeyDeviceType": {
       "values": {
         "CLASSIC": 0,
@@ -6204,6 +6236,388 @@
         "APP": 1
       }
     },
+    "Features": {
+      "fields": {
+        "vendor": {
+          "type": "string",
+          "id": 1
+        },
+        "major_version": {
+          "rule": "required",
+          "type": "uint32",
+          "id": 2
+        },
+        "minor_version": {
+          "rule": "required",
+          "type": "uint32",
+          "id": 3
+        },
+        "patch_version": {
+          "rule": "required",
+          "type": "uint32",
+          "id": 4
+        },
+        "bootloader_mode": {
+          "type": "bool",
+          "id": 5
+        },
+        "device_id": {
+          "type": "string",
+          "id": 6
+        },
+        "pin_protection": {
+          "type": "bool",
+          "id": 7
+        },
+        "passphrase_protection": {
+          "type": "bool",
+          "id": 8
+        },
+        "language": {
+          "type": "string",
+          "id": 9
+        },
+        "label": {
+          "type": "string",
+          "id": 10
+        },
+        "initialized": {
+          "type": "bool",
+          "id": 12
+        },
+        "revision": {
+          "type": "bytes",
+          "id": 13
+        },
+        "bootloader_hash": {
+          "type": "bytes",
+          "id": 14
+        },
+        "imported": {
+          "type": "bool",
+          "id": 15
+        },
+        "unlocked": {
+          "type": "bool",
+          "id": 16
+        },
+        "_passphrase_cached": {
+          "type": "bool",
+          "id": 17,
+          "options": {
+            "deprecated": true
+          }
+        },
+        "firmware_present": {
+          "type": "bool",
+          "id": 18
+        },
+        "needs_backup": {
+          "type": "bool",
+          "id": 19
+        },
+        "flags": {
+          "type": "uint32",
+          "id": 20
+        },
+        "model": {
+          "type": "string",
+          "id": 21
+        },
+        "fw_major": {
+          "type": "uint32",
+          "id": 22
+        },
+        "fw_minor": {
+          "type": "uint32",
+          "id": 23
+        },
+        "fw_patch": {
+          "type": "uint32",
+          "id": 24
+        },
+        "fw_vendor": {
+          "type": "string",
+          "id": 25
+        },
+        "unfinished_backup": {
+          "type": "bool",
+          "id": 27
+        },
+        "no_backup": {
+          "type": "bool",
+          "id": 28
+        },
+        "recovery_mode": {
+          "type": "bool",
+          "id": 29
+        },
+        "capabilities": {
+          "rule": "repeated",
+          "type": "Capability",
+          "id": 30,
+          "options": {
+            "packed": false
+          }
+        },
+        "backup_type": {
+          "type": "BackupType",
+          "id": 31
+        },
+        "sd_card_present": {
+          "type": "bool",
+          "id": 32
+        },
+        "sd_protection": {
+          "type": "bool",
+          "id": 33
+        },
+        "wipe_code_protection": {
+          "type": "bool",
+          "id": 34
+        },
+        "session_id": {
+          "type": "bytes",
+          "id": 35
+        },
+        "passphrase_always_on_device": {
+          "type": "bool",
+          "id": 36
+        },
+        "safety_checks": {
+          "type": "SafetyCheckLevel",
+          "id": 37
+        },
+        "auto_lock_delay_ms": {
+          "type": "uint32",
+          "id": 38
+        },
+        "display_rotation": {
+          "type": "uint32",
+          "id": 39
+        },
+        "experimental_features": {
+          "type": "bool",
+          "id": 40
+        },
+        "offset": {
+          "type": "uint32",
+          "id": 500
+        },
+        "coprocessor_bt_name": {
+          "type": "string",
+          "id": 501
+        },
+        "coprocessor_version": {
+          "type": "string",
+          "id": 502
+        },
+        "coprocessor_bt_enable": {
+          "type": "bool",
+          "id": 503
+        },
+        "se_enable": {
+          "type": "bool",
+          "id": 504
+        },
+        "se_ver": {
+          "type": "string",
+          "id": 506
+        },
+        "backup_only": {
+          "type": "bool",
+          "id": 507
+        },
+        "onekey_version": {
+          "type": "string",
+          "id": 508
+        },
+        "onekey_serial": {
+          "type": "string",
+          "id": 509
+        },
+        "bootloader_version": {
+          "type": "string",
+          "id": 510
+        },
+        "serial_no": {
+          "type": "string",
+          "id": 511
+        },
+        "spi_flash": {
+          "type": "string",
+          "id": 512
+        },
+        "initstates": {
+          "type": "uint32",
+          "id": 513
+        },
+        "NFT_voucher": {
+          "type": "bytes",
+          "id": 514
+        },
+        "cpu_info": {
+          "type": "string",
+          "id": 515
+        },
+        "pre_firmware": {
+          "type": "string",
+          "id": 516
+        },
+        "coin_switch": {
+          "type": "uint32",
+          "id": 517
+        },
+        "build_id": {
+          "type": "bytes",
+          "id": 518
+        },
+        "romloader_version": {
+          "type": "string",
+          "id": 519
+        },
+        "busy": {
+          "type": "bool",
+          "id": 41
+        },
+        "onekey_device_type": {
+          "type": "OneKeyDeviceType",
+          "id": 600
+        },
+        "onekey_se_type": {
+          "type": "OneKeySeType",
+          "id": 601
+        },
+        "onekey_romloader_version": {
+          "type": "string",
+          "id": 602
+        },
+        "onekey_romloader_hash": {
+          "type": "bytes",
+          "id": 603
+        },
+        "onekey_bootloader_version": {
+          "type": "string",
+          "id": 604
+        },
+        "onekey_bootloader_hash": {
+          "type": "bytes",
+          "id": 605
+        },
+        "onekey_se01_version": {
+          "type": "string",
+          "id": 606
+        },
+        "onekey_se01_hash": {
+          "type": "bytes",
+          "id": 607
+        },
+        "onekey_se01_build_id": {
+          "type": "string",
+          "id": 608
+        },
+        "onekey_firmware_version": {
+          "type": "string",
+          "id": 609
+        },
+        "onekey_firmware_hash": {
+          "type": "bytes",
+          "id": 610
+        },
+        "onekey_firmware_build_id": {
+          "type": "string",
+          "id": 611
+        },
+        "onekey_serial_no": {
+          "type": "string",
+          "id": 612
+        },
+        "onekey_bootloader_build_id": {
+          "type": "string",
+          "id": 613
+        },
+        "onekey_coprocessor_bt_name": {
+          "type": "string",
+          "id": 614
+        },
+        "onekey_coprocessor_version": {
+          "type": "string",
+          "id": 615
+        },
+        "onekey_coprocessor_build_id": {
+          "type": "string",
+          "id": 616
+        },
+        "onekey_coprocessor_hash": {
+          "type": "bytes",
+          "id": 617
+        },
+        "onekey_se02_version": {
+          "type": "string",
+          "id": 618
+        },
+        "onekey_se03_version": {
+          "type": "string",
+          "id": 619
+        },
+        "onekey_se04_version": {
+          "type": "string",
+          "id": 620
+        },
+        "onekey_se01_state": {
+          "type": "OneKeySEState",
+          "id": 621
+        },
+        "onekey_se02_state": {
+          "type": "OneKeySEState",
+          "id": 622
+        },
+        "onekey_se03_state": {
+          "type": "OneKeySEState",
+          "id": 623
+        },
+        "onekey_se04_state": {
+          "type": "OneKeySEState",
+          "id": 624
+        },
+        "attach_to_pin_user": {
+          "type": "bool",
+          "id": 625
+        },
+        "unlocked_attach_pin": {
+          "type": "bool",
+          "id": 626
+        }
+      },
+      "nested": {
+        "Capability": {
+          "options": {
+            "(has_bitcoin_only_values)": true
+          },
+          "values": {
+            "Capability_Bitcoin": 1,
+            "Capability_Bitcoin_like": 2,
+            "Capability_Binance": 3,
+            "Capability_Cardano": 4,
+            "Capability_Crypto": 5,
+            "Capability_EOS": 6,
+            "Capability_Ethereum": 7,
+            "Capability_Lisk": 8,
+            "Capability_Monero": 9,
+            "Capability_NEM": 10,
+            "Capability_Ripple": 11,
+            "Capability_Stellar": 12,
+            "Capability_Tezos": 13,
+            "Capability_U2F": 14,
+            "Capability_Shamir": 15,
+            "Capability_ShamirGroups": 16,
+            "Capability_PassphraseEntry": 17,
+            "Capability_AttachToPin": 18,
+            "Capability_EthereumTypedData": 1000
+          }
+        }
+      }
+    },
     "OnekeyFeatures": {
       "fields": {
         "onekey_device_type": {
@@ -11169,7 +11583,10 @@
     "ViewSignLayout": {
       "values": {
         "LayoutDefault": 0,
-        "LayoutSafeTxCreate": 1
+        "LayoutSafeTxCreate": 1,
+        "LayoutFinalConfirm": 2,
+        "Layout7702": 3,
+        "LayoutFlat": 4
       }
     },
     "ViewSignPage": {
@@ -12024,20 +12441,9 @@
     "DeviceSessionAskPin": {
       "fields": {}
     },
-    "DeviceSessionPinResult": {
-      "fields": {
-        "unlocked": {
-          "type": "bool",
-          "id": 1
-        },
-        "unlocked_attach_pin": {
-          "type": "bool",
-          "id": 2
-        },
-        "passphrase_protection": {
-          "type": "bool",
-          "id": 3
-        }
+    "DeviceSessionAskPin_FailureSubCodes": {
+      "values": {
+        "UserCancel": 1
       }
     },
     "DeviceStatus": {