@onekeyfe/hd-core 1.2.0-alpha.66 → 1.2.0-alpha.67

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

@@ -1,4 +1,4 @@
-import { EDeviceType, HardwareErrorCode } from '@onekeyfe/hd-shared';
+import { HardwareErrorCode } from '@onekeyfe/hd-shared';
 import { DeviceType } from '@onekeyfe/hd-transport';
 
 import { Device } from '../src/device/Device';
@@ -43,70 +43,6 @@ const getProtocolV2LoaderInfo = (mode: 'bootloader' | 'romloader') => ({
 });
 
 describe('getDeviceState', () => {
-  test('coalesces concurrent Protocol V2 runtime-context negotiation', async () => {
-    let resolveProtocolInfo:
-      | ((value: { message: typeof protocolV2ApplicationInfo }) => void)
-      | undefined;
-    const typedCall = jest.fn(
-      () =>
-        new Promise<{ message: typeof protocolV2ApplicationInfo }>(resolve => {
-          resolveProtocolInfo = resolve;
-        })
-    );
-    const device = createV2Device(typedCall);
-
-    const first = device.ensureProtocolV2RuntimeContext();
-    const second = device.ensureProtocolV2RuntimeContext();
-    resolveProtocolInfo?.({ message: protocolV2ApplicationInfo });
-
-    await expect(Promise.all([first, second])).resolves.toEqual([
-      protocolV2ApplicationInfo,
-      protocolV2ApplicationInfo,
-    ]);
-    expect(typedCall).toHaveBeenCalledTimes(1);
-    expect(typedCall).toHaveBeenCalledWith('ProtocolInfoRequest', 'ProtocolInfo', {
-      eventless_wallet_session: true,
-    });
-  });
-
-  test('renegotiates Protocol V2 runtime context after transport disconnect', async () => {
-    const typedCall = jest.fn().mockResolvedValue({ message: protocolV2ApplicationInfo });
-    const device = createV2Device(typedCall);
-
-    await device.ensureProtocolV2RuntimeContext();
-    await device.ensureProtocolV2RuntimeContext();
-    device.markTransportDisconnected();
-    await device.ensureProtocolV2RuntimeContext();
-
-    expect(typedCall).toHaveBeenCalledTimes(2);
-  });
-
-  test('rejects every waiter when runtime-context negotiation is invalidated', async () => {
-    let resolveProtocolInfo:
-      | ((value: { message: typeof protocolV2ApplicationInfo }) => void)
-      | undefined;
-    const typedCall = jest.fn(
-      () =>
-        new Promise<{ message: typeof protocolV2ApplicationInfo }>(resolve => {
-          resolveProtocolInfo = resolve;
-        })
-    );
-    const device = createV2Device(typedCall);
-
-    const first = device.ensureProtocolV2RuntimeContext();
-    const second = device.ensureProtocolV2RuntimeContext();
-    const firstExpectation = expect(first).rejects.toMatchObject({
-      errorCode: HardwareErrorCode.DeviceInitializeFailed,
-    });
-    const secondExpectation = expect(second).rejects.toMatchObject({
-      errorCode: HardwareErrorCode.DeviceInitializeFailed,
-    });
-    device.markTransportDisconnected();
-    resolveProtocolInfo?.({ message: protocolV2ApplicationInfo });
-
-    await Promise.all([firstExpectation, secondExpectation]);
-  });
-
   test('does not expose the internal wallet session', async () => {
     const device = createV2Device(jest.fn());
     device.updateState({ protocol: 'V2' }, 'initialize');
@@ -223,20 +159,15 @@ describe('getDeviceState', () => {
         throw new Error(`Unexpected request: ${requestType}`);
       });
       const device = createV2Device(typedCall);
-      device.updateState(
-        {
-          protocol: 'V2',
-          identity: { deviceType: EDeviceType.Pro2 },
-          status: { mode },
-          raw: { protocolV2ProtocolInfo: getProtocolV2LoaderInfo(mode) },
-        },
-        'initialize'
-      );
+      device.updateState({ protocol: 'V2', status: { mode } }, 'initialize');
 
       const state = await device.getDeviceState({ refreshSections: ['status'] });
 
       expect(state.status.mode).toBe(mode);
-      expect(typedCall).not.toHaveBeenCalled();
+      expect(typedCall.mock.calls.map(call => call[0])).toEqual([
+        'DeviceInfoGet',
+        'ProtocolInfoRequest',
+      ]);
     }
   );
 
@@ -256,14 +187,7 @@ describe('getDeviceState', () => {
       return { message: { init_states: true, unlocked: true, device_id: 'device-1' } };
     });
     const device = createV2Device(typedCall);
-    device.updateState(
-      {
-        protocol: 'V2',
-        status: { mode: 'normal' },
-        raw: { protocolV2ProtocolInfo: protocolV2ApplicationInfo },
-      },
-      'initialize'
-    );
+    device.updateState({ protocol: 'V2', status: { mode: 'normal' } }, 'initialize');
 
     const state = await device.getDeviceState({ refreshSections: ['status'] });
 
@@ -281,14 +205,7 @@ describe('getDeviceState', () => {
       },
     });
     const device = createV2Device(typedCall);
-    device.updateState(
-      {
-        protocol: 'V2',
-        status: { mode: 'normal' },
-        raw: { protocolV2ProtocolInfo: protocolV2ApplicationInfo },
-      },
-      'initialize'
-    );
+    device.updateState({ protocol: 'V2', status: { mode: 'normal' } }, 'initialize');
     const onState = jest.fn();
     device.on(DEVICE.STATE, onState);
 
@@ -333,18 +250,13 @@ describe('getDeviceState', () => {
       throw new Error(`Unexpected request: ${requestType}`);
     });
     const device = createV2Device(typedCall);
-    device.updateState(
-      {
-        protocol: 'V2',
-        status: { mode: 'normal' },
-        raw: { protocolV2ProtocolInfo: protocolV2ApplicationInfo },
-      },
-      'initialize'
-    );
+    device.updateState({ protocol: 'V2', status: { mode: 'normal' } }, 'initialize');
 
     const state = await device.getDeviceState({ refreshSections: ['status', 'settings'] });
 
     expect(typedCall.mock.calls.map(call => call[0])).toEqual([
+      'DeviceInfoGet',
+      'ProtocolInfoRequest',
       'DeviceStatusGet',
       'DeviceSettingsGet',
     ]);
@@ -376,11 +288,7 @@ describe('getDeviceState', () => {
     });
     const device = createV2Device(typedCall);
     device.updateState(
-      {
-        protocol: 'V2',
-        status: { mode: 'normal', unlocked: true },
-        raw: { protocolV2ProtocolInfo: protocolV2ApplicationInfo },
-      },
+      { protocol: 'V2', status: { mode: 'normal', unlocked: true } },
       'initialize'
     );
 
@@ -466,34 +374,6 @@ describe('getDeviceState', () => {
     });
   });
 
-  test.each([
-    EDeviceType.Classic,
-    EDeviceType.Classic1s,
-    EDeviceType.ClassicPure,
-    EDeviceType.Mini,
-  ])('keeps the GetFeatures-only firmware path for %s', async deviceType => {
-    const typedCall = jest.fn().mockResolvedValue({
-      message: {
-        onekey_device_type: deviceType.toUpperCase(),
-        initialized: true,
-        onekey_firmware_version: '3.5.0',
-        se_ver: '1.1.0.2',
-      },
-    });
-    const device = createV1Device(typedCall);
-
-    const state = await device.getDeviceState({
-      refreshSections: ['identity', 'versions', 'verification'],
-    });
-
-    expect(typedCall.mock.calls.map(call => call[0])).toEqual(['GetFeatures']);
-    expect(state.versions).toMatchObject({
-      firmware: '3.5.0',
-      se: '1.1.0.2',
-      se01: '1.1.0.2',
-    });
-  });
-
   test('does not clear Protocol V1 firmware details during a later runtime refresh', async () => {
     let getFeaturesCount = 0;
     const typedCall = jest.fn().mockImplementation((requestType: string) => {

package/__tests__/homescreen.test.ts

@@ -1,6 +1,6 @@
 import { EDeviceType } from '@onekeyfe/hd-shared';
 
-import { getHomeScreenSize, getNftSize } from '../src/utils/homescreen';
+import { getHomeScreenSize } from '../src/utils/homescreen';
 
 describe('getHomeScreenSize', () => {
   it('returns the Pro 2 wallpaper dimensions', () => {
@@ -21,44 +21,4 @@ describe('getHomeScreenSize', () => {
       })
     ).toBeUndefined();
   });
-
-  it('does not reuse the wallpaper homeScreenType for Pro 2 NFT dimensions', () => {
-    expect(
-      getHomeScreenSize({
-        deviceType: EDeviceType.Pro2,
-        homeScreenType: 'Nft',
-        thumbnail: false,
-      })
-    ).toEqual({ width: 604, height: 1024 });
-    expect(
-      getHomeScreenSize({
-        deviceType: EDeviceType.Pro2,
-        homeScreenType: 'Nft',
-        thumbnail: true,
-      })
-    ).toBeUndefined();
-  });
-});
-
-describe('getNftSize', () => {
-  it('returns the Pro 2 NFT image and thumbnail dimensions independently', () => {
-    expect(getNftSize({ deviceType: EDeviceType.Pro2 })).toEqual({ width: 540, height: 540 });
-    expect(getNftSize({ deviceType: EDeviceType.Pro2, 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({
-      width: 238,
-      height: 238,
-    });
-    expect(getNftSize({ deviceType: EDeviceType.Pro, thumbnail: true })).toEqual({
-      width: 226,
-      height: 226,
-      radius: 40,
-    });
-  });
 });

package/__tests__/kaspa-use-tweak-pro2.test.ts

@@ -6,7 +6,7 @@ jest.mock('../src/data/config', () => ({
   DEFAULT_DOMAIN: 'https://jssdk.onekey.so/1.0.0/',
 }));
 
-describe('Kaspa Pro2 product-family useTweak capability', () => {
+describe('Kaspa Pro2 useTweak capability', () => {
   test.each([
     ['get address', KaspaGetAddress],
     ['sign transaction', KaspaSignTransaction],
@@ -14,7 +14,7 @@ describe('Kaspa Pro2 product-family useTweak capability', () => {
     const method = new Method({ id: 1, payload: {} } as never);
 
     expect(method.getUseTweakVersionRange()).toMatchObject({
-      model_pro2: { min: '0.0.0' },
+      pro2: { min: '0.0.0' },
     });
   });
 });

package/__tests__/kaspaSignTransaction.test.ts

@@ -465,7 +465,7 @@ describe('KaspaSignTransaction protocol negotiation', () => {
     expect(mockTypedCall.mock.calls[4][0]).toBe('KaspaTxAckInput');
   });
 
-  describe('streaming error propagation', () => {
+  describe('previous-transaction id mismatch', () => {
     const PREV_ID = 'aa'.repeat(32);
     const withRefTxs = {
       outputs: [{ satoshis: 100000, script: SCRIPT, address: ADDRESS }],
@@ -486,7 +486,7 @@ describe('KaspaSignTransaction protocol negotiation', () => {
         )
         .mockRejectedValueOnce(error);
 
-    it('propagates a previous-transaction id mismatch without retrying', async () => {
+    it('surfaces the device rejection under its own error code', async () => {
       streamThenReject(
         ERRORS.TypedError(
           HardwareErrorCode.RuntimeError,
@@ -494,9 +494,32 @@ describe('KaspaSignTransaction protocol negotiation', () => {
         )
       );
 
+      await expect(runMethod(withRefTxs)).rejects.toMatchObject({
+        errorCode: HardwareErrorCode.KaspaPrevTxIdMismatch,
+      });
+      // Never silently re-signs without refTxs.
+      expect(mockTypedCall).toHaveBeenCalledTimes(2);
+    });
+
+    it('leaves an unrelated device error untouched', async () => {
+      streamThenReject(
+        ERRORS.TypedError(
+          HardwareErrorCode.RuntimeError,
+          'Failure_ProcessError,some other device error'
+        )
+      );
+
       await expect(runMethod(withRefTxs)).rejects.toMatchObject({
         errorCode: HardwareErrorCode.RuntimeError,
-        message: expect.stringContaining('Kaspa previous transaction id mismatch'),
+      });
+      expect(mockTypedCall).toHaveBeenCalledTimes(2);
+    });
+
+    it('leaves user cancellation untouched', async () => {
+      streamThenReject(ERRORS.TypedError(HardwareErrorCode.ActionCancelled));
+
+      await expect(runMethod(withRefTxs)).rejects.toMatchObject({
+        errorCode: HardwareErrorCode.ActionCancelled,
       });
       expect(mockTypedCall).toHaveBeenCalledTimes(2);
     });

package/__tests__/logBlockEvent.test.ts

@@ -104,7 +104,7 @@ describe('getLogBlockLabel', () => {
     });
   });
 
-  it.each(['deviceUploadNft', 'deviceUploadWallpaper', 'uploadPortfolio', 'fileWrite', 'fileRead'])(
+  it.each(['deviceUploadWallpaper', 'uploadPortfolio', 'fileWrite', 'fileRead'])(
     'keeps metadata and replaces binary payloads with their size for %s',
     method => {
       const request = { method, path: 'resource.bin', data: new Uint8Array(1024) };

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

@@ -1,7 +1,6 @@
 import { EFirmwareType, HardwareErrorCode } from '@onekeyfe/hd-shared';
 
 import { BaseMethod } from '../src/api/BaseMethod';
-import { findMethod } 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';
@@ -21,24 +20,6 @@ class DefaultMethod extends BaseMethod {
 }
 
 describe('method protocol support', () => {
-  test('creates a protocol detection method that returns only the current protocol', async () => {
-    const method = findMethod({
-      id: 6,
-      payload: {
-        method: 'detectDeviceConnectProtocol',
-        connectId: 'ble-device',
-      },
-    } as never);
-
-    method.init();
-    (method as unknown as { device: unknown }).device = {
-      getProtocol: () => 'V2',
-    };
-
-    expect(method.getSupportedProtocols()).toEqual(['V1', 'V2']);
-    await expect(method.run()).resolves.toBe('V2');
-  });
-
   test('defaults existing methods to Protocol V1 only', () => {
     const method = new DefaultMethod({
       id: 1,