@onekeyfe/hd-core 0.1.39 → 0.1.42

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-core",
-  "version": "0.1.39",
+  "version": "0.1.42",
   "description": "> TODO: description",
   "author": "OneKey",
   "homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
@@ -15,7 +15,6 @@
     "access": "public"
   },
   "scripts": {
-    "test": "echo \"Error: run tests from root\" && exit 1",
     "dev": "rimraf dist && rollup -c ../../build/rollup.config.js -w",
     "build": "rimraf dist && rollup -c ../../build/rollup.config.js",
     "lint": "eslint .",
@@ -25,8 +24,8 @@
     "url": "https://github.com/OneKeyHQ/hardware-js-sdk/issues"
   },
   "dependencies": {
-    "@onekeyfe/hd-shared": "^0.1.39",
-    "@onekeyfe/hd-transport": "^0.1.39",
+    "@onekeyfe/hd-shared": "^0.1.42",
+    "@onekeyfe/hd-transport": "^0.1.42",
     "axios": "^0.27.2",
     "bignumber.js": "^9.0.2",
     "js-sha256": "^0.9.0",
@@ -37,5 +36,5 @@
     "@types/parse-uri": "^1.0.0",
     "@types/semver": "^7.3.9"
   },
-  "gitHead": "abaee3140debec0a263b2b87c5ffcddfa534b443"
+  "gitHead": "fa65f27f4d043ebf89f03bd98393a9cb3a010199"
 }

package/src/api/BaseMethod.ts

@@ -1,4 +1,4 @@
-import { supportInputPinOnSoftware } from '../utils/deviceFeaturesUtils';
+import { supportInputPinOnSoftware, getDeviceType } from '../utils/deviceFeaturesUtils';
 import { createDeviceMessage } from '../events/device';
 import { UI_REQUEST } from '../constants/ui-request';
 import { Device } from '../device/Device';
@@ -6,6 +6,9 @@ import DeviceConnector from '../device/DeviceConnector';
 import { DeviceFirmwareRange } from '../types';
 import { CoreMessage, createFirmwareMessage, DEVICE, FIRMWARE } from '../events';
 import { getBleFirmwareReleaseInfo, getFirmwareReleaseInfo } from './firmware/releaseHelper';
+import { getLogger, LoggerNames } from '../utils';
+
+const Log = getLogger(LoggerNames.Method);
 
 export abstract class BaseMethod<Params = undefined> {
   responseID: number;
@@ -129,5 +132,24 @@ export abstract class BaseMethod<Params = undefined> {
     );
   }
 
+  /**
+   * Check the level of safety_check when performing transactions on the test network on touch
+   * @returns {void}
+   */
+  async checkSafetyLevelOnTestNet() {
+    const deviceType = getDeviceType(this.device.features);
+    if (deviceType !== 'touch') return;
+    let checkFlag = false;
+    if (this.name === 'evmSignTransaction' && Number(this.payload?.transaction?.chainId) !== 1) {
+      checkFlag = true;
+    }
+    if (checkFlag && this.device.features?.safety_checks === 'Strict') {
+      Log.debug('will change safety_checks level');
+      await this.device.commands.typedCall('ApplySettings', 'Success', {
+        safety_checks: 'PromptTemporarily',
+      });
+    }
+  }
+
   dispose() {}
 }

package/src/api/device/DeviceSettings.ts

@@ -16,7 +16,7 @@ export default class DeviceSettings extends BaseMethod<ApplySettings> {
       { name: 'autoLockDelayMs', type: 'number' },
       { name: 'displayRotation', type: 'number' },
       { name: 'passphraseAlwaysOnDevice', type: 'boolean' },
-      { name: 'safetyChecks', type: 'object' },
+      { name: 'safetyChecks', type: 'number' },
       { name: 'experimentalFeatures', type: 'boolean' },
     ]);
 

package/src/core/index.ts

@@ -1,7 +1,13 @@
 import semver from 'semver';
 import EventEmitter from 'events';
 import { Features, OneKeyDeviceInfo } from '@onekeyfe/hd-transport';
-import { createDeferred, Deferred, ERRORS, HardwareErrorCode } from '@onekeyfe/hd-shared';
+import {
+  createDeferred,
+  Deferred,
+  ERRORS,
+  HardwareError,
+  HardwareErrorCode,
+} from '@onekeyfe/hd-shared';
 import {
   getDeviceFirmwareVersion,
   getDeviceModel,
@@ -236,6 +242,19 @@ export const callAPI = async (message: CoreMessage) => {
         }
       }
 
+      // Check the level of safety_check when performing transactions on the test network on touch
+      try {
+        await method.checkSafetyLevelOnTestNet();
+      } catch (e) {
+        const error =
+          e instanceof HardwareError
+            ? e
+            : ERRORS.TypedError(HardwareErrorCode.RuntimeError, 'open safety check failed.');
+        messageResponse = createResponseMessage(method.responseID, false, { error });
+        _callPromise?.resolve(messageResponse);
+        return;
+      }
+
       try {
         const response: object = await method.run();
         Log.debug('Call API - Inner Method Run: ');

package/src/data-manager/connectSettings.ts

@@ -19,7 +19,7 @@ const initialSettings: ConnectSettings = {
   trustedHost: false,
   connectSrc: DEFAULT_DOMAIN,
   iframeSrc: `${DEFAULT_DOMAIN}iframe.html`,
-  parentOrigin: window.location ? window.location.origin : '',
+  parentOrigin: window && window.location ? window.location.origin : '',
   supportedBrowser:
     typeof navigator !== 'undefined' ? !/Trident|MSIE|Edge/.test(navigator.userAgent) : true,
   env: 'web',

package/src/device/Device.ts

@@ -261,12 +261,18 @@ export class Device extends EventEmitter {
 
     const deviceId = _deviceId || this.features?.device_id;
     if (!deviceId) return undefined;
+    if (!this.passphraseState) return undefined;
 
-    const key = `${deviceId}`;
     const usePassKey = `${deviceId}@${this.passphraseState}`;
-    // When creating a wallet, use device_id as the key
-    const session = deviceSessionCache[key] ?? deviceSessionCache[usePassKey];
-    return this.passphraseState ? session : undefined;
+
+    if (!deviceSessionCache[usePassKey]) {
+      const key = `${deviceId}`;
+      if (deviceSessionCache[key]) {
+        deviceSessionCache[usePassKey] = deviceSessionCache[key];
+      }
+    }
+
+    return deviceSessionCache[usePassKey];
   }
 
   setInternalState(state: string, initSession?: boolean) {