@onekeyfe/hd-core 1.2.0-alpha.77 → 1.2.0-alpha.79

package/__tests__/check-all-firmware-release-protocol-v2.test.ts

@@ -5,7 +5,6 @@ import CheckAllFirmwareRelease, {
 } from '../src/api/CheckAllFirmwareRelease';
 import { DataManager } from '../src/data-manager';
 import { createCoreApi } from '../src/inject';
-import { PROTOCOL_V2_RESOURCE_DEVICE_PATHS } from '../src/protocols/protocol-v2/resources';
 
 import type { CoreApi } from '../src/types/api';
 import type { DeviceStateVersions, IFirmwareReleaseInfo } from '../src/types';
@@ -73,67 +72,8 @@ const release: IFirmwareReleaseInfo = {
   ],
 };
 
-const stableResources = ['images', 'animation', 'wallpaper', 'translations', 'roobert', 'noto'].map(
-  (type, index) => ({
-    type,
-    url: `https://example.com/${type}.okpkg`,
-    size: 0x52a0 + index + 1,
-    fileHash: 'a'.repeat(64),
-    headerHash: index.toString(16).padStart(128, '0'),
-  })
-);
-
-const createFilesystemTypedCall = (missingAll = false) => {
-  const resourceByPath = new Map(
-    stableResources.map(resource => [
-      PROTOCOL_V2_RESOURCE_DEVICE_PATHS[
-        resource.type as keyof typeof PROTOCOL_V2_RESOURCE_DEVICE_PATHS
-      ],
-      resource,
-    ])
-  );
-  return jest.fn((requestType: string, _responseType: string, payload: Record<string, any>) => {
-    if (requestType === 'ResourceInventoryGet') {
-      throw new Error('ResourceInventoryGet is unavailable on released firmware');
-    }
-    if (requestType === 'FilesystemPathInfoQuery') {
-      const resource = resourceByPath.get(payload.path);
-      return {
-        message: {
-          exist: Boolean(resource) && !missingAll,
-          directory: false,
-          size: missingAll ? 0 : resource?.size,
-        },
-      };
-    }
-    if (requestType === 'FilesystemFileRead') {
-      const resource = resourceByPath.get(payload.file.path);
-      if (!resource || missingAll) throw new Error('missing resource');
-      const header = new Uint8Array(0x52a0);
-      const view = new DataView(header.buffer);
-      'OKPP'.split('').forEach((char, index) => {
-        header[index] = char.charCodeAt(0);
-      });
-      'RESC'.split('').forEach((char, index) => {
-        header[0x08 + index] = char.charCodeAt(0);
-      });
-      view.setUint32(0x0c, header.byteLength, true);
-      for (let index = 0; index < resource.headerHash.length / 2; index++) {
-        header[0x240 + index] = Number.parseInt(
-          resource.headerHash.slice(index * 2, index * 2 + 2),
-          16
-        );
-      }
-      const offset = Number(payload.file.offset);
-      const chunkLength = Number(payload.chunk_len);
-      return {
-        message: {
-          data: header.slice(offset, offset + chunkLength),
-        },
-      };
-    }
-    throw new Error(`Unexpected request: ${requestType}`);
-  });
+const resourceSource = {
+  manifestUrl: 'https://example.com/pro2-resource/manifest.json',
 };
 
 describe('checkAllFirmwareRelease Protocol V2 support', () => {
@@ -370,7 +310,7 @@ describe('checkAllFirmwareRelease Protocol V2 support', () => {
       status: { mode: 'normal' },
       versions: currentVersions,
     });
-    const typedCall = createFilesystemTypedCall(true);
+    const typedCall = jest.fn();
     method.device = {
       isProtocolV2: () => true,
       features: {
@@ -381,13 +321,14 @@ describe('checkAllFirmwareRelease Protocol V2 support', () => {
       getCommands: () => ({ typedCall }),
     } as unknown as CheckAllFirmwareRelease['device'];
     jest.spyOn(DataManager, 'getFirmwareLatestRelease').mockReturnValue(release);
-    jest.spyOn(DataManager, 'getProtocolV2Resources').mockReturnValue(stableResources as any);
+    jest.spyOn(DataManager, 'getProtocolV2ResourceSource').mockReturnValue(resourceSource);
 
     await expect(method.run()).resolves.toMatchObject({
       protocol: 'V2',
       deviceType: 'pro2',
       status: 'required',
       resourceStatus: 'unknown',
+      resourceManifestUrl: resourceSource.manifestUrl,
       targetsToUpdate: ['boot', 'app_v1'],
       firmware: {
         status: 'required',
@@ -437,7 +378,7 @@ describe('checkAllFirmwareRelease Protocol V2 support', () => {
       getCommands: () => ({ typedCall: jest.fn() }),
     } as unknown as CheckAllFirmwareRelease['device'];
     jest.spyOn(DataManager, 'getFirmwareLatestRelease').mockReturnValue(packageSet);
-    jest.spyOn(DataManager, 'getProtocolV2Resources').mockReturnValue(undefined);
+    jest.spyOn(DataManager, 'getProtocolV2ResourceSource').mockReturnValue(undefined);
 
     await expect(method.run()).resolves.toMatchObject({
       status: 'outdated',
@@ -449,7 +390,7 @@ describe('checkAllFirmwareRelease Protocol V2 support', () => {
   });
 
   test.each(['bootloader', 'romloader'] as const)(
-    'uses filesystem inventory in %s mode instead of forcing all resources',
+    'does not read vol0 resource inventory in %s mode',
     async mode => {
       const method = new CheckAllFirmwareRelease({
         id: 1,
@@ -459,7 +400,7 @@ describe('checkAllFirmwareRelease Protocol V2 support', () => {
         },
       });
       method.init();
-      const typedCall = createFilesystemTypedCall();
+      const typedCall = jest.fn();
       method.device = {
         isProtocolV2: () => true,
         features: { deviceType: 'pro2', firmwareVersion: '1.0.0' },
@@ -471,15 +412,15 @@ describe('checkAllFirmwareRelease Protocol V2 support', () => {
         getCommands: () => ({ typedCall }),
       } as unknown as CheckAllFirmwareRelease['device'];
       jest.spyOn(DataManager, 'getFirmwareLatestRelease').mockReturnValue(release);
-      jest.spyOn(DataManager, 'getProtocolV2Resources').mockReturnValue(stableResources as any);
+      jest.spyOn(DataManager, 'getProtocolV2ResourceSource').mockReturnValue(resourceSource);
 
       await expect(method.run()).resolves.toMatchObject({
         protocol: 'V2',
-        resourceStatus: 'valid',
+        resourceStatus: 'unknown',
+        resourceManifestUrl: resourceSource.manifestUrl,
         targetsToUpdate: ['boot', 'app_v1'],
       });
-      expect(typedCall.mock.calls.some(call => call[0] === 'ResourceInventoryGet')).toBe(false);
-      expect(typedCall.mock.calls.some(call => call[0] === 'FilesystemFileRead')).toBe(true);
+      expect(typedCall).not.toHaveBeenCalled();
     }
   );
 

package/__tests__/device-state-mapper.test.ts

@@ -1,5 +1,10 @@
 import { EDeviceType, EFirmwareType } from '@onekeyfe/hd-shared';
-import { DeviceType, Enum_SafetyCheckLevel } from '@onekeyfe/hd-transport';
+import {
+  DeviceSEState,
+  DeviceSeType,
+  DeviceType,
+  Enum_SafetyCheckLevel,
+} from '@onekeyfe/hd-transport';
 
 import {
   mapApplySettingsToState,
@@ -119,6 +124,11 @@ describe('DeviceStateMapper', () => {
           bt_adv_name: 'Pro2 1234',
           application: { version: '1.2.3' },
         },
+        se1: {
+          type: DeviceSeType.THD89,
+          state: DeviceSEState.APP,
+          application: { version: '3.0.0', build_id: 'se1-build', hash: [0x05, 0x06] },
+        },
       } as ProtocolV2DeviceInfo,
       'normal'
     );
@@ -140,6 +150,11 @@ describe('DeviceStateMapper', () => {
       applicationP1Hash: '0102',
       applicationP2BuildId: 'p2-build',
       applicationP2Hash: '0304',
+      se01BuildId: 'se1-build',
+      se01Hash: '0506',
+    });
+    expect(patch.securityElements).toMatchObject({
+      se01: { type: 'THD89', state: 'APP' },
     });
     expect(patch).toMatchObject({ protocolVersion: 2 });
     expect(patch.status?.unlocked).toBeUndefined();

package/__tests__/device-state-projector.test.ts

@@ -33,6 +33,17 @@ describe('DeviceStateProjector', () => {
       firmware: '5.0.0',
       bootloader: '2.0.0',
       ble: '1.2.3',
+      se01: '3.1.0',
+      se01Boot: '1.0.2',
+    };
+    state.verification = {
+      firmwareBuildId: 'firmware-build',
+      firmwareHash: 'firmware-hash',
+      se01BuildId: 'se01-build',
+      se01Hash: 'se01-hash',
+    };
+    state.securityElements = {
+      se01: { type: 'THD89', state: 'APP' },
     };
 
     const features = projectFeatures(state);
@@ -43,6 +54,15 @@ describe('DeviceStateProjector', () => {
       unlocked: true,
       brightness: 80,
       firmwareVersion: '5.0.0',
+      onekey_firmware_version: '5.0.0',
+      onekey_firmware_build_id: 'firmware-build',
+      onekey_firmware_hash: 'firmware-hash',
+      onekey_se_type: 'THD89',
+      onekey_se01_version: '3.1.0',
+      onekey_se01_build_id: 'se01-build',
+      onekey_se01_hash: 'se01-hash',
+      onekey_se01_state: 'APP',
+      onekey_se01_boot_version: '1.0.2',
     });
   });
 

package/__tests__/device-state-store.test.ts

@@ -1,6 +1,7 @@
 import { EDeviceType, EFirmwareType } from '@onekeyfe/hd-shared';
 
 import { DeviceStateStore, createEmptyDeviceState } from '../src/device/DeviceStateStore';
+import { projectFeatures } from '../src/device/DeviceStateProjector';
 
 describe('DeviceStateStore', () => {
   test('merges identity patches and ignores undefined', () => {
@@ -79,4 +80,30 @@ describe('DeviceStateStore', () => {
       protocolV2DeviceInfo: deviceInfo,
     });
   });
+
+  test('merges partial secure-element patches without discarding existing metadata', () => {
+    const store = new DeviceStateStore(createEmptyDeviceState());
+
+    store.update(
+      {
+        securityElements: {
+          se01: { type: 'THD89', state: 'APP' },
+          se02: { type: 'SE608A', state: 'APP' },
+        },
+      },
+      'device-info'
+    );
+    const result = store.update({ securityElements: { se01: { state: 'BOOT' } } }, 'device-status');
+
+    expect(result.state.securityElements).toEqual({
+      se01: { type: 'THD89', state: 'BOOT' },
+      se02: { type: 'SE608A', state: 'APP' },
+    });
+    expect(result.changedKeys).toContain('securityElements');
+    expect(projectFeatures(result.state)).toMatchObject({
+      onekey_se_type: 'THD89',
+      onekey_se01_state: 'BOOT',
+      onekey_se02_state: 'APP',
+    });
+  });
 });

package/__tests__/homescreen.test.ts

@@ -22,6 +22,15 @@ describe('getHomeScreenSize', () => {
     ).toBeUndefined();
   });
 
+  it('uses the Protocol V2 wallpaper dimensions for Neo', () => {
+    expect(
+      getHomeScreenSize({
+        deviceType: EDeviceType.Neo,
+        homeScreenType: 'WallPaper',
+      })
+    ).toEqual({ width: 604, height: 1024 });
+  });
+
   it('does not reuse the wallpaper homeScreenType for Pro 2 NFT dimensions', () => {
     expect(
       getHomeScreenSize({
@@ -49,6 +58,14 @@ describe('getNftSize', () => {
     });
   });
 
+  it('uses the Protocol V2 NFT dimensions for Neo', () => {
+    expect(getNftSize({ deviceType: EDeviceType.Neo })).toEqual({ width: 540, height: 540 });
+    expect(getNftSize({ deviceType: EDeviceType.Neo, thumbnail: true })).toEqual({
+      width: 263,
+      height: 263,
+    });
+  });
+
   it('preserves the legacy NFT dimensions', () => {
     expect(getNftSize({ deviceType: EDeviceType.Touch })).toEqual({ width: 480, height: 800 });
     expect(getNftSize({ deviceType: EDeviceType.Touch, thumbnail: true })).toEqual({

package/__tests__/method-protocol-support.test.ts

@@ -1,7 +1,7 @@
 import { EFirmwareType, HardwareErrorCode } from '@onekeyfe/hd-shared';
 
 import { BaseMethod } from '../src/api/BaseMethod';
-import { findMethod } from '../src/api/utils';
+import { findMethod, getMethodSupportedProtocols } from '../src/api/utils';
 import BTCGetAddress from '../src/api/btc/BTCGetAddress';
 import DeviceReboot from '../src/api/protocol-v2/DeviceReboot';
 import SolGetAddress from '../src/api/solana/SolGetAddress';
@@ -129,4 +129,16 @@ describe('method protocol support', () => {
     expect(bitcoin.getVersionRange().pro2).toBeUndefined();
     expect(neurai.getVersionRange().pro2).toBeUndefined();
   });
+
+  test('exposes the dispatcher protocol contract for callers that need a preflight', () => {
+    expect(getMethodSupportedProtocols('solGetAddress')).toEqual(['V1', 'V2']);
+    expect(getMethodSupportedProtocols('stellarGetAddress')).toEqual(['V1']);
+    expect(
+      getMethodSupportedProtocols('btcGetAddress', {
+        path: "m/44'/1900'/0'/0/0",
+        coin: 'Neurai',
+        showOnOneKey: false,
+      })
+    ).toEqual(['V1']);
+  });
 });