@onekeyfe/hd-core 0.2.40 → 0.2.42

package/src/api/evm/EVMSignTypedData.ts

@@ -28,7 +28,7 @@ export type EVMSignTypedDataParams = {
 export default class EVMSignTypedData extends BaseMethod<EVMSignTypedDataParams> {
   init() {
     this.checkDeviceId = true;
-    this.allowDeviceMode = [...this.allowDeviceMode, UI_REQUEST.INITIALIZE];
+    this.notAllowDeviceMode = [...this.notAllowDeviceMode, UI_REQUEST.INITIALIZE];
 
     validateParams(this.payload, [
       { name: 'path', required: true },
@@ -186,6 +186,36 @@ export default class EVMSignTypedData extends BaseMethod<EVMSignTypedDataParams>
     };
   }
 
+  hasNestedArrays(item: any): boolean {
+    if (!item) return false;
+
+    if (Array.isArray(item)) {
+      // item is an array
+      for (const element of item) {
+        if (Array.isArray(element)) {
+          // element is a nested array
+          return true;
+        }
+        if (typeof element === 'object' && element !== null) {
+          // element is an object, so check its properties recursively
+          if (this.hasNestedArrays(element)) {
+            return true;
+          }
+        }
+      }
+    } else if (typeof item === 'object' && item !== null) {
+      // item is an object, so check its properties recursively
+      // eslint-disable-next-line no-restricted-syntax
+      for (const property in item) {
+        if (this.hasNestedArrays(item[property])) {
+          return true;
+        }
+      }
+    }
+    // no nested arrays found
+    return false;
+  }
+
   supportSignTyped() {
     const deviceType = getDeviceType(this.device.features);
     if (deviceType === 'classic' || deviceType === 'mini') {
@@ -247,6 +277,41 @@ export default class EVMSignTypedData extends BaseMethod<EVMSignTypedDataParams>
       return Promise.resolve(response.message);
     }
 
+    // Touch Pro Sign NestedArrays
+    const currentVersion = getDeviceFirmwareVersion(this.device.features).join('.');
+    if (this.hasNestedArrays(this.params.data)) {
+      const supportNestedArraysSignVersion = '4.2.0';
+
+      // 4.2.0 is the first version that supports nested arrays in signTypedData
+      if (semver.gte(currentVersion, supportNestedArraysSignVersion)) {
+        validateParams(this.params, [
+          { name: 'domainHash', type: 'hexString', required: true },
+          { name: 'messageHash', type: 'hexString', required: true },
+        ]);
+
+        const { domainHash, messageHash } = this.params;
+
+        const response = await this.device.commands.typedCall(
+          'EthereumSignTypedHash',
+          'EthereumTypedDataSignature',
+          {
+            address_n: addressN,
+            domain_separator_hash: domainHash ?? '',
+            message_hash: messageHash,
+            chain_id: chainId,
+          }
+        );
+
+        return Promise.resolve(response.message);
+      }
+
+      throw ERRORS.TypedError(
+        HardwareErrorCode.CallMethodNeedUpgradeFirmware,
+        `Device firmware version is too low, please update to ${supportNestedArraysSignVersion}`,
+        { current: currentVersion, require: supportNestedArraysSignVersion }
+      );
+    }
+
     // For Touch、Pro we use EthereumSignTypedData
     return this.signTypedData();
   }

package/src/api/evm/EVMVerifyMessage.ts

@@ -7,7 +7,7 @@ import { formatAnyHex } from '../helpers/hexUtils';
 export default class EVMSignMessage extends BaseMethod<EthereumVerifyMessage> {
   init() {
     this.checkDeviceId = true;
-    this.allowDeviceMode = [...this.allowDeviceMode, UI_REQUEST.INITIALIZE];
+    this.notAllowDeviceMode = [...this.notAllowDeviceMode, UI_REQUEST.INITIALIZE];
 
     validateParams(this.payload, [
       { name: 'address', type: 'string', required: true },

package/src/api/filecoin/FilecoinGetAddress.ts

@@ -10,7 +10,7 @@ export default class FilecoinGetAddress extends BaseMethod<HardwareFilecoinGetAd
 
   init() {
     this.checkDeviceId = true;
-    this.allowDeviceMode = [...this.allowDeviceMode, UI_REQUEST.INITIALIZE];
+    this.notAllowDeviceMode = [...this.notAllowDeviceMode, UI_REQUEST.INITIALIZE];
 
     this.hasBundle = !!this.payload?.bundle;
     const payload = this.hasBundle ? this.payload : { bundle: [this.payload] };

package/src/api/filecoin/FilecoinSignTransaction.ts

@@ -10,7 +10,7 @@ export default class FilecoinSignTransaction extends BaseMethod<HardwareFilecoin
 
   init() {
     this.checkDeviceId = true;
-    this.allowDeviceMode = [...this.allowDeviceMode];
+    this.notAllowDeviceMode = [...this.notAllowDeviceMode];
 
     // check payload
     validateParams(this.payload, [

package/src/api/near/NearGetAddress.ts

@@ -10,7 +10,7 @@ export default class NearGetAddress extends BaseMethod<HardwareNearGetAddress[]>
 
   init() {
     this.checkDeviceId = true;
-    this.allowDeviceMode = [...this.allowDeviceMode, UI_REQUEST.INITIALIZE];
+    this.notAllowDeviceMode = [...this.notAllowDeviceMode, UI_REQUEST.INITIALIZE];
 
     this.hasBundle = !!this.payload?.bundle;
     const payload = this.hasBundle ? this.payload : { bundle: [this.payload] };

package/src/api/near/NearSignTransaction.ts

@@ -8,7 +8,7 @@ import { formatAnyHex } from '../helpers/hexUtils';
 export default class NearSignTransaction extends BaseMethod<HardwareNearSignTx> {
   init() {
     this.checkDeviceId = true;
-    this.allowDeviceMode = [...this.allowDeviceMode, UI_REQUEST.INITIALIZE];
+    this.notAllowDeviceMode = [...this.notAllowDeviceMode, UI_REQUEST.INITIALIZE];
 
     // check payload
     validateParams(this.payload, [

package/src/api/nem/NEMGetAddress.ts

@@ -12,7 +12,7 @@ export default class NEMGetAddress extends BaseMethod<HardwareNEMGetAddress[]> {
 
   init() {
     this.checkDeviceId = true;
-    this.allowDeviceMode = [...this.allowDeviceMode, UI_REQUEST.INITIALIZE];
+    this.notAllowDeviceMode = [...this.notAllowDeviceMode, UI_REQUEST.INITIALIZE];
 
     this.hasBundle = !!this.payload?.bundle;
     const payload = this.hasBundle ? this.payload : { bundle: [this.payload] };

package/src/api/nem/NEMSignTransaction.ts

@@ -228,7 +228,7 @@ export default class NEMSignTransaction extends BaseMethod<NEMSignTx> {
 
   init() {
     this.checkDeviceId = true;
-    this.allowDeviceMode = [...this.allowDeviceMode, UI_REQUEST.INITIALIZE];
+    this.notAllowDeviceMode = [...this.notAllowDeviceMode, UI_REQUEST.INITIALIZE];
 
     validateParams(this.payload, [
       { name: 'path', required: true },

package/src/api/polkadot/PolkadotGetAddress.ts

@@ -10,7 +10,7 @@ export default class PolkadotGetAddress extends BaseMethod<HardwarePolkadotGetAd
 
   init() {
     this.checkDeviceId = true;
-    this.allowDeviceMode = [...this.allowDeviceMode];
+    this.notAllowDeviceMode = [...this.notAllowDeviceMode];
 
     this.hasBundle = !!this.payload?.bundle;
     const payload = this.hasBundle ? this.payload : { bundle: [this.payload] };

package/src/api/polkadot/PolkadotSignTransaction.ts

@@ -10,7 +10,7 @@ export default class PolkadotSignTransaction extends BaseMethod<HardwarePolkadot
 
   init() {
     this.checkDeviceId = true;
-    this.allowDeviceMode = [...this.allowDeviceMode];
+    this.notAllowDeviceMode = [...this.notAllowDeviceMode];
 
     // check payload
     validateParams(this.payload, [

package/src/api/solana/SolGetAddress.ts

@@ -10,7 +10,7 @@ export default class SolGetAddress extends BaseMethod<SolanaGetAddress[]> {
 
   init() {
     this.checkDeviceId = true;
-    this.allowDeviceMode = [...this.allowDeviceMode, UI_REQUEST.INITIALIZE];
+    this.notAllowDeviceMode = [...this.notAllowDeviceMode, UI_REQUEST.INITIALIZE];
 
     this.hasBundle = !!this.payload?.bundle;
     const payload = this.hasBundle ? this.payload : { bundle: [this.payload] };

package/src/api/solana/SolSignTransaction.ts

@@ -11,7 +11,7 @@ export default class SolSignTransaction extends BaseMethod<HardwareSolanaSignTx[
 
   init() {
     this.checkDeviceId = true;
-    this.allowDeviceMode = [...this.allowDeviceMode, UI_REQUEST.INITIALIZE];
+    this.notAllowDeviceMode = [...this.notAllowDeviceMode, UI_REQUEST.INITIALIZE];
 
     this.hasBundle = !!this.payload?.bundle;
     const payload = this.hasBundle ? this.payload : { bundle: [this.payload] };

package/src/api/starcoin/StarcoinGetAddress.ts

@@ -10,7 +10,7 @@ export default class StarcoinGetAddress extends BaseMethod<HardwareStarcoinGetAd
 
   init() {
     this.checkDeviceId = true;
-    this.allowDeviceMode = [...this.allowDeviceMode, UI_REQUEST.INITIALIZE];
+    this.notAllowDeviceMode = [...this.notAllowDeviceMode, UI_REQUEST.INITIALIZE];
 
     this.hasBundle = !!this.payload?.bundle;
     const payload = this.hasBundle ? this.payload : { bundle: [this.payload] };

package/src/api/starcoin/StarcoinGetPublicKey.ts

@@ -13,7 +13,7 @@ export default class StarcoinGetPublicKey extends BaseMethod<HardwareStarcoinGet
 
   init() {
     this.checkDeviceId = true;
-    this.allowDeviceMode = [...this.allowDeviceMode, UI_REQUEST.INITIALIZE];
+    this.notAllowDeviceMode = [...this.notAllowDeviceMode, UI_REQUEST.INITIALIZE];
 
     this.hasBundle = !!this.payload?.bundle;
     const payload = this.hasBundle ? this.payload : { bundle: [this.payload] };

package/src/api/starcoin/StarcoinSignMessage.ts

@@ -8,7 +8,7 @@ import { formatAnyHex } from '../helpers/hexUtils';
 export default class StarcoinSignMessage extends BaseMethod<HardwareStarcoinSignMessage> {
   init() {
     this.checkDeviceId = true;
-    this.allowDeviceMode = [...this.allowDeviceMode, UI_REQUEST.INITIALIZE];
+    this.notAllowDeviceMode = [...this.notAllowDeviceMode, UI_REQUEST.INITIALIZE];
 
     // check payload
     validateParams(this.payload, [

package/src/api/starcoin/StarcoinSignTransaction.ts

@@ -8,7 +8,7 @@ import { formatAnyHex } from '../helpers/hexUtils';
 export default class StarcoinSignTransaction extends BaseMethod<StarcoinSignTx> {
   init() {
     this.checkDeviceId = true;
-    this.allowDeviceMode = [...this.allowDeviceMode, UI_REQUEST.INITIALIZE];
+    this.notAllowDeviceMode = [...this.notAllowDeviceMode, UI_REQUEST.INITIALIZE];
 
     // check payload
     validateParams(this.payload, [

package/src/api/starcoin/StarcoinVerifyMessage.ts

@@ -7,7 +7,7 @@ import { formatAnyHex } from '../helpers/hexUtils';
 export default class EVMSignMessage extends BaseMethod<HardwareStarcoinVerifyMessage> {
   init() {
     this.checkDeviceId = true;
-    this.allowDeviceMode = [...this.allowDeviceMode, UI_REQUEST.INITIALIZE];
+    this.notAllowDeviceMode = [...this.notAllowDeviceMode, UI_REQUEST.INITIALIZE];
 
     validateParams(this.payload, [
       { name: 'publicKey', type: 'string', required: true },

package/src/api/stellar/StellarGetAddress.ts

@@ -10,7 +10,7 @@ export default class StellarGetAddress extends BaseMethod<HardwareStellarGetAddr
 
   init() {
     this.checkDeviceId = true;
-    this.allowDeviceMode = [...this.allowDeviceMode, UI_REQUEST.INITIALIZE];
+    this.notAllowDeviceMode = [...this.notAllowDeviceMode, UI_REQUEST.INITIALIZE];
 
     this.hasBundle = !!this.payload?.bundle;
     const payload = this.hasBundle ? this.payload : { bundle: [this.payload] };

package/src/api/stellar/StellarSignTransaction.ts

@@ -149,7 +149,7 @@ export default class StellarSignTransaction extends BaseMethod<HardwareStellarSi
 
   init() {
     this.checkDeviceId = true;
-    this.allowDeviceMode = [...this.allowDeviceMode, UI_REQUEST.INITIALIZE];
+    this.notAllowDeviceMode = [...this.notAllowDeviceMode, UI_REQUEST.INITIALIZE];
 
     // check payload
     validateParams(this.payload, [

package/src/api/sui/SuiGetAddress.ts

@@ -15,7 +15,7 @@ export default class SuiGetAddress extends BaseMethod<HardwareSuiGetAddress[]> {
 
   init() {
     this.checkDeviceId = true;
-    this.allowDeviceMode = [...this.allowDeviceMode, UI_REQUEST.INITIALIZE];
+    this.notAllowDeviceMode = [...this.notAllowDeviceMode, UI_REQUEST.INITIALIZE];
 
     this.hasBundle = !!this.payload?.bundle;
     const payload = this.hasBundle ? this.payload : { bundle: [this.payload] };

package/src/api/sui/SuiGetPublicKey.ts

@@ -9,7 +9,7 @@ export default class SuiGetPublicKey extends BaseMethod<any> {
 
   init() {
     this.checkDeviceId = true;
-    this.allowDeviceMode = [...this.allowDeviceMode, UI_REQUEST.INITIALIZE];
+    this.notAllowDeviceMode = [...this.notAllowDeviceMode, UI_REQUEST.INITIALIZE];
 
     this.hasBundle = !!this.payload?.bundle;
     const payload = this.hasBundle ? this.payload : { bundle: [this.payload] };

package/src/api/sui/SuiSignTransaction.ts

@@ -8,7 +8,7 @@ import { formatAnyHex } from '../helpers/hexUtils';
 export default class SuiSignTransaction extends BaseMethod<HardwareSuiSignTx> {
   init() {
     this.checkDeviceId = true;
-    this.allowDeviceMode = [...this.allowDeviceMode, UI_REQUEST.INITIALIZE];
+    this.notAllowDeviceMode = [...this.notAllowDeviceMode, UI_REQUEST.INITIALIZE];
 
     // check payload
     validateParams(this.payload, [

package/src/api/tron/TronGetAddress.ts

@@ -10,7 +10,7 @@ export default class TronGetAddress extends BaseMethod<HardwareTronGetAddress[]>
 
   init() {
     this.checkDeviceId = true;
-    this.allowDeviceMode = [...this.allowDeviceMode, UI_REQUEST.INITIALIZE];
+    this.notAllowDeviceMode = [...this.notAllowDeviceMode, UI_REQUEST.INITIALIZE];
 
     this.hasBundle = !!this.payload?.bundle;
     const payload = this.hasBundle ? this.payload : { bundle: [this.payload] };

package/src/api/tron/TronSignMessage.ts

@@ -8,7 +8,7 @@ import { stripHexPrefix } from '../helpers/hexUtils';
 export default class TronSignMessage extends BaseMethod<HardwareTronSignMessage> {
   init() {
     this.checkDeviceId = true;
-    this.allowDeviceMode = [...this.allowDeviceMode, UI_REQUEST.INITIALIZE];
+    this.notAllowDeviceMode = [...this.notAllowDeviceMode, UI_REQUEST.INITIALIZE];
 
     // check payload
     validateParams(this.payload, [

package/src/api/tron/TronSignTransaction.ts

@@ -46,7 +46,7 @@ export default class TronSignTransaction extends BaseMethod<TronSignTx> {
 
   init() {
     this.checkDeviceId = true;
-    this.allowDeviceMode = [...this.allowDeviceMode, UI_REQUEST.INITIALIZE];
+    this.notAllowDeviceMode = [...this.notAllowDeviceMode, UI_REQUEST.INITIALIZE];
 
     // check payload
     validateParams(this.payload, [

package/src/api/xrp/XrpGetAddress.ts

@@ -16,7 +16,7 @@ export default class XrpGetAddress extends BaseMethod<
 
   init() {
     this.checkDeviceId = true;
-    this.allowDeviceMode = [...this.allowDeviceMode, UI_REQUEST.INITIALIZE];
+    this.notAllowDeviceMode = [...this.notAllowDeviceMode, UI_REQUEST.INITIALIZE];
 
     this.hasBundle = !!this.payload?.bundle;
     const payload = this.hasBundle ? this.payload : { bundle: [this.payload] };

package/src/api/xrp/XrpSignTransaction.ts

@@ -9,7 +9,7 @@ export default class XrpGetAddress extends BaseMethod<XrpSignTransactionParams>
 
   init() {
     this.checkDeviceId = true;
-    this.allowDeviceMode = [...this.allowDeviceMode, UI_REQUEST.INITIALIZE];
+    this.notAllowDeviceMode = [...this.notAllowDeviceMode, UI_REQUEST.INITIALIZE];
 
     const { payload } = this;
     validateParams(payload, [

package/src/core/index.ts

@@ -151,40 +151,55 @@ export const callAPI = async (message: CoreMessage) => {
       // Type has a higher priority than Model
       const versionRange = versionRangeType ?? versionRangeModel;
 
-      if (versionRange && device.features) {
-        const currentVersion = getDeviceFirmwareVersion(device.features).join('.');
-        if (semver.valid(versionRange.min) && semver.lt(currentVersion, versionRange.min)) {
-          const newVersionUnReleased = DataManager.getFirmwareStatus(device.features);
-          if (newVersionUnReleased === 'none' || newVersionUnReleased === 'valid') {
-            throw ERRORS.TypedError(HardwareErrorCode.NewFirmwareUnRelease);
-          }
-
-          return Promise.reject(
-            ERRORS.TypedError(
-              HardwareErrorCode.CallMethodNeedUpgradeFirmware,
-              `Device firmware version is too low, please update to ${versionRange.min}`,
-              { current: currentVersion, require: versionRange.min }
-            )
-          );
-        }
+      if (device.features) {
+        await DataManager.checkAndReloadData();
+        const newVersionStatus = DataManager.getFirmwareStatus(device.features);
+        const bleVersionStatus = DataManager.getBLEFirmwareStatus(device.features);
         if (
-          versionRange.max &&
-          semver.valid(versionRange.max) &&
-          semver.gte(currentVersion, versionRange.max)
+          (newVersionStatus === 'required' || bleVersionStatus === 'required') &&
+          method.skipForceUpdateCheck === false
         ) {
-          return Promise.reject(
-            ERRORS.TypedError(
-              HardwareErrorCode.CallMethodDeprecated,
-              `Device firmware version is too high, this method has been deprecated in ${versionRange.max}`,
-              { current: currentVersion, deprecated: versionRange.max }
-            )
+          throw ERRORS.TypedError(
+            HardwareErrorCode.NewFirmwareForceUpdate,
+            'Device firmware version is too low, please update to the latest version',
+            { connectId: method.connectId, deviceId: method.deviceId }
           );
         }
+
+        if (versionRange) {
+          const currentVersion = getDeviceFirmwareVersion(device.features).join('.');
+          if (semver.valid(versionRange.min) && semver.lt(currentVersion, versionRange.min)) {
+            if (newVersionStatus === 'none' || newVersionStatus === 'valid') {
+              throw ERRORS.TypedError(HardwareErrorCode.NewFirmwareUnRelease);
+            }
+
+            return Promise.reject(
+              ERRORS.TypedError(
+                HardwareErrorCode.CallMethodNeedUpgradeFirmware,
+                `Device firmware version is too low, please update to ${versionRange.min}`,
+                { current: currentVersion, require: versionRange.min }
+              )
+            );
+          }
+          if (
+            versionRange.max &&
+            semver.valid(versionRange.max) &&
+            semver.gte(currentVersion, versionRange.max)
+          ) {
+            return Promise.reject(
+              ERRORS.TypedError(
+                HardwareErrorCode.CallMethodDeprecated,
+                `Device firmware version is too high, this method has been deprecated in ${versionRange.max}`,
+                { current: currentVersion, deprecated: versionRange.max }
+              )
+            );
+          }
+        }
       }
 
       // check call method mode
       const unexpectedMode = device.hasUnexpectedMode(
-        method.allowDeviceMode,
+        method.notAllowDeviceMode,
         method.requireDeviceMode
       );
       if (unexpectedMode) {

package/src/data-manager/DataManager.ts

@@ -52,6 +52,8 @@ export default class DataManager {
     default: MessagesJSON as unknown as JSON,
   };
 
+  static lastCheckTimestamp = 0;
+
   static getFirmwareStatus = (features: Features): IDeviceFirmwareStatus => {
     const deviceType = getDeviceType(features);
     const deviceFirmwareVersion = getDeviceFirmwareVersion(features);
@@ -207,8 +209,12 @@ export default class DataManager {
   static async load(settings: ConnectSettings) {
     this.settings = settings;
     try {
+      const url = settings.preRelease
+        ? 'https://data.onekey.so/pre-config.json'
+        : 'https://data.onekey.so/config.json';
+
       const { data } = await axios.get<RemoteConfigResponse>(
-        `https://data.onekey.so/config.json?noCache=${getTimeStamp()}`,
+        `${url}?noCache=${getTimeStamp()}`,
         // because of iframe timeout is 10000
         {
           timeout: 7000,
@@ -228,6 +234,14 @@ export default class DataManager {
     }
   }
 
+  static async checkAndReloadData() {
+    if (getTimeStamp() - this.lastCheckTimestamp > 1000 * 60 * 60 * 3) {
+      await this.load(this.settings).then(() => {
+        this.lastCheckTimestamp = getTimeStamp();
+      });
+    }
+  }
+
   static getProtobufMessages() {
     return this.messages.default;
   }

package/src/data-manager/connectSettings.ts

@@ -105,6 +105,10 @@ export const parseConnectSettings = (input: Partial<ConnectSettings> = {}) => {
     settings.timestamp = input.timestamp;
   }
 
+  if (input.preRelease) {
+    settings.preRelease = input.preRelease;
+  }
+
   return settings;
 };
 

package/src/types/settings.ts

@@ -17,6 +17,7 @@ export type ConnectSettings = {
   env: 'node' | 'web' | 'webextension' | 'electron' | 'react-native' | 'webusb';
   timestamp: number;
   isFrame?: boolean;
+  preRelease?: boolean;
 };
 
 export type IVersionArray = [number, number, number];