@onekeyfe/hd-core 0.3.40-alpha.4 → 0.3.40-alpha.5

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

@@ -1 +1 @@
-{"version":3,"file":"getBinary.d.ts","sourceRoot":"","sources":["../../../src/api/firmware/getBinary.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAOvC,MAAM,WAAW,YAAY;IAC3B,QAAQ,EAAE,QAAQ,CAAC;IACnB,UAAU,EAAE,UAAU,GAAG,KAAK,CAAC;IAC/B,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AAED,UAAU,cAAe,SAAQ,YAAY;IAC3C,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;CACpB;AAED,eAAO,MAAM,SAAS,2DAKnB,cAAc;;;;;;;;;;;;;;;;;;;;EAkChB,CAAC;AAEF,eAAO,MAAM,oBAAoB,QAAe,MAAM;;EAWrD,CAAC;AAEF,eAAO,MAAM,OAAO,4CAA6C,YAAY,2DAY5E,CAAC"}
+{"version":3,"file":"getBinary.d.ts","sourceRoot":"","sources":["../../../src/api/firmware/getBinary.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAOvC,MAAM,WAAW,YAAY;IAC3B,QAAQ,EAAE,QAAQ,CAAC;IACnB,UAAU,EAAE,UAAU,GAAG,KAAK,CAAC;IAC/B,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AAED,UAAU,cAAe,SAAQ,YAAY;IAC3C,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;CACpB;AAED,eAAO,MAAM,SAAS,2DAKnB,cAAc;;;;;;;;;;;;;;;;;;;;EAiChB,CAAC;AAEF,eAAO,MAAM,oBAAoB,QAAe,MAAM;;EAWrD,CAAC;AAEF,eAAO,MAAM,OAAO,4CAA6C,YAAY,2DAY5E,CAAC"}

package/dist/index.d.ts

@@ -2499,7 +2499,7 @@ declare enum LoggerNames {
 }
 declare const getLogger: (key: LoggerNames) => Log;
 
-declare const getHomeScreenHex: (deviceType: IDeviceType, name: string) => any;
+declare const getHomeScreenHex: (deviceType: IDeviceType, name: string) => string;
 
 declare const wait: (ms: number) => Promise<unknown>;
 declare const isBleConnect: (env: string) => boolean;

package/dist/index.js

@@ -6615,7 +6615,6 @@ var nested$1 = {
 					CLASSIC1S: 1,
 					MINI: 2,
 					TOUCH: 3,
-					TOUCH_PRO: 4,
 					PRO: 5
 				}
 			},
@@ -23242,7 +23241,22 @@ const getTouchData = () => ({
 });
 const getHomeScreenHex = (deviceType, name) => {
     var _a, _b;
-    const data = deviceType === 'touch' ? getTouchData() : getT1Data();
+    let data;
+    switch (deviceType) {
+        case 'classic':
+        case 'classic1s':
+        case 'mini':
+            data = getT1Data();
+            break;
+        case 'touch':
+            data = getTouchData();
+            break;
+        case 'pro':
+            data = {};
+            break;
+        default:
+            data = {};
+    }
     return (_b = (_a = data[name]) === null || _a === void 0 ? void 0 : _a.hex) !== null && _b !== void 0 ? _b : '';
 };
 
@@ -23544,10 +23558,8 @@ const getDeviceType = (features) => {
             return 'mini';
         case 'TOUCH':
             return 'touch';
-        case 'TOUCH_PRO':
-            return 'touch';
         case 'PRO':
-            return 'touch';
+            return 'pro';
     }
     if (!features.serial_no)
         return 'classic';
@@ -23568,7 +23580,7 @@ const getDeviceTypeByBleName = (name) => {
     if (name.startsWith('T'))
         return 'touch';
     if (name.startsWith('P'))
-        return 'touch';
+        return 'pro';
     return 'classic';
 };
 const getDeviceTypeByDeviceId = (deviceId) => {
@@ -25717,6 +25729,12 @@ const getBinary = ({ features, updateType, version, isUpdateBootloader, }) => __
     if (!releaseInfo) {
         throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, 'no firmware found for this device');
     }
+    if (version && !semver__default["default"].eq(releaseInfo.version.join('.'), version.join('.'))) {
+        const touchWithoutVersion = getDeviceType(features) === 'touch' && !features.onekey_version;
+        if (!touchWithoutVersion) {
+            throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, 'firmware version mismatch');
+        }
+    }
     const url = updateType === 'ble'
         ?
             releaseInfo.webUpdate
@@ -26762,9 +26780,9 @@ const getCoinAndScriptType = (path, coin, multisig) => {
     };
 };
 
-function doesCoinExistByParams(coinName, params) {
-    for (let i = 0; i < params.length; i++) {
-        const coin_name = params[i];
+function isCoinNameInList(coinName, coinNames) {
+    for (let i = 0; i < coinNames.length; i++) {
+        const coin_name = coinNames[i];
         if ((coin_name === null || coin_name === void 0 ? void 0 : coin_name.toLowerCase()) === (coinName === null || coinName === void 0 ? void 0 : coinName.toLowerCase())) {
             return true;
         }
@@ -26772,7 +26790,7 @@ function doesCoinExistByParams(coinName, params) {
     return false;
 }
 function getBitcoinForkVersionRange(params) {
-    if (doesCoinExistByParams('Neurai', params)) {
+    if (isCoinNameInList('Neurai', params)) {
         return {
             model_mini: {
                 min: '3.7.0',

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,WA8BnD,CAAC;AAEF,eAAO,MAAM,yBAAyB,cAAe,QAAQ,KAAG,WACvC,CAAC;AAE1B,eAAO,MAAM,sBAAsB,UAAW,MAAM,KAAG,WAAW,GAAG,IAMpE,CAAC;AAGF,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,kBActE,CAAC;AAKF,eAAO,MAAM,2BAA2B,aAAc,QAAQ,KAAG,aAAa,GAAG,IAQhF,CAAC;AAEF,eAAO,MAAM,0BAA0B,aAAc,QAAQ,kBAe5D,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,WA4BnD,CAAC;AAEF,eAAO,MAAM,yBAAyB,cAAe,QAAQ,KAAG,WACvC,CAAC;AAE1B,eAAO,MAAM,sBAAsB,UAAW,MAAM,KAAG,WAAW,GAAG,IAMpE,CAAC;AAGF,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,kBActE,CAAC;AAKF,eAAO,MAAM,2BAA2B,aAAc,QAAQ,KAAG,aAAa,GAAG,IAQhF,CAAC;AAEF,eAAO,MAAM,0BAA0B,aAAc,QAAQ,kBAe5D,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/dist/utils/homescreen.d.ts

@@ -1,235 +1,10 @@
 import type { IDeviceType } from '../types';
-export declare const getT1Data: () => {
-    default: {
-        name: string;
-        hex: string;
-    };
-    original: {
-        name: string;
-        hex: string;
-    };
-    circleweb: {
-        name: string;
-        hex: string;
-    };
-    circuit: {
-        name: string;
-        hex: string;
-    };
-    starweb: {
-        name: string;
-        hex: string;
-    };
-    stars: {
-        name: string;
-        hex: string;
-    };
-    bitcoin_b2: {
-        name: string;
-        hex: string;
-    };
-    bitcoin_shade: {
-        name: string;
-        hex: string;
-    };
-    bitcoin_b: {
-        name: string;
-        hex: string;
-    };
-    bitcoin_full: {
-        name: string;
-        hex: string;
-    };
-    bitcat: {
-        name: string;
-        hex: string;
-    };
-    nyancat: {
-        name: string;
-        hex: string;
-    };
-    coffee: {
-        name: string;
-        hex: string;
-    };
-    flower: {
-        name: string;
-        hex: string;
-    };
-    saturn: {
-        name: string;
-        hex: string;
-    };
-    jupiter: {
-        name: string;
-        hex: string;
-    };
-    einstein: {
-        name: string;
-        hex: string;
-    };
-    piggy: {
-        name: string;
-        hex: string;
-    };
-    honeybadger: {
-        name: string;
-        hex: string;
-    };
-    dragon: {
-        name: string;
-        hex: string;
-    };
-    narwal: {
-        name: string;
-        hex: string;
-    };
-    rabbit: {
-        name: string;
-        hex: string;
-    };
-    bunny: {
-        name: string;
-        hex: string;
-    };
-    rooster: {
-        name: string;
-        hex: string;
-    };
-    genesis: {
-        name: string;
-        hex: string;
-    };
-    my_bank: {
-        name: string;
-        hex: string;
-    };
-    candle: {
-        name: string;
-        hex: string;
-    };
-    ancap: {
-        name: string;
-        hex: string;
-    };
-    anonymous: {
-        name: string;
-        hex: string;
-    };
-    mushroom: {
-        name: string;
-        hex: string;
-    };
-    invader: {
-        name: string;
-        hex: string;
-    };
-    mtgox: {
-        name: string;
-        hex: string;
-    };
-    electrum: {
-        name: string;
-        hex: string;
-    };
-    mycelium: {
-        name: string;
-        hex: string;
-    };
-    ethereum: {
-        name: string;
-        hex: string;
-    };
-    litecoin: {
-        name: string;
-        hex: string;
-    };
-    myetherwallet: {
-        name: string;
-        hex: string;
-    };
-    zcash: {
-        name: string;
-        hex: string;
-    };
-    dash: {
-        name: string;
-        hex: string;
-    };
-    bitcoin_cash: {
-        name: string;
-        hex: string;
-    };
-    bitcoin_gold: {
-        name: string;
-        hex: string;
-    };
-    vertcoin: {
-        name: string;
-        hex: string;
-    };
-    namecoin: {
-        name: string;
-        hex: string;
-    };
-    monacoin: {
-        name: string;
-        hex: string;
-    };
-    doge: {
-        name: string;
-        hex: string;
-    };
-    digibyte: {
-        name: string;
-        hex: string;
-    };
-    decred: {
-        name: string;
-        hex: string;
-    };
-    multibit: {
-        name: string;
-        hex: string;
-    };
-    reddit: {
-        name: string;
-        hex: string;
-    };
-    hacker: {
-        name: string;
-        hex: string;
-    };
-    polis: {
-        name: string;
-        hex: string;
-    };
-    carlos: {
-        name: string;
-        hex: string;
-    };
-    xrc: {
-        name: string;
-        hex: string;
-    };
+type IScreenData = {
+    name: string;
+    hex: string;
 };
-export declare const getTouchData: () => {
-    'wallpaper-1': {
-        name: string;
-        hex: string;
-    };
-    'wallpaper-2': {
-        name: string;
-        hex: string;
-    };
-    'wallpaper-3': {
-        name: string;
-        hex: string;
-    };
-    'wallpaper-4': {
-        name: string;
-        hex: string;
-    };
-};
-export declare const getHomeScreenHex: (deviceType: IDeviceType, name: string) => any;
+export declare const getT1Data: () => Record<string, IScreenData>;
+export declare const getTouchData: () => Record<string, IScreenData>;
+export declare const getHomeScreenHex: (deviceType: IDeviceType, name: string) => string;
+export {};
 //# sourceMappingURL=homescreen.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"homescreen.d.ts","sourceRoot":"","sources":["../../src/utils/homescreen.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAE5C,eAAO,MAAM,SAAS;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAqNpB,CAAC;AAEH,eAAO,MAAM,YAAY;;;;;;;;;;;;;;;;;CAiBvB,CAAC;AAEH,eAAO,MAAM,gBAAgB,eAAgB,WAAW,QAAQ,MAAM,QAIrE,CAAC"}
+{"version":3,"file":"homescreen.d.ts","sourceRoot":"","sources":["../../src/utils/homescreen.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAE5C,KAAK,WAAW,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,MAAM,CAAA;CAAE,CAAC;AAEjD,eAAO,MAAM,SAAS,QAAO,OAAO,MAAM,EAAE,WAAW,CAqNrD,CAAC;AAEH,eAAO,MAAM,YAAY,QAAO,OAAO,MAAM,EAAE,WAAW,CAiBxD,CAAC;AAEH,eAAO,MAAM,gBAAgB,eAAgB,WAAW,QAAQ,MAAM,WAmBrE,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-core",
-  "version": "0.3.40-alpha.4",
+  "version": "0.3.40-alpha.5",
   "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.40-alpha.4",
-    "@onekeyfe/hd-transport": "^0.3.40-alpha.4",
+    "@onekeyfe/hd-shared": "^0.3.40-alpha.5",
+    "@onekeyfe/hd-transport": "^0.3.40-alpha.5",
     "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": "ca121236c3c500bf59b8ee1908268410e40bc135"
+  "gitHead": "1d25663783754326d2fc99e9a05864cfbc4c3f07"
 }

package/src/api/btc/helpers/versionLimit.ts

@@ -1,6 +1,6 @@
-function doesCoinExistByParams(coinName: string, params: (string | undefined)[]) {
-  for (let i = 0; i < params.length; i++) {
-    const coin_name = params[i];
+function isCoinNameInList(coinName: string, coinNames: (string | undefined)[]) {
+  for (let i = 0; i < coinNames.length; i++) {
+    const coin_name = coinNames[i];
     if (coin_name?.toLowerCase() === coinName?.toLowerCase()) {
       return true;
     }
@@ -9,7 +9,7 @@ function doesCoinExistByParams(coinName: string, params: (string | undefined)[])
 }
 
 export function getBitcoinForkVersionRange(params: (string | undefined)[]) {
-  if (doesCoinExistByParams('Neurai', params)) {
+  if (isCoinNameInList('Neurai', params)) {
     return {
       model_mini: {
         min: '3.7.0',

package/src/api/firmware/getBinary.ts

@@ -30,13 +30,12 @@ export const getBinary = async ({
     throw ERRORS.TypedError(HardwareErrorCode.RuntimeError, 'no firmware found for this device');
   }
 
-  // temporary disable version check
-  // if (version && !semver.eq(releaseInfo.version.join('.'), version.join('.'))) {
-  //   const touchWithoutVersion = getDeviceType(features) === 'touch' && !features.onekey_version;
-  //   if (!touchWithoutVersion) {
-  //     throw ERRORS.TypedError(HardwareErrorCode.RuntimeError, 'firmware version mismatch');
-  //   }
-  // }
+  if (version && !semver.eq(releaseInfo.version.join('.'), version.join('.'))) {
+    const touchWithoutVersion = getDeviceType(features) === 'touch' && !features.onekey_version;
+    if (!touchWithoutVersion) {
+      throw ERRORS.TypedError(HardwareErrorCode.RuntimeError, 'firmware version mismatch');
+    }
+  }
 
   const url =
     // eslint-disable-next-line no-nested-ternary

package/src/data/messages/messages.json

@@ -5766,7 +5766,6 @@
             "CLASSIC1S": 1,
             "MINI": 2,
             "TOUCH": 3,
-            "TOUCH_PRO": 4,
             "PRO": 5
           }
         },

package/src/utils/deviceFeaturesUtils.ts

@@ -45,10 +45,8 @@ export const getDeviceType = (features?: Features): IDeviceType => {
       return 'mini';
     case 'TOUCH':
       return 'touch';
-    case 'TOUCH_PRO':
-      return 'touch';
     case 'PRO':
-      return 'touch';
+      return 'pro';
     default:
     // other
   }
@@ -69,7 +67,7 @@ export const getDeviceTypeByBleName = (name?: string): IDeviceType | null => {
   if (!name) return 'classic';
   if (name.startsWith('MI')) return 'mini';
   if (name.startsWith('T')) return 'touch';
-  if (name.startsWith('P')) return 'touch';
+  if (name.startsWith('P')) return 'pro';
   return 'classic';
 };
 

package/src/utils/homescreen.ts

@@ -1,6 +1,8 @@
 import type { IDeviceType } from '../types';
 
-export const getT1Data = () => ({
+type IScreenData = { name: string; hex: string };
+
+export const getT1Data = (): Record<string, IScreenData> => ({
   default: {
     name: 'default',
     hex: '',
@@ -215,7 +217,7 @@ export const getT1Data = () => ({
   },
 });
 
-export const getTouchData = () => ({
+export const getTouchData = (): Record<string, IScreenData> => ({
   'wallpaper-1': {
     name: 'wallpaper-1',
     hex: '77616c6c70617065722d312e706e67',
@@ -235,7 +237,22 @@ export const getTouchData = () => ({
 });
 
 export const getHomeScreenHex = (deviceType: IDeviceType, name: string) => {
-  const data = deviceType === 'touch' ? getTouchData() : getT1Data();
-  // @ts-expect-errorpect
+  let data: Record<string, IScreenData>;
+  switch (deviceType) {
+    case 'classic':
+    case 'classic1s':
+    case 'mini':
+      data = getT1Data();
+      break;
+    case 'touch':
+      data = getTouchData();
+      break;
+    case 'pro':
+      data = {};
+      break;
+    default:
+      data = {};
+  }
+
   return data[name]?.hex ?? '';
 };