@onekeyfe/hd-core 1.2.0-alpha.99 → 1.2.0

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,
@@ -462,9 +465,10 @@
         "MessageType_FilesystemDirMake": 60809,
         "MessageType_FilesystemDirRemove": 60810,
         "MessageType_FilesystemFormat": 60811,
-        "MessageType_DeviceFirmwareUpdateRequest": 61000,
-        "MessageType_DeviceFirmwareUpdateStatusGet": 61001,
-        "MessageType_DeviceFirmwareUpdateStatus": 61002,
+        "MessageType_DeviceFirmwareUpdateStage": 61000,
+        "MessageType_DeviceFirmwareUpdateRequest": 61001,
+        "MessageType_DeviceFirmwareUpdateStatusGet": 61002,
+        "MessageType_DeviceFirmwareUpdateStatus": 61003,
         "MessageType_DeviceSessionGet": 61200,
         "MessageType_DeviceSession": 61201,
         "MessageType_DeviceSessionAskPin": 61202,
@@ -5403,6 +5407,10 @@
         "request_id": {
           "type": "bytes",
           "id": 5
+        },
+        "source_fingerprint": {
+          "type": "uint32",
+          "id": 6
         }
       }
     },
@@ -5538,6 +5546,14 @@
         "tx_type": {
           "type": "uint32",
           "id": 10
+        },
+        "expected_address": {
+          "type": "bytes",
+          "id": 12
+        },
+        "source_fingerprint": {
+          "type": "uint32",
+          "id": 13
         }
       }
     },
@@ -5618,6 +5634,14 @@
           "rule": "repeated",
           "type": "EthereumAccessListOneKey",
           "id": 11
+        },
+        "expected_address": {
+          "type": "bytes",
+          "id": 12
+        },
+        "source_fingerprint": {
+          "type": "uint32",
+          "id": 13
         }
       }
     },
@@ -5794,6 +5818,10 @@
         "chain_id": {
           "type": "uint64",
           "id": 3
+        },
+        "source_fingerprint": {
+          "type": "uint32",
+          "id": 4
         }
       }
     },
@@ -9473,6 +9501,10 @@
           "rule": "required",
           "type": "bytes",
           "id": 2
+        },
+        "source_fingerprint": {
+          "type": "uint32",
+          "id": 3
         }
       }
     },
@@ -9517,6 +9549,10 @@
         "application_domain": {
           "type": "bytes",
           "id": 5
+        },
+        "source_fingerprint": {
+          "type": "uint32",
+          "id": 6
         }
       }
     },
@@ -9534,6 +9570,10 @@
           "rule": "required",
           "type": "bytes",
           "id": 2
+        },
+        "source_fingerprint": {
+          "type": "uint32",
+          "id": 3
         }
       }
     },
@@ -11763,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,
@@ -11813,14 +11874,14 @@
           "type": "string",
           "id": 2
         },
-        "burn_in_completed": {
-          "type": "bool",
-          "id": 3
-        },
         "factory_test_completed": {
           "type": "bool",
           "id": 4
         },
+        "factory_burn_in_completed": {
+          "type": "bool",
+          "id": 3
+        },
         "manufacture_time": {
           "type": "DeviceFactoryInfoManufactureTime",
           "id": 5
@@ -11892,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": {
@@ -11906,7 +11974,7 @@
         }
       }
     },
-    "DeviceFirmwareUpdateRequest": {
+    "DeviceFirmwareUpdateStage": {
       "fields": {
         "targets": {
           "rule": "repeated",
@@ -11915,6 +11983,28 @@
         }
       }
     },
+    "DeviceFirmwareUpdateRequest": {
+      "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": {
         "target_id": {
@@ -11926,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
@@ -11942,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
@@ -12096,7 +12202,7 @@
           "type": "bool",
           "id": 100
         },
-        "fw": {
+        "main_mcu": {
           "type": "bool",
           "id": 200
         },
@@ -12165,7 +12271,7 @@
           "type": "DeviceHardwareInfo",
           "id": 100
         },
-        "fw": {
+        "main_mcu": {
           "type": "DeviceMainMcuInfo",
           "id": 200
         },
@@ -12703,9 +12809,16 @@
           "id": 1
         },
         "text": {
-          "rule": "required",
           "type": "string",
           "id": 2
+        },
+        "text_id": {
+          "type": "uint32",
+          "id": 3
+        },
+        "text_arg": {
+          "type": "string",
+          "id": 4
         }
       }
     },
@@ -12736,7 +12849,6 @@
     "ViewSignPage": {
       "fields": {
         "title": {
-          "rule": "required",
           "type": "string",
           "id": 1
         },
@@ -12770,13 +12882,20 @@
           "options": {
             "default": "LayoutDefault"
           }
+        },
+        "title_id": {
+          "type": "uint32",
+          "id": 8
+        },
+        "title_arg": {
+          "type": "string",
+          "id": 9
         }
       }
     },
     "ViewVerifyPage": {
       "fields": {
         "title": {
-          "rule": "required",
           "type": "string",
           "id": 1
         },
@@ -12801,6 +12920,14 @@
         "value_key": {
           "type": "uint32",
           "id": 6
+        },
+        "title_id": {
+          "type": "uint32",
+          "id": 7
+        },
+        "chain_id": {
+          "type": "uint32",
+          "id": 8
         }
       }
     },

package/src/data-manager/DataManager.ts

@@ -26,7 +26,7 @@ import type {
   Features,
   IDeviceBLEFirmwareStatus,
   IDeviceFirmwareStatus,
-  IProtocolV2Resources,
+  IFirmwareReleaseInfo,
   ITransportStatus,
   IVersionArray,
   RemoteConfigResponse,
@@ -407,6 +407,37 @@ export default class DataManager {
     return enrichedData;
   }
 
+  private static enrichProtocolV2FirmwareReleaseInfo(
+    deviceData: DeviceTypeMap[keyof DeviceTypeMap] | undefined,
+    onResourcesError: (error: Error) => void
+  ): NonNullable<DeviceTypeMap[keyof DeviceTypeMap]> {
+    const enrichedData = this.enrichFirmwareReleaseInfo(deviceData);
+    const releases = enrichedData['firmware-v1'];
+    if (!Array.isArray(releases)) {
+      return enrichedData;
+    }
+    const latestRelease = findLatestRelease(releases);
+
+    return {
+      ...enrichedData,
+      'firmware-v1': releases.map(release => {
+        const { resources: rawResources, ...releaseWithoutResources } = release;
+        try {
+          const resources = parseProtocolV2Resources(rawResources);
+          return {
+            ...releaseWithoutResources,
+            ...(resources ? { resources } : undefined),
+          };
+        } catch (error) {
+          if (release === latestRelease) {
+            onResourcesError(error instanceof Error ? error : new Error(String(error)));
+          }
+          return releaseWithoutResources;
+        }
+      }),
+    };
+  }
+
   static async load(settings: ConnectSettings): Promise<boolean> {
     this.settings = settings;
     this.protocolV2ResourcesConfigError = undefined;
@@ -450,7 +481,7 @@ export default class DataManager {
       Log.debug('[DataConfig] Trying SDK-managed config request...');
       try {
         const response = await axios.get<RemoteConfigResponse>(urlWithCache, {
-          // because of iframe timeout is 10000
+          // Keep the config request below the 20-second iframe initialization timeout.
           timeout: 7000,
         });
         data = response.data;
@@ -471,32 +502,16 @@ export default class DataManager {
   }
 
   private static applyRemoteConfig(data: RemoteConfigResponse) {
-    let pro2Resources: IProtocolV2Resources | undefined;
-    let neoResources: IProtocolV2Resources | undefined;
-    try {
-      pro2Resources = parseProtocolV2Resources(
-        (data.pro2 as { resources?: unknown } | undefined)?.resources
-      );
-    } catch (error) {
+    const pro2Config = this.enrichProtocolV2FirmwareReleaseInfo(data.pro2, error => {
       // Firmware resource metadata is not required for base communication. If the
-      // remote config is temporarily incomplete, disable this resource update only.
-      this.protocolV2ResourcesConfigError =
-        error instanceof Error ? error : new Error(String(error));
-      Log.warn('[DataConfig] Ignoring invalid Pro2 resources config:', error);
-    }
-    try {
-      neoResources = parseProtocolV2Resources(
-        (data.neo as { resources?: unknown } | undefined)?.resources
-      );
-    } catch (error) {
-      this.protocolV2NeoResourcesConfigError =
-        error instanceof Error ? error : new Error(String(error));
-      Log.warn('[DataConfig] Ignoring invalid Neo resources config:', error);
-    }
-    const enrichedPro2Config = this.enrichFirmwareReleaseInfo(data.pro2);
-    const enrichedNeoConfig = this.enrichFirmwareReleaseInfo(data.neo);
-    const { resources: _unvalidatedResources, ...pro2Config } = enrichedPro2Config;
-    const { resources: _unvalidatedNeoResources, ...neoConfig } = enrichedNeoConfig;
+      // The selected release is incomplete, so disable its resource update only.
+      this.protocolV2ResourcesConfigError = error;
+      Log.warn('[DataConfig] Ignoring invalid Pro2 release resources config:', error);
+    });
+    const neoConfig = this.enrichProtocolV2FirmwareReleaseInfo(data.neo, error => {
+      this.protocolV2NeoResourcesConfigError = error;
+      Log.warn('[DataConfig] Ignoring invalid Neo release resources config:', error);
+    });
     this.deviceMap = {
       [EDeviceType.Classic]: this.enrichFirmwareReleaseInfo(data.classic),
       [EDeviceType.Classic1s]: this.enrichFirmwareReleaseInfo(data.classic1s),
@@ -504,14 +519,8 @@ export default class DataManager {
       [EDeviceType.Mini]: this.enrichFirmwareReleaseInfo(data.mini),
       [EDeviceType.Touch]: this.enrichFirmwareReleaseInfo(data.touch),
       [EDeviceType.Pro]: this.enrichFirmwareReleaseInfo(data.pro),
-      [EDeviceType.Pro2]: {
-        ...pro2Config,
-        ...(pro2Resources ? { resources: pro2Resources } : undefined),
-      },
-      [EDeviceType.Neo]: {
-        ...neoConfig,
-        ...(neoResources ? { resources: neoResources } : undefined),
-      },
+      [EDeviceType.Pro2]: pro2Config,
+      [EDeviceType.Neo]: neoConfig,
     };
     this.assets = {
       bridge: data.bridge,
@@ -589,10 +598,8 @@ export default class DataManager {
     this.lastCheckTimestamp = getTimeStamp();
   }
 
-  static getProtocolV2ResourceSource(
-    deviceType: EDeviceType.Pro2 | EDeviceType.Neo = EDeviceType.Pro2
-  ) {
-    return this.deviceMap[deviceType]?.resources?.source;
+  static getProtocolV2ResourceSource(release: IFirmwareReleaseInfo | undefined) {
+    return release?.resources?.source;
   }
 
   static getProtobufMessages(schema: ProtobufMessageSchema = 'v1CurrentSchema'): JSON {

package/src/data-manager/TransportManager.ts

@@ -69,7 +69,9 @@ export default class TransportManager {
       } else if (env === 'desktop-web-ble') {
         await this.transport.init(WebBleLogger, DevicePool.emitter);
       } else if (env === 'webusb' || env === 'desktop-webusb') {
-        await this.transport.init(WebUsbLogger);
+        // The emitter is what turns a navigator.usb 'disconnect' into a
+        // DEVICE.DISCONNECT; without it WebUSB never reports device removal.
+        await this.transport.init(WebUsbLogger, DevicePool.emitter);
       } else {
         await this.transport.init(HttpLogger);
       }