@onekeyfe/hd-core 0.2.46 → 0.2.48

package/dist/api/firmware/uploadFirmware.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"uploadFirmware.d.ts","sourceRoot":"","sources":["../../../src/api/firmware/uploadFirmware.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAEjD,OAAO,EAAU,WAAW,EAA+B,MAAM,cAAc,CAAC;AAChF,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AACxC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,KAAK,EAAE,SAAS,EAAwB,MAAM,6BAA6B,CAAC;AAuCnF,eAAO,MAAM,cAAc,eAAsB,MAAM,kBAKtD,CAAC;AAEF,eAAO,MAAM,cAAc,eACb,UAAU,GAAG,KAAK,aACnB,SAAS,yBACG,WAAW,KAAK,IAAI,UACnC,MAAM,eACD,MAAM,cAAc,qBAgDlC,CAAC;AAmCF,eAAO,MAAM,cAAc,cAAqB,SAAS,YAAY,MAAM,QAAQ,WAAW,qBAY7F,CAAC;AAEF,eAAO,MAAM,eAAe,cACf,SAAS,yBACG,WAAW,KAAK,IAAI,UACnC,MAAM,UACN,WAAW,qBAwBpB,CAAC;AAEF,eAAO,MAAM,gBAAgB,cAChB,SAAS,yBACG,WAAW,KAAK,IAAI,UACnC,MAAM,UACN,WAAW,qBAQpB,CAAC"}
+{"version":3,"file":"uploadFirmware.d.ts","sourceRoot":"","sources":["../../../src/api/firmware/uploadFirmware.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAEjD,OAAO,EAAU,WAAW,EAA+B,MAAM,cAAc,CAAC;AAChF,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AACxC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,KAAK,EAAE,SAAS,EAAwB,MAAM,6BAA6B,CAAC;AAwCnF,eAAO,MAAM,cAAc,eAAsB,MAAM,kBAKtD,CAAC;AAEF,eAAO,MAAM,cAAc,eACb,UAAU,GAAG,KAAK,aACnB,SAAS,yBACG,WAAW,KAAK,IAAI,UACnC,MAAM,eACD,MAAM,cAAc,qBAiDlC,CAAC;AAmCF,eAAO,MAAM,cAAc,cAAqB,SAAS,YAAY,MAAM,QAAQ,WAAW,qBAY7F,CAAC;AAEF,eAAO,MAAM,eAAe,cACf,SAAS,yBACG,WAAW,KAAK,IAAI,UACnC,MAAM,UACN,WAAW,qBAwBpB,CAAC;AAEF,eAAO,MAAM,gBAAgB,cAChB,SAAS,yBACG,WAAW,KAAK,IAAI,UACnC,MAAM,UACN,WAAW,qBAQpB,CAAC"}

package/dist/index.js

@@ -13410,8 +13410,8 @@ const waitBleInstall = (updateType) => __awaiter(void 0, void 0, void 0, functio
     }
 });
 const uploadFirmware = (updateType, typedCall, postMessage, device, { payload }) => __awaiter(void 0, void 0, void 0, function* () {
-    var _a, _b;
-    if (((_a = device.features) === null || _a === void 0 ? void 0 : _a.major_version) === 1) {
+    const deviceModel = getDeviceModel(device.features);
+    if (deviceModel === 'model_mini') {
         postConfirmationMessage(device);
         postProgressTip(device, 'ConfirmOnDevice', postMessage);
         const eraseCommand = updateType === 'firmware' ? 'FirmwareErase' : 'FirmwareErase_ex';
@@ -13425,7 +13425,7 @@ const uploadFirmware = (updateType, typedCall, postMessage, device, { payload })
         yield waitBleInstall(updateType);
         return message;
     }
-    if (((_b = device.features) === null || _b === void 0 ? void 0 : _b.major_version) === 2) {
+    if (deviceModel === 'model_touch') {
         postConfirmationMessage(device);
         postProgressTip(device, 'ConfirmOnDevice', postMessage);
         const length = payload.byteLength;
@@ -13446,7 +13446,7 @@ const uploadFirmware = (updateType, typedCall, postMessage, device, { payload })
         yield waitBleInstall(updateType);
         return response.message;
     }
-    throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, 'uploadFirmware: unknown major_version');
+    throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, 'uploadFirmware: unknown device model');
 });
 const processResourceRequest = (typedCall, res, data) => __awaiter(void 0, void 0, void 0, function* () {
     if (res.type === 'Success') {
@@ -17155,7 +17155,7 @@ class SuiGetAddress extends BaseMethod {
     getVersionRange() {
         return {
             model_mini: {
-                min: '2.12.0',
+                min: '3.0.0',
             },
             model_touch: {
                 min: '4.3.0',
@@ -17224,7 +17224,7 @@ class SuiGetPublicKey extends BaseMethod {
     getVersionRange() {
         return {
             model_mini: {
-                min: '2.12.0',
+                min: '3.0.0',
             },
             model_touch: {
                 min: '4.3.0',
@@ -17264,7 +17264,7 @@ class SuiSignTransaction extends BaseMethod {
     getVersionRange() {
         return {
             model_mini: {
-                min: '2.12.0',
+                min: '3.0.0',
             },
             model_touch: {
                 min: '4.3.0',
@@ -18305,10 +18305,10 @@ class PolkadotGetAddress extends BaseMethod {
     getVersionRange() {
         return {
             model_mini: {
-                min: '2.11.0',
+                min: '3.0.0',
             },
             model_touch: {
-                min: '4.2.0',
+                min: '4.3.0',
             },
         };
     }
@@ -18359,10 +18359,10 @@ class PolkadotSignTransaction extends BaseMethod {
     getVersionRange() {
         return {
             model_mini: {
-                min: '2.11.0',
+                min: '3.0.0',
             },
             model_touch: {
-                min: '4.2.0',
+                min: '4.3.0',
             },
         };
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-core",
-  "version": "0.2.46",
+  "version": "0.2.48",
   "description": "> TODO: description",
   "author": "OneKey",
   "homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
@@ -24,8 +24,8 @@
     "url": "https://github.com/OneKeyHQ/hardware-js-sdk/issues"
   },
   "dependencies": {
-    "@onekeyfe/hd-shared": "^0.2.46",
-    "@onekeyfe/hd-transport": "^0.2.46",
+    "@onekeyfe/hd-shared": "^0.2.48",
+    "@onekeyfe/hd-transport": "^0.2.48",
     "axios": "^0.27.2",
     "bignumber.js": "^9.0.2",
     "bytebuffer": "^5.0.1",
@@ -43,5 +43,5 @@
     "@types/semver": "^7.3.9",
     "ripple-keypairs": "^1.1.4"
   },
-  "gitHead": "14a5773bffe764d0de7edc505e145c7670be0fcb"
+  "gitHead": "dd25a5d278b46fd4da7f0833fdd8a1f5b18dedff"
 }

package/src/api/firmware/uploadFirmware.ts

@@ -9,6 +9,7 @@ import type { Device } from '../../device/Device';
 import type { TypedCall, TypedResponseMessage } from '../../device/DeviceCommands';
 import { KnownDevice } from '../../types';
 import { bytesToHex } from '../helpers/hexUtils';
+import { getDeviceModel } from '../../utils/deviceFeaturesUtils';
 
 const postConfirmationMessage = (device: Device) => {
   // only if firmware is already installed. fresh device does not require button confirmation
@@ -59,7 +60,8 @@ export const uploadFirmware = async (
   device: Device,
   { payload }: PROTO.FirmwareUpload
 ) => {
-  if (device.features?.major_version === 1) {
+  const deviceModel = getDeviceModel(device.features);
+  if (deviceModel === 'model_mini') {
     postConfirmationMessage(device);
     postProgressTip(device, 'ConfirmOnDevice', postMessage);
     const eraseCommand = updateType === 'firmware' ? 'FirmwareErase' : 'FirmwareErase_ex';
@@ -75,7 +77,7 @@ export const uploadFirmware = async (
     return message;
   }
 
-  if (device.features?.major_version === 2) {
+  if (deviceModel === 'model_touch') {
     postConfirmationMessage(device);
     postProgressTip(device, 'ConfirmOnDevice', postMessage);
     const length = payload.byteLength;
@@ -104,7 +106,7 @@ export const uploadFirmware = async (
     return response.message;
   }
 
-  throw ERRORS.TypedError(HardwareErrorCode.RuntimeError, 'uploadFirmware: unknown major_version');
+  throw ERRORS.TypedError(HardwareErrorCode.RuntimeError, 'uploadFirmware: unknown device model');
 };
 
 const processResourceRequest = async (

package/src/api/polkadot/PolkadotGetAddress.ts

@@ -45,10 +45,10 @@ export default class PolkadotGetAddress extends BaseMethod<HardwarePolkadotGetAd
   getVersionRange() {
     return {
       model_mini: {
-        min: '2.11.0',
+        min: '3.0.0',
       },
       model_touch: {
-        min: '4.2.0',
+        min: '4.3.0',
       },
     };
   }

package/src/api/polkadot/PolkadotSignTransaction.ts

@@ -33,10 +33,10 @@ export default class PolkadotSignTransaction extends BaseMethod<HardwarePolkadot
   getVersionRange() {
     return {
       model_mini: {
-        min: '2.11.0',
+        min: '3.0.0',
       },
       model_touch: {
-        min: '4.2.0',
+        min: '4.3.0',
       },
     };
   }

package/src/api/sui/SuiGetAddress.ts

@@ -49,7 +49,7 @@ export default class SuiGetAddress extends BaseMethod<HardwareSuiGetAddress[]> {
   getVersionRange() {
     return {
       model_mini: {
-        min: '2.12.0',
+        min: '3.0.0',
       },
       model_touch: {
         min: '4.3.0',

package/src/api/sui/SuiGetPublicKey.ts

@@ -39,7 +39,7 @@ export default class SuiGetPublicKey extends BaseMethod<any> {
   getVersionRange() {
     return {
       model_mini: {
-        min: '2.12.0',
+        min: '3.0.0',
       },
       model_touch: {
         min: '4.3.0',

package/src/api/sui/SuiSignTransaction.ts

@@ -30,7 +30,7 @@ export default class SuiSignTransaction extends BaseMethod<HardwareSuiSignTx> {
   getVersionRange() {
     return {
       model_mini: {
-        min: '2.12.0',
+        min: '3.0.0',
       },
       model_touch: {
         min: '4.3.0',