@onekeyfe/hd-core 0.3.31 → 0.3.33

package/dist/api/polkadot/PolkadotGetAddress.d.ts

@@ -4,7 +4,7 @@ import { PolkadotAddress } from '../../types';
 export default class PolkadotGetAddress extends BaseMethod<HardwarePolkadotGetAddress[]> {
     hasBundle: boolean;
     init(): void;
-    getVersionRange(): {
+    getVersionRange(): import("../../types").DeviceFirmwareRange | {
         model_mini: {
             min: string;
         };

package/dist/api/polkadot/PolkadotGetAddress.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"PolkadotGetAddress.d.ts","sourceRoot":"","sources":["../../../src/api/polkadot/PolkadotGetAddress.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,IAAI,0BAA0B,EAAE,MAAM,wBAAwB,CAAC;AAG1F,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAE3C,OAAO,EAAE,eAAe,EAA4B,MAAM,aAAa,CAAC;AAExE,MAAM,CAAC,OAAO,OAAO,kBAAmB,SAAQ,UAAU,CAAC,0BAA0B,EAAE,CAAC;IACtF,SAAS,UAAS;IAElB,IAAI;IAkCJ,eAAe;;;;;;;;IAWT,GAAG;CA2BV"}
+{"version":3,"file":"PolkadotGetAddress.d.ts","sourceRoot":"","sources":["../../../src/api/polkadot/PolkadotGetAddress.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,IAAI,0BAA0B,EAAE,MAAM,wBAAwB,CAAC;AAG1F,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAE3C,OAAO,EAAE,eAAe,EAA4B,MAAM,aAAa,CAAC;AAGxE,MAAM,CAAC,OAAO,OAAO,kBAAmB,SAAQ,UAAU,CAAC,0BAA0B,EAAE,CAAC;IACtF,SAAS,UAAS;IAElB,IAAI;IAkCJ,eAAe;;;;;;;;IAKT,GAAG;CA2BV"}

package/dist/api/polkadot/PolkadotSignTransaction.d.ts

@@ -3,14 +3,7 @@ import { BaseMethod } from '../BaseMethod';
 export default class PolkadotSignTransaction extends BaseMethod<HardwarePolkadotSignTx> {
     hasBundle: boolean;
     init(): void;
-    getVersionRange(): {
-        model_mini: {
-            min: string;
-        };
-        model_touch: {
-            min: string;
-        };
-    };
+    getVersionRange(): import("../../types").DeviceFirmwareRange;
     run(): Promise<{
         path: string;
         signature: string;

package/dist/api/polkadot/PolkadotSignTransaction.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"PolkadotSignTransaction.d.ts","sourceRoot":"","sources":["../../../src/api/polkadot/PolkadotSignTransaction.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,IAAI,sBAAsB,EAAE,MAAM,wBAAwB,CAAC;AAElF,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAK3C,MAAM,CAAC,OAAO,OAAO,uBAAwB,SAAQ,UAAU,CAAC,sBAAsB,CAAC;IACrF,SAAS,UAAS;IAElB,IAAI;IAsBJ,eAAe;;;;;;;;IAWT,GAAG;;;;CAYV"}
+{"version":3,"file":"PolkadotSignTransaction.d.ts","sourceRoot":"","sources":["../../../src/api/polkadot/PolkadotSignTransaction.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,IAAI,sBAAsB,EAAE,MAAM,wBAAwB,CAAC;AAElF,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAM3C,MAAM,CAAC,OAAO,OAAO,uBAAwB,SAAQ,UAAU,CAAC,sBAAsB,CAAC;IACrF,SAAS,UAAS;IAElB,IAAI;IAsBJ,eAAe;IAIT,GAAG;;;;CAYV"}

package/dist/api/polkadot/networks.d.ts

@@ -0,0 +1,19 @@
+import type { DeviceFirmwareRange } from '../../types';
+declare enum Networks {
+    Polkadot = "polkadot",
+    Westend = "westend",
+    Kusama = "kusama",
+    Astar = "astar",
+    JoyStream = "joystream"
+}
+export default Networks;
+export declare function getPolkadotVersionRange(network: string): DeviceFirmwareRange;
+export declare function getPolkadotVersionRangeWithBundle(networks: string[]): DeviceFirmwareRange | {
+    model_mini: {
+        min: string;
+    };
+    model_touch: {
+        min: string;
+    };
+};
+//# sourceMappingURL=networks.d.ts.map

package/dist/api/polkadot/networks.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"networks.d.ts","sourceRoot":"","sources":["../../../src/api/polkadot/networks.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAGvD,aAAK,QAAQ;IACX,QAAQ,aAAa;IACrB,OAAO,YAAY;IACnB,MAAM,WAAW;IACjB,KAAK,UAAU;IACf,SAAS,cAAc;CACxB;AAuBD,eAAe,QAAQ,CAAC;AAExB,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,MAAM,uBAEtD;AAED,wBAAgB,iCAAiC,CAAC,QAAQ,EAAE,MAAM,EAAE;;;;;;;EAKnE"}

package/dist/data-manager/DataManager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DataManager.d.ts","sourceRoot":"","sources":["../../src/data-manager/DataManager.ts"],"names":[],"mappings":"AAYA,OAAO,KAAK,EACV,SAAS,EACT,eAAe,EACf,aAAa,EACb,QAAQ,EACR,wBAAwB,EACxB,qBAAqB,EACrB,gBAAgB,EAChB,aAAa,EAEd,MAAM,UAAU,CAAC;AAGlB,MAAM,MAAM,aAAa,GAAG,UAAU,GAAG,aAAa,GAAG,aAAa,CAAC;AAEvE,MAAM,MAAM,cAAc,GAAG,QAAQ,GAAG,IAAI,CAAC;AAE7C,MAAM,CAAC,OAAO,OAAO,WAAW;IAC9B,MAAM,CAAC,SAAS,EAAE,aAAa,CAiB7B;IAEF,MAAM,CAAC,MAAM,EAAE,SAAS,GAAG,IAAI,CAAQ;IAEvC,MAAM,CAAC,QAAQ,EAAE,eAAe,CAAC;IAEjC,MAAM,CAAC,QAAQ,EAAE;SAAG,OAAO,IAAI,cAAc,GAAG,IAAI;KAAE,CAGpD;IAEF,MAAM,CAAC,kBAAkB,SAAK;IAE9B,MAAM,CAAC,iBAAiB,aAAc,QAAQ,KAAG,qBAAqB,CAepE;IAMF,MAAM,CAAC,4BAA4B,aAAc,QAAQ,oBAAoB,OAAO,wBAmBlF;IAMF,MAAM,CAAC,kBAAkB,aAAc,QAAQ,wBAa7C;IAEF,MAAM,CAAC,qBAAqB,aAAc,QAAQ,wBAYhD;IAEF,MAAM,CAAC,0BAA0B,aAAc,QAAQ,KAAG,aAAa,GAAG,SAAS,CAWjF;IAEF,MAAM,CAAC,mCAAmC,aAAc,QAAQ,KAAG,aAAa,GAAG,SAAS,CAc1F;IAEF,MAAM,CAAC,oBAAoB,aAAc,QAAQ;;;QAkB/C;IAEF,MAAM,CAAC,wBAAwB,aAAc,QAAQ,yDAmBnD;IAEF,MAAM,CAAC,oBAAoB,aAAc,QAAQ,KAAG,wBAAwB,CAY1E;IAEF,MAAM,CAAC,uBAAuB,aAAc,QAAQ;;;QAWlD;IAEF,MAAM,CAAC,2BAA2B,aAAc,QAAQ,4DAItD;IAEF,MAAM,CAAC,kBAAkB,iBAAkB,MAAM,KAAG,gBAAgB,CAKlE;WAEW,IAAI,CAAC,QAAQ,EAAE,eAAe;WA+B9B,kBAAkB;IAQ/B,MAAM,CAAC,mBAAmB,CAAC,cAAc,GAAE,cAAyB,GAAG,IAAI;IAI3E,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,EAAE,SAAS,GAAG,eAAe;IAEpD,MAAM,CAAC,WAAW,CAAC,CAAC,SAAS,MAAM,eAAe,EAAE,GAAG,EAAE,CAAC,GAAG,eAAe,CAAC,CAAC,CAAC;IAU/E,MAAM,CAAC,YAAY,QAAS,eAAe,CAAC,KAAK,CAAC,aACH;CAChD"}
+{"version":3,"file":"DataManager.d.ts","sourceRoot":"","sources":["../../src/data-manager/DataManager.ts"],"names":[],"mappings":"AAYA,OAAO,KAAK,EACV,SAAS,EACT,eAAe,EACf,aAAa,EACb,QAAQ,EACR,wBAAwB,EACxB,qBAAqB,EACrB,gBAAgB,EAChB,aAAa,EAEd,MAAM,UAAU,CAAC;AAGlB,MAAM,MAAM,aAAa,GAAG,UAAU,GAAG,aAAa,GAAG,aAAa,CAAC;AAEvE,MAAM,MAAM,cAAc,GAAG,QAAQ,GAAG,IAAI,CAAC;AAE7C,MAAM,CAAC,OAAO,OAAO,WAAW;IAC9B,MAAM,CAAC,SAAS,EAAE,aAAa,CAqB7B;IAEF,MAAM,CAAC,MAAM,EAAE,SAAS,GAAG,IAAI,CAAQ;IAEvC,MAAM,CAAC,QAAQ,EAAE,eAAe,CAAC;IAEjC,MAAM,CAAC,QAAQ,EAAE;SAAG,OAAO,IAAI,cAAc,GAAG,IAAI;KAAE,CAGpD;IAEF,MAAM,CAAC,kBAAkB,SAAK;IAE9B,MAAM,CAAC,iBAAiB,aAAc,QAAQ,KAAG,qBAAqB,CAepE;IAMF,MAAM,CAAC,4BAA4B,aAAc,QAAQ,oBAAoB,OAAO,wBAmBlF;IAMF,MAAM,CAAC,kBAAkB,aAAc,QAAQ,wBAa7C;IAEF,MAAM,CAAC,qBAAqB,aAAc,QAAQ,wBAYhD;IAEF,MAAM,CAAC,0BAA0B,aAAc,QAAQ,KAAG,aAAa,GAAG,SAAS,CAWjF;IAEF,MAAM,CAAC,mCAAmC,aAAc,QAAQ,KAAG,aAAa,GAAG,SAAS,CAc1F;IAEF,MAAM,CAAC,oBAAoB,aAAc,QAAQ;;;QAkB/C;IAEF,MAAM,CAAC,wBAAwB,aAAc,QAAQ,yDAmBnD;IAEF,MAAM,CAAC,oBAAoB,aAAc,QAAQ,KAAG,wBAAwB,CAY1E;IAEF,MAAM,CAAC,uBAAuB,aAAc,QAAQ;;;QAWlD;IAEF,MAAM,CAAC,2BAA2B,aAAc,QAAQ,4DAItD;IAEF,MAAM,CAAC,kBAAkB,iBAAkB,MAAM,KAAG,gBAAgB,CAKlE;WAEW,IAAI,CAAC,QAAQ,EAAE,eAAe;WAgC9B,kBAAkB;IAQ/B,MAAM,CAAC,mBAAmB,CAAC,cAAc,GAAE,cAAyB,GAAG,IAAI;IAI3E,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,EAAE,SAAS,GAAG,eAAe;IAEpD,MAAM,CAAC,WAAW,CAAC,CAAC,SAAS,MAAM,eAAe,EAAE,GAAG,EAAE,CAAC,GAAG,eAAe,CAAC,CAAC,CAAC;IAU/E,MAAM,CAAC,YAAY,QAAS,eAAe,CAAC,KAAK,CAAC,aACH;CAChD"}

package/dist/device/DeviceCommands.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DeviceCommands.d.ts","sourceRoot":"","sources":["../../src/device/DeviceCommands.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,QAAQ,EAAe,MAAM,wBAAwB,CAAC;AAK/E,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAGvC,KAAK,WAAW,GAAG,QAAQ,CAAC,WAAW,CAAC;AACxC,KAAK,UAAU,GAAG,MAAM,WAAW,CAAC;AACpC,MAAM,MAAM,oBAAoB,CAAC,CAAC,SAAS,UAAU,IAAI;IACvD,IAAI,EAAE,CAAC,CAAC;IACR,OAAO,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC;CACzB,CAAC;AACF,KAAK,oBAAoB,GAAG;KACzB,CAAC,IAAI,MAAM,WAAW,GAAG,oBAAoB,CAAC,CAAC,CAAC;CAClD,CAAC;AACF,MAAM,MAAM,sBAAsB,GAAG,oBAAoB,CAAC,MAAM,WAAW,CAAC,CAAC;AAE7E,MAAM,MAAM,wBAAwB,GAAG;IACrC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB,CAAC;AAcF,qBAAa,cAAc;IACzB,MAAM,EAAE,MAAM,CAAC;IAEf,SAAS,EAAE,SAAS,CAAC;IAErB,MAAM,EAAE,MAAM,CAAC;IAEf,QAAQ,EAAE,OAAO,CAAC;IAElB,WAAW,CAAC,EAAE,OAAO,CAAC,sBAAsB,CAAC,CAAC;IAE9C,kBAAkB,CAAC,EAAE,CAAC,KAAK,CAAC,EAAE,GAAG,KAAK,IAAI,CAAC;gBAE/B,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM;IAOpC,OAAO,CAAC,aAAa,EAAE,OAAO;IAU9B,IAAI,CACR,IAAI,EAAE,UAAU,EAChB,GAAG,GAAE,sBAAsB,CAAC,SAAS,CAAM,GAC1C,OAAO,CAAC,sBAAsB,CAAC;IAqClC,SAAS,CAAC,CAAC,SAAS,UAAU,EAAE,CAAC,SAAS,UAAU,EAAE,EACpD,IAAI,EAAE,CAAC,EACP,OAAO,EAAE,CAAC,EACV,GAAG,CAAC,EAAE,WAAW,CAAC,CAAC,CAAC,GACnB,OAAO,CAAC,oBAAoB,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;IAE3C,SAAS,CAAC,CAAC,SAAS,UAAU,EAAE,CAAC,SAAS,UAAU,EAClD,IAAI,EAAE,CAAC,EACP,OAAO,EAAE,CAAC,EACV,GAAG,CAAC,EAAE,WAAW,CAAC,CAAC,CAAC,GACnB,OAAO,CAAC,oBAAoB,CAAC,CAAC,CAAC,CAAC;IA8C7B,WAAW,CAAC,IAAI,EAAE,UAAU,EAAE,GAAG,CAAC,EAAE,sBAAsB,CAAC,SAAS,CAAC;IAK3E,kBAAkB,CAChB,GAAG,EAAE,sBAAsB,EAC3B,QAAQ,EAAE,UAAU,GACnB,OAAO,CAAC,sBAAsB,CAAC;IA0HlC,UAAU,CAAC,IAAI,CAAC,EAAE,QAAQ,CAAC,oBAAoB;IAwB/C,iBAAiB;CA2BlB;AAED,MAAM,MAAM,SAAS,GAAG,cAAc,CAAC,WAAW,CAAC,CAAC"}
+{"version":3,"file":"DeviceCommands.d.ts","sourceRoot":"","sources":["../../src/device/DeviceCommands.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,QAAQ,EAAe,MAAM,wBAAwB,CAAC;AAK/E,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAGvC,KAAK,WAAW,GAAG,QAAQ,CAAC,WAAW,CAAC;AACxC,KAAK,UAAU,GAAG,MAAM,WAAW,CAAC;AACpC,MAAM,MAAM,oBAAoB,CAAC,CAAC,SAAS,UAAU,IAAI;IACvD,IAAI,EAAE,CAAC,CAAC;IACR,OAAO,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC;CACzB,CAAC;AACF,KAAK,oBAAoB,GAAG;KACzB,CAAC,IAAI,MAAM,WAAW,GAAG,oBAAoB,CAAC,CAAC,CAAC;CAClD,CAAC;AACF,MAAM,MAAM,sBAAsB,GAAG,oBAAoB,CAAC,MAAM,WAAW,CAAC,CAAC;AAE7E,MAAM,MAAM,wBAAwB,GAAG;IACrC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB,CAAC;AAcF,qBAAa,cAAc;IACzB,MAAM,EAAE,MAAM,CAAC;IAEf,SAAS,EAAE,SAAS,CAAC;IAErB,MAAM,EAAE,MAAM,CAAC;IAEf,QAAQ,EAAE,OAAO,CAAC;IAElB,WAAW,CAAC,EAAE,OAAO,CAAC,sBAAsB,CAAC,CAAC;IAE9C,kBAAkB,CAAC,EAAE,CAAC,KAAK,CAAC,EAAE,GAAG,KAAK,IAAI,CAAC;gBAE/B,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM;IAOpC,OAAO,CAAC,aAAa,EAAE,OAAO;IAU9B,IAAI,CACR,IAAI,EAAE,UAAU,EAChB,GAAG,GAAE,sBAAsB,CAAC,SAAS,CAAM,GAC1C,OAAO,CAAC,sBAAsB,CAAC;IA2ClC,SAAS,CAAC,CAAC,SAAS,UAAU,EAAE,CAAC,SAAS,UAAU,EAAE,EACpD,IAAI,EAAE,CAAC,EACP,OAAO,EAAE,CAAC,EACV,GAAG,CAAC,EAAE,WAAW,CAAC,CAAC,CAAC,GACnB,OAAO,CAAC,oBAAoB,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;IAE3C,SAAS,CAAC,CAAC,SAAS,UAAU,EAAE,CAAC,SAAS,UAAU,EAClD,IAAI,EAAE,CAAC,EACP,OAAO,EAAE,CAAC,EACV,GAAG,CAAC,EAAE,WAAW,CAAC,CAAC,CAAC,GACnB,OAAO,CAAC,oBAAoB,CAAC,CAAC,CAAC,CAAC;IA8C7B,WAAW,CAAC,IAAI,EAAE,UAAU,EAAE,GAAG,CAAC,EAAE,sBAAsB,CAAC,SAAS,CAAC;IAK3E,kBAAkB,CAChB,GAAG,EAAE,sBAAsB,EAC3B,QAAQ,EAAE,UAAU,GACnB,OAAO,CAAC,sBAAsB,CAAC;IA0HlC,UAAU,CAAC,IAAI,CAAC,EAAE,QAAQ,CAAC,oBAAoB;IAwB/C,iBAAiB;CA2BlB;AAED,MAAM,MAAM,SAAS,GAAG,cAAc,CAAC,WAAW,CAAC,CAAC"}

package/dist/index.d.ts

@@ -82,7 +82,7 @@ type SearchDevice = {
 };
 type Device$1 = KnownDevice;
 type Features = Messages.Features;
-type IDeviceType = 'classic' | 'mini' | 'touch' | 'pro';
+type IDeviceType = 'classic' | 'classic1s' | 'mini' | 'touch' | 'pro';
 type IDeviceModel = 'model_mini' | 'model_touch';
 declare const DeviceModelToTypes: {
     [deviceModel in IDeviceModel]: IDeviceType[];

package/dist/index.js

@@ -813,11 +813,12 @@ const validatePath = (path, length = 0, base = false) => {
 };
 
 const DeviceModelToTypes = {
-    model_mini: ['classic', 'mini'],
+    model_mini: ['classic', 'classic1s', 'mini'],
     model_touch: ['touch', 'pro'],
 };
 const DeviceTypeToModels = {
     classic: ['model_mini'],
+    classic1s: ['model_mini'],
     mini: ['model_mini'],
     touch: ['model_touch'],
     pro: ['model_touch'],
@@ -6465,6 +6466,58 @@ var nested$1 = {
 			battery_level: {
 				type: "uint32",
 				id: 520
+			},
+			onekey_device_type: {
+				type: "OneKeyDeviceType",
+				id: 600
+			},
+			onekey_se_type: {
+				type: "OneKeySeType",
+				id: 601
+			},
+			onekey_board_version: {
+				type: "string",
+				id: 602
+			},
+			onekey_board_hash: {
+				type: "bytes",
+				id: 603
+			},
+			onekey_boot_version: {
+				type: "string",
+				id: 604
+			},
+			onekey_boot_hash: {
+				type: "bytes",
+				id: 605
+			},
+			onekey_se_version: {
+				type: "string",
+				id: 606
+			},
+			onekey_se_hash: {
+				type: "bytes",
+				id: 607
+			},
+			onekey_se_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
 			}
 		},
 		nested: {
@@ -6491,6 +6544,21 @@ var nested$1 = {
 					Capability_ShamirGroups: 16,
 					Capability_PassphraseEntry: 17
 				}
+			},
+			OneKeyDeviceType: {
+				values: {
+					CLASSIC: 0,
+					CLASSIC1S: 1,
+					MINI: 2,
+					TOUCH: 3,
+					TOUCH_PRO: 4
+				}
+			},
+			OneKeySeType: {
+				values: {
+					THD89: 0,
+					SE608A: 1
+				}
 			}
 		}
 	},
@@ -22845,6 +22913,7 @@ class DataManager {
                 });
                 this.deviceMap = {
                     classic: data.classic,
+                    classic1s: data.classic1s,
                     mini: data.mini,
                     touch: data.touch,
                     pro: data.pro,
@@ -22884,6 +22953,10 @@ DataManager.deviceMap = {
         firmware: [],
         ble: [],
     },
+    classic1s: {
+        firmware: [],
+        ble: [],
+    },
     mini: {
         firmware: [],
         ble: [],
@@ -23080,9 +23153,21 @@ const getDeviceModel = (features) => {
     return 'model_touch';
 };
 const getDeviceType = (features) => {
-    if (!features || typeof features !== 'object' || !features.serial_no) {
+    if (!features || typeof features !== 'object') {
         return 'classic';
     }
+    switch (features.onekey_device_type) {
+        case 'CLASSIC':
+            return 'classic';
+        case 'CLASSIC1S':
+            return 'classic1s';
+        case 'MINI':
+            return 'mini';
+        case 'TOUCH_PRO':
+            return 'pro';
+    }
+    if (!features.serial_no)
+        return 'classic';
     const serialNo = features.serial_no;
     const miniFlag = serialNo.slice(0, 2);
     if (miniFlag.toLowerCase() === 'mi')
@@ -23113,6 +23198,8 @@ const getDeviceTypeByDeviceId = (deviceId) => {
 const getDeviceUUID = (features) => {
     var _a, _b;
     const deviceType = getDeviceType(features);
+    if (features.onekey_serial_no)
+        return features.onekey_serial_no;
     if (deviceType === 'classic') {
         return (_a = features.onekey_serial) !== null && _a !== void 0 ? _a : '';
     }
@@ -23126,12 +23213,17 @@ const getDeviceLabel = (features) => {
     return `My OneKey ${deviceType.charAt(0).toUpperCase() + deviceType.slice(1)}`;
 };
 const getDeviceFirmwareVersion = (features) => {
+    var _a, _b, _c;
     if (!features)
         return [0, 0, 0];
     if (features.onekey_version) {
         return features.onekey_version.split('.');
     }
-    return [features.major_version, features.minor_version, features.patch_version];
+    return [
+        (_a = features.major_version) !== null && _a !== void 0 ? _a : '0',
+        (_b = features.minor_version) !== null && _b !== void 0 ? _b : '0',
+        (_c = features.patch_version) !== null && _c !== void 0 ? _c : '0',
+    ];
 };
 const getDeviceBLEFirmwareVersion = (features) => {
     if (!features.ble_ver) {
@@ -23186,7 +23278,7 @@ const supportInputPinOnSoftware = (features) => {
     if (!features)
         return { support: false };
     const deviceType = getDeviceType(features);
-    if (deviceType === 'touch') {
+    if (deviceType === 'touch' || deviceType === 'pro') {
         return { support: false };
     }
     const currentVersion = getDeviceFirmwareVersion(features).join('.');
@@ -23716,7 +23808,7 @@ class DeviceCommands {
         });
     }
     call(type, msg = {}) {
-        var _a, _b, _c, _d, _e, _f, _g;
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
             Log$6.debug('[DeviceCommands] [call] Sending', type);
             try {
@@ -23736,17 +23828,19 @@ class DeviceCommands {
                         },
                     };
                 }
-                if ((_a = error.response) === null || _a === void 0 ? void 0 : _a.data) {
-                    Log$6.debug('error response', error === null || error === void 0 ? void 0 : error.response.data);
+                const responseData = (_a = error === null || error === void 0 ? void 0 : error.response) === null || _a === void 0 ? void 0 : _a.data;
+                const responseError = responseData === null || responseData === void 0 ? void 0 : responseData.error;
+                if (responseData) {
+                    Log$6.debug('error response', responseData);
                 }
-                if (((_c = (_b = error === null || error === void 0 ? void 0 : error.response) === null || _b === void 0 ? void 0 : _b.data) === null || _c === void 0 ? void 0 : _c.error) === 'device disconnected during action') {
+                if (responseError === 'device disconnected during action') {
                     return { type: 'BridgeNetworkError', message: {} };
                 }
-                if (((_f = (_e = (_d = error === null || error === void 0 ? void 0 : error.response) === null || _d === void 0 ? void 0 : _d.data) === null || _e === void 0 ? void 0 : _e.error) === null || _f === void 0 ? void 0 : _f.indexOf('Request failed with status code')) !== -1) {
+                if (responseError && responseError.indexOf('Request failed with status code') !== -1) {
                     return {
                         type: 'CallMethodError',
                         message: {
-                            error: (_g = error === null || error === void 0 ? void 0 : error.response.data) !== null && _g !== void 0 ? _g : '',
+                            error: responseData !== null && responseData !== void 0 ? responseData : '',
                         },
                     };
                 }
@@ -26741,7 +26835,7 @@ class ConfluxGetAddress extends BaseMethod {
         validateParams(payload, [{ name: 'bundle', type: 'array' }]);
         this.params = [];
         payload.bundle.forEach((batch) => {
-            var _a;
+            var _a, _b;
             const addressN = validatePath(batch.path, 3);
             validateParams(batch, [
                 { name: 'path', required: true },
@@ -26751,7 +26845,7 @@ class ConfluxGetAddress extends BaseMethod {
             const showOnOneKey = (_a = batch.showOnOneKey) !== null && _a !== void 0 ? _a : true;
             this.params.push({
                 address_n: addressN,
-                chain_id: batch.chainId,
+                chain_id: (_b = batch.chainId) !== null && _b !== void 0 ? _b : 1029,
                 show_display: showOnOneKey,
             });
         });
@@ -30690,6 +30784,43 @@ class FilecoinSignTransaction extends BaseMethod {
     }
 }
 
+var Networks;
+(function (Networks) {
+    Networks["Polkadot"] = "polkadot";
+    Networks["Westend"] = "westend";
+    Networks["Kusama"] = "kusama";
+    Networks["Astar"] = "astar";
+    Networks["JoyStream"] = "joystream";
+})(Networks || (Networks = {}));
+const baseVersionRange = {
+    model_mini: {
+        min: '3.0.0',
+    },
+    model_touch: {
+        min: '4.3.0',
+    },
+};
+const specialVersionRange = {
+    [Networks.JoyStream]: {
+        model_mini: {
+            min: '3.6.0',
+        },
+        model_touch: {
+            min: '4.7.0',
+        },
+    },
+};
+function getPolkadotVersionRange(network) {
+    var _a;
+    return (_a = specialVersionRange[network]) !== null && _a !== void 0 ? _a : baseVersionRange;
+}
+function getPolkadotVersionRangeWithBundle(networks) {
+    if (networks.includes(Networks.JoyStream)) {
+        return specialVersionRange[Networks.JoyStream];
+    }
+    return baseVersionRange;
+}
+
 class PolkadotGetAddress extends BaseMethod {
     constructor() {
         super(...arguments);
@@ -30723,14 +30854,8 @@ class PolkadotGetAddress extends BaseMethod {
         });
     }
     getVersionRange() {
-        return {
-            model_mini: {
-                min: '3.0.0',
-            },
-            model_touch: {
-                min: '4.3.0',
-            },
-        };
+        const networks = this.params.map(param => param.network);
+        return getPolkadotVersionRangeWithBundle(networks);
     }
     run() {
         return __awaiter(this, void 0, void 0, function* () {
@@ -30777,14 +30902,7 @@ class PolkadotSignTransaction extends BaseMethod {
         };
     }
     getVersionRange() {
-        return {
-            model_mini: {
-                min: '3.0.0',
-            },
-            model_touch: {
-                min: '4.3.0',
-            },
-        };
+        return getPolkadotVersionRange(this.params.network);
     }
     run() {
         return __awaiter(this, void 0, void 0, function* () {

package/dist/types/device.d.ts

@@ -30,7 +30,7 @@ export type SearchDevice = {
 };
 export type Device = KnownDevice;
 export type Features = PROTO.Features;
-export type IDeviceType = 'classic' | 'mini' | 'touch' | 'pro';
+export type IDeviceType = 'classic' | 'classic1s' | 'mini' | 'touch' | 'pro';
 export type IDeviceModel = 'model_mini' | 'model_touch';
 export declare const DeviceModelToTypes: {
     [deviceModel in IDeviceModel]: IDeviceType[];

package/dist/types/device.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"device.d.ts","sourceRoot":"","sources":["../../src/types/device.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"device.d.ts","sourceRoot":"","sources":["../../src/types/device.ts"],"names":[],"mappings":"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"}

package/dist/utils/deviceFeaturesUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"deviceFeaturesUtils.d.ts","sourceRoot":"","sources":["../../src/utils/deviceFeaturesUtils.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAC1D,OAAO,KAAK,EACV,QAAQ,EACR,YAAY,EACZ,WAAW,EACX,aAAa,EACb,kBAAkB,EACnB,MAAM,UAAU,CAAC;AAElB,OAAoB,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAEzF,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAE1C,eAAO,MAAM,cAAc,cAAe,QAAQ,KAAG,YAcpD,CAAC;AAEF,eAAO,MAAM,aAAa,cAAe,QAAQ,KAAG,WAUnD,CAAC;AAEF,eAAO,MAAM,yBAAyB,cAAe,QAAQ,KAAG,WACvC,CAAC;AAE1B,eAAO,MAAM,sBAAsB,UAAW,MAAM,KAAG,WAAW,GAAG,IAKpE,CAAC;AAEF,eAAO,MAAM,uBAAuB,cAAe,MAAM,KAAG,WAQ3D,CAAC;AAEF,eAAO,MAAM,aAAa,aAAc,QAAQ,WAM/C,CAAC;AAEF,eAAO,MAAM,cAAc,aAAc,QAAQ,WAOhD,CAAC;AAKF,eAAO,MAAM,wBAAwB,aAAc,QAAQ,GAAG,SAAS,kBAOtE,CAAC;AAKF,eAAO,MAAM,2BAA2B,aAAc,QAAQ,KAAG,aAAa,GAAG,IAQhF,CAAC;AAEF,eAAO,MAAM,0BAA0B,aAAc,QAAQ,kBAW5D,CAAC;AAEF,eAAO,MAAM,wBAAwB,aACzB,QAAQ,GAAG,SAAS,KAC7B;IAAE,QAAQ,EAAE,IAAI,CAAC;IAAC,cAAc,EAAE,cAAc,CAAA;CAiClD,CAAC;AAEF,eAAO,MAAM,yBAAyB,aAAc,QAAQ,KAAG,kBAU9D,CAAC;AAEF,eAAO,MAAM,oBAAoB,cAAe,QAAQ,KAAG,kBAW1D,CAAC;AAEF,eAAO,MAAM,uCAAuC,WAAkB,MAAM,4BAY3E,CAAC;AAEF,eAAO,MAAM,kBAAkB,aACnB,QAAQ,GAAG,SAAS,YACpB,cAAc,4BAgBzB,CAAC;AAEF,eAAO,MAAM,qBAAqB,cAAe,QAAQ,KAAG,OAU3D,CAAC;AAEF,eAAO,MAAM,uBAAuB,cAAe,QAAQ,KAAG,kBAU7D,CAAC;AAKF,eAAO,MAAM,sBAAsB;cAKvB,QAAQ;gBACN,UAAU,GAAG,KAAK;;MAE5B,KAAK,GAAG,aAsBX,CAAC"}
+{"version":3,"file":"deviceFeaturesUtils.d.ts","sourceRoot":"","sources":["../../src/utils/deviceFeaturesUtils.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAC1D,OAAO,KAAK,EACV,QAAQ,EACR,YAAY,EACZ,WAAW,EACX,aAAa,EACb,kBAAkB,EACnB,MAAM,UAAU,CAAC;AAElB,OAAoB,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAEzF,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAE1C,eAAO,MAAM,cAAc,cAAe,QAAQ,KAAG,YAcpD,CAAC;AAEF,eAAO,MAAM,aAAa,cAAe,QAAQ,KAAG,WA0BnD,CAAC;AAEF,eAAO,MAAM,yBAAyB,cAAe,QAAQ,KAAG,WACvC,CAAC;AAE1B,eAAO,MAAM,sBAAsB,UAAW,MAAM,KAAG,WAAW,GAAG,IAKpE,CAAC;AAEF,eAAO,MAAM,uBAAuB,cAAe,MAAM,KAAG,WAQ3D,CAAC;AAEF,eAAO,MAAM,aAAa,aAAc,QAAQ,WAS/C,CAAC;AAEF,eAAO,MAAM,cAAc,aAAc,QAAQ,WAOhD,CAAC;AAKF,eAAO,MAAM,wBAAwB,aAAc,QAAQ,GAAG,SAAS,kBAWtE,CAAC;AAKF,eAAO,MAAM,2BAA2B,aAAc,QAAQ,KAAG,aAAa,GAAG,IAQhF,CAAC;AAEF,eAAO,MAAM,0BAA0B,aAAc,QAAQ,kBAW5D,CAAC;AAEF,eAAO,MAAM,wBAAwB,aACzB,QAAQ,GAAG,SAAS,KAC7B;IAAE,QAAQ,EAAE,IAAI,CAAC;IAAC,cAAc,EAAE,cAAc,CAAA;CAiClD,CAAC;AAEF,eAAO,MAAM,yBAAyB,aAAc,QAAQ,KAAG,kBAU9D,CAAC;AAEF,eAAO,MAAM,oBAAoB,cAAe,QAAQ,KAAG,kBAW1D,CAAC;AAEF,eAAO,MAAM,uCAAuC,WAAkB,MAAM,4BAY3E,CAAC;AAEF,eAAO,MAAM,kBAAkB,aACnB,QAAQ,GAAG,SAAS,YACpB,cAAc,4BAgBzB,CAAC;AAEF,eAAO,MAAM,qBAAqB,cAAe,QAAQ,KAAG,OAU3D,CAAC;AAEF,eAAO,MAAM,uBAAuB,cAAe,QAAQ,KAAG,kBAU7D,CAAC;AAKF,eAAO,MAAM,sBAAsB;cAKvB,QAAQ;gBACN,UAAU,GAAG,KAAK;;MAE5B,KAAK,GAAG,aAsBX,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-core",
-  "version": "0.3.31",
+  "version": "0.3.33",
   "description": "> TODO: description",
   "author": "OneKey",
   "homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
@@ -25,8 +25,8 @@
     "url": "https://github.com/OneKeyHQ/hardware-js-sdk/issues"
   },
   "dependencies": {
-    "@onekeyfe/hd-shared": "^0.3.31",
-    "@onekeyfe/hd-transport": "^0.3.31",
+    "@onekeyfe/hd-shared": "^0.3.33",
+    "@onekeyfe/hd-transport": "^0.3.33",
     "axios": "^0.27.2",
     "bignumber.js": "^9.0.2",
     "bytebuffer": "^5.0.1",
@@ -44,5 +44,5 @@
     "@types/semver": "^7.3.9",
     "ripple-keypairs": "^1.1.4"
   },
-  "gitHead": "75a2c413110960f086b1d3e3ac81134711c0be9f"
+  "gitHead": "c0c2cfa956cd00a1f9ff2ac7bdd8ed1c3f8e0cf3"
 }

package/src/api/conflux/ConfluxGetAddress.ts

@@ -32,7 +32,7 @@ export default class ConfluxGetAddress extends BaseMethod<HardwareConfluxGetAddr
 
       this.params.push({
         address_n: addressN,
-        chain_id: batch.chainId,
+        chain_id: batch.chainId ?? 1029,
         show_display: showOnOneKey,
       });
     });

package/src/api/polkadot/PolkadotGetAddress.ts

@@ -4,6 +4,7 @@ import { serializedPath, validatePath } from '../helpers/pathUtils';
 import { BaseMethod } from '../BaseMethod';
 import { validateParams } from '../helpers/paramsValidator';
 import { PolkadotAddress, PolkadotGetAddressParams } from '../../types';
+import { getPolkadotVersionRangeWithBundle } from './networks';
 
 export default class PolkadotGetAddress extends BaseMethod<HardwarePolkadotGetAddress[]> {
   hasBundle = false;
@@ -43,14 +44,8 @@ export default class PolkadotGetAddress extends BaseMethod<HardwarePolkadotGetAd
   }
 
   getVersionRange() {
-    return {
-      model_mini: {
-        min: '3.0.0',
-      },
-      model_touch: {
-        min: '4.3.0',
-      },
-    };
+    const networks = this.params.map(param => param.network);
+    return getPolkadotVersionRangeWithBundle(networks);
   }
 
   async run() {

package/src/api/polkadot/PolkadotSignTransaction.ts

@@ -4,6 +4,7 @@ import { BaseMethod } from '../BaseMethod';
 import { validateParams } from '../helpers/paramsValidator';
 import { PolkadotSignTransactionParams } from '../../types';
 import { formatAnyHex } from '../helpers/hexUtils';
+import { getPolkadotVersionRange } from './networks';
 
 export default class PolkadotSignTransaction extends BaseMethod<HardwarePolkadotSignTx> {
   hasBundle = false;
@@ -31,14 +32,7 @@ export default class PolkadotSignTransaction extends BaseMethod<HardwarePolkadot
   }
 
   getVersionRange() {
-    return {
-      model_mini: {
-        min: '3.0.0',
-      },
-      model_touch: {
-        min: '4.3.0',
-      },
-    };
+    return getPolkadotVersionRange(this.params.network);
   }
 
   async run() {

package/src/api/polkadot/networks.ts

@@ -0,0 +1,44 @@
+import type { DeviceFirmwareRange } from '../../types';
+
+// 100% sure which networks are supported
+enum Networks {
+  Polkadot = 'polkadot',
+  Westend = 'westend',
+  Kusama = 'kusama',
+  Astar = 'astar',
+  JoyStream = 'joystream',
+}
+
+// All polkadot networks are included in no special case
+const baseVersionRange = {
+  model_mini: {
+    min: '3.0.0',
+  },
+  model_touch: {
+    min: '4.3.0',
+  },
+};
+
+const specialVersionRange: Record<string, DeviceFirmwareRange> = {
+  [Networks.JoyStream]: {
+    model_mini: {
+      min: '3.6.0',
+    },
+    model_touch: {
+      min: '4.7.0',
+    },
+  },
+};
+
+export default Networks;
+
+export function getPolkadotVersionRange(network: string) {
+  return specialVersionRange[network] ?? baseVersionRange;
+}
+
+export function getPolkadotVersionRangeWithBundle(networks: string[]) {
+  if (networks.includes(Networks.JoyStream)) {
+    return specialVersionRange[Networks.JoyStream];
+  }
+  return baseVersionRange;
+}

package/src/data/messages/messages.json

@@ -5631,6 +5631,58 @@
         "battery_level": {
           "type": "uint32",
           "id": 520
+        },
+        "onekey_device_type": {
+          "type": "OneKeyDeviceType",
+          "id": 600
+        },
+        "onekey_se_type": {
+          "type": "OneKeySeType",
+          "id": 601
+        },
+        "onekey_board_version": {
+          "type": "string",
+          "id": 602
+        },
+        "onekey_board_hash": {
+          "type": "bytes",
+          "id": 603
+        },
+        "onekey_boot_version": {
+          "type": "string",
+          "id": 604
+        },
+        "onekey_boot_hash": {
+          "type": "bytes",
+          "id": 605
+        },
+        "onekey_se_version": {
+          "type": "string",
+          "id": 606
+        },
+        "onekey_se_hash": {
+          "type": "bytes",
+          "id": 607
+        },
+        "onekey_se_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
         }
       },
       "nested": {
@@ -5657,6 +5709,21 @@
             "Capability_ShamirGroups": 16,
             "Capability_PassphraseEntry": 17
           }
+        },
+        "OneKeyDeviceType": {
+          "values": {
+            "CLASSIC": 0,
+            "CLASSIC1S": 1,
+            "MINI": 2,
+            "TOUCH": 3,
+            "TOUCH_PRO": 4
+          }
+        },
+        "OneKeySeType": {
+          "values": {
+            "THD89": 0,
+            "SE608A": 1
+          }
         }
       }
     },

package/src/data-manager/DataManager.ts

@@ -33,6 +33,10 @@ export default class DataManager {
       firmware: [],
       ble: [],
     },
+    classic1s: {
+      firmware: [],
+      ble: [],
+    },
     mini: {
       firmware: [],
       ble: [],
@@ -262,6 +266,7 @@ export default class DataManager {
       );
       this.deviceMap = {
         classic: data.classic,
+        classic1s: data.classic1s,
         mini: data.mini,
         touch: data.touch,
         pro: data.pro,

package/src/device/DeviceCommands.ts

@@ -87,17 +87,23 @@ export class DeviceCommands {
           },
         } as any;
       }
-      if (error.response?.data) {
-        Log.debug('error response', error?.response.data);
+
+      const responseData = error?.response?.data;
+      const responseError = responseData?.error;
+
+      if (responseData) {
+        Log.debug('error response', responseData);
       }
-      if (error?.response?.data?.error === 'device disconnected during action') {
+      if (responseError === 'device disconnected during action') {
         return { type: 'BridgeNetworkError', message: {} } as any;
       }
-      if (error?.response?.data?.error?.indexOf('Request failed with status code') !== -1) {
+
+      // undefined.indexOf('...') !== -1 Always true
+      if (responseError && responseError.indexOf('Request failed with status code') !== -1) {
         return {
           type: 'CallMethodError',
           message: {
-            error: error?.response.data ?? '',
+            error: responseData ?? '',
           },
         } as any;
       }

package/src/types/device.ts

@@ -71,19 +71,20 @@ export type Device = KnownDevice;
 
 export type Features = PROTO.Features;
 
-export type IDeviceType = 'classic' | 'mini' | 'touch' | 'pro';
+export type IDeviceType = 'classic' | 'classic1s' | 'mini' | 'touch' | 'pro';
 
 // model_mini: 'classic' | 'mini'
 // model_touch: 'touch' | 'pro'
 export type IDeviceModel = 'model_mini' | 'model_touch';
 
 export const DeviceModelToTypes: { [deviceModel in IDeviceModel]: IDeviceType[] } = {
-  model_mini: ['classic', 'mini'],
+  model_mini: ['classic', 'classic1s', 'mini'],
   model_touch: ['touch', 'pro'],
 };
 
 export const DeviceTypeToModels: { [deviceType in IDeviceType]: IDeviceModel[] } = {
   classic: ['model_mini'],
+  classic1s: ['model_mini'],
   mini: ['model_mini'],
   touch: ['model_touch'],
   pro: ['model_touch'],

package/src/utils/deviceFeaturesUtils.ts

@@ -31,10 +31,26 @@ export const getDeviceModel = (features?: Features): IDeviceModel => {
 };
 
 export const getDeviceType = (features?: Features): IDeviceType => {
-  if (!features || typeof features !== 'object' || !features.serial_no) {
+  if (!features || typeof features !== 'object') {
     return 'classic';
   }
 
+  // classic1s 3.5.0
+  switch (features.onekey_device_type) {
+    case 'CLASSIC':
+      return 'classic';
+    case 'CLASSIC1S':
+      return 'classic1s';
+    case 'MINI':
+      return 'mini';
+    case 'TOUCH_PRO':
+      return 'pro';
+    default:
+    // other
+  }
+
+  // low version hardware
+  if (!features.serial_no) return 'classic';
   const serialNo = features.serial_no;
   const miniFlag = serialNo.slice(0, 2);
   if (miniFlag.toLowerCase() === 'mi') return 'mini';
@@ -64,6 +80,9 @@ export const getDeviceTypeByDeviceId = (deviceId?: string): IDeviceType => {
 
 export const getDeviceUUID = (features: Features) => {
   const deviceType = getDeviceType(features);
+
+  if (features.onekey_serial_no) return features.onekey_serial_no;
+
   if (deviceType === 'classic') {
     return features.onekey_serial ?? '';
   }
@@ -88,7 +107,11 @@ export const getDeviceFirmwareVersion = (features: Features | undefined): IVersi
   if (features.onekey_version) {
     return features.onekey_version.split('.') as unknown as IVersionArray;
   }
-  return [features.major_version, features.minor_version, features.patch_version];
+  return [
+    features.major_version ?? '0',
+    features.minor_version ?? '0',
+    features.patch_version ?? '0',
+  ];
 };
 
 /**
@@ -158,7 +181,7 @@ export const supportInputPinOnSoftware = (features: Features): SupportFeatureTyp
   if (!features) return { support: false };
 
   const deviceType = getDeviceType(features);
-  if (deviceType === 'touch') {
+  if (deviceType === 'touch' || deviceType === 'pro') {
     return { support: false };
   }