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

package/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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-transport",
-  "version": "1.2.0-alpha.183",
+  "version": "1.2.0-alpha.185",
   "description": "Transport layer abstractions and utilities for OneKey hardware SDK.",
   "author": "OneKey",
   "homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
@@ -28,5 +28,5 @@
     "long": "^4.0.0",
     "protobufjs": "^6.11.2"
   },
-  "gitHead": "fd9b6e749495b0144e734dbe32c57cf483547349"
+  "gitHead": "dba45132513abeef33dc448824b4eaace74900ee"
 }

package/src/protocols/v2/session.ts

@@ -468,6 +468,7 @@ export async function probeProtocolV2({
   logPrefix = 'ProtocolV2',
   onBeforeProbe,
   onProbeFailed,
+  shouldRethrow,
 }: {
   call: (
     name: string,
@@ -479,6 +480,7 @@ export async function probeProtocolV2({
   logPrefix?: string;
   onBeforeProbe?: () => Promise<void> | void;
   onProbeFailed?: (error: unknown) => Promise<void> | void;
+  shouldRethrow?: (error: unknown) => boolean;
 }) {
   let probeError: unknown;
   try {
@@ -503,7 +505,7 @@ export async function probeProtocolV2({
     }
     probeError = new Error(`unexpected response type ${response.type}`);
   } catch (error) {
-    if (isProtocolV2LinkDisabledError(error)) {
+    if (isProtocolV2LinkDisabledError(error) || shouldRethrow?.(error)) {
       throw error;
     }
     probeError = error;

package/src/types/messages.ts

@@ -1950,6 +1950,8 @@ export type EthereumSignTxOneKey = {
   data_length?: number;
   chain_id: number;
   tx_type?: number;
+  expected_address?: string;
+  source_fingerprint?: number;
 };
 
 // EthereumAccessListOneKey
@@ -1971,6 +1973,8 @@ export type EthereumSignTxEIP1559OneKey = {
   data_length: number;
   chain_id: number;
   access_list: EthereumAccessListOneKey[];
+  expected_address?: string;
+  source_fingerprint?: number;
 };
 
 // EthereumAuthorizationSignature
@@ -2023,6 +2027,7 @@ export type EthereumSignMessageOneKey = {
   address_n: number[];
   message: string;
   chain_id?: number;
+  source_fingerprint?: number;
 };
 
 // EthereumMessageSignatureOneKey
@@ -3815,6 +3820,7 @@ export type SolanaSignTx = {
   address_n: number[];
   raw_tx: string;
   extra_info?: SolanaTxExtraInfo;
+  source_fingerprint?: number;
 };
 
 // SolanaSignedTx
@@ -3838,12 +3844,14 @@ export type SolanaSignOffChainMessage = {
   message_version?: SolanaOffChainMessageVersion;
   message_format?: SolanaOffChainMessageFormat;
   application_domain?: string;
+  source_fingerprint?: number;
 };
 
 // SolanaSignUnsafeMessage
 export type SolanaSignUnsafeMessage = {
   address_n: number[];
   message: string;
+  source_fingerprint?: number;
 };
 
 // SolanaMessageSignature
@@ -4594,6 +4602,7 @@ export type EthereumSignTypedDataQR = {
   chain_id?: number;
   metamask_v4_compat?: boolean;
   request_id?: string;
+  source_fingerprint?: number;
 };
 
 // SetBusy
@@ -4766,6 +4775,19 @@ export type DeviceMiscUsbMscControl = {
   enable: boolean;
 };
 
+// DeviceFindMyTokenUpdate
+export type DeviceFindMyTokenUpdate = {
+  token: string;
+};
+
+// DeviceFindMyTokenStateGet
+export type DeviceFindMyTokenStateGet = {};
+
+// DeviceFindMyTokenState
+export type DeviceFindMyTokenState = {
+  burned: boolean;
+};
+
 export enum DeviceFactoryAck {
   FACTORY_ACK_SUCCESS = 0,
   FACTORY_ACK_FAIL = 1,
@@ -4837,6 +4859,12 @@ export enum DeviceFirmwareUpdateTaskStatus {
   FW_MGMT_UPDATER_TASK_STATUS_FAILED_ENTRY_OUT_OF_BOUNDS = 10,
 }
 
+export enum DeviceFirmwareUpdatePhase {
+  FW_MGMT_UPDATER_PHASE_PREPARE = 0,
+  FW_MGMT_UPDATER_PHASE_INSTALL = 1,
+  FW_MGMT_UPDATER_PHASE_VERIFY = 2,
+}
+
 // DeviceFirmwareTarget
 export type DeviceFirmwareTarget = {
   target_id: DeviceFirmwareTargetType;
@@ -4849,12 +4877,22 @@ export type DeviceFirmwareUpdateStage = {
 };
 
 // DeviceFirmwareUpdateRequest
-export type DeviceFirmwareUpdateRequest = {};
+export type DeviceFirmwareUpdateRequest = {
+  reboot_after_update?: boolean;
+};
+
+// DeviceFirmwareUpdatePhaseInfo
+export type DeviceFirmwareUpdatePhaseInfo = {
+  phase: DeviceFirmwareUpdatePhase;
+  progress_percent: number;
+};
 
 // DeviceFirmwareUpdateRecord
 export type DeviceFirmwareUpdateRecord = {
   target_id: DeviceFirmwareTargetType;
   status?: DeviceFirmwareUpdateTaskStatus;
+  progress_percent?: number;
+  phase_info?: DeviceFirmwareUpdatePhaseInfo;
   payload_version?: number;
   path?: string;
 };
@@ -4862,6 +4900,8 @@ export type DeviceFirmwareUpdateRecord = {
 // DeviceFirmwareUpdateRecordFields
 export type DeviceFirmwareUpdateRecordFields = {
   status?: boolean;
+  progress_percent?: boolean;
+  phase_info?: boolean;
   payload_version?: boolean;
   path?: boolean;
 };
@@ -5220,6 +5260,7 @@ export type ViewTip = {
   type: ViewTipType;
   text?: string;
   text_id?: number;
+  text_arg?: string;
 };
 
 // ViewRawData
@@ -5247,6 +5288,7 @@ export type ViewSignPage = {
   slide_to_confirm?: boolean;
   layout?: ViewSignLayout;
   title_id?: number;
+  title_arg?: string;
 };
 
 // ViewVerifyPage
@@ -5888,6 +5930,9 @@ export type MessageType = {
   DeviceCertificateSignature: DeviceCertificateSignature;
   DeviceCertificateSign: DeviceCertificateSign;
   DeviceMiscUsbMscControl: DeviceMiscUsbMscControl;
+  DeviceFindMyTokenUpdate: DeviceFindMyTokenUpdate;
+  DeviceFindMyTokenStateGet: DeviceFindMyTokenStateGet;
+  DeviceFindMyTokenState: DeviceFindMyTokenState;
   DeviceFactoryInfoManufactureTime: DeviceFactoryInfoManufactureTime;
   DeviceFactoryInfo: DeviceFactoryInfo;
   DeviceFactoryInfoSet: DeviceFactoryInfoSet;
@@ -5897,6 +5942,7 @@ export type MessageType = {
   DeviceFirmwareTarget: DeviceFirmwareTarget;
   DeviceFirmwareUpdateStage: DeviceFirmwareUpdateStage;
   DeviceFirmwareUpdateRequest: DeviceFirmwareUpdateRequest;
+  DeviceFirmwareUpdatePhaseInfo: DeviceFirmwareUpdatePhaseInfo;
   DeviceFirmwareUpdateRecord: DeviceFirmwareUpdateRecord;
   DeviceFirmwareUpdateRecordFields: DeviceFirmwareUpdateRecordFields;
   DeviceFirmwareUpdateStatusGet: DeviceFirmwareUpdateStatusGet;