@onekeyfe/hd-core 1.2.0-alpha.10 → 1.2.0-alpha.12

package/__tests__/protocol-v2.test.ts

@@ -7,12 +7,18 @@ import DnxSignTransaction from '../src/api/dynex/DnxSignTransaction';
 import DirList from '../src/api/DirList';
 import FileRead from '../src/api/FileRead';
 import FileWrite from '../src/api/FileWrite';
+import UploadPortfolio from '../src/api/UploadPortfolio';
 import DeviceFactoryInfoGet from '../src/api/protocol-v2/DeviceFactoryInfoGet';
 import DeviceFactoryInfoSet from '../src/api/protocol-v2/DeviceFactoryInfoSet';
 import DeviceFirmwareUpdate from '../src/api/protocol-v2/DeviceFirmwareUpdate';
 import DeviceGetFirmwareUpdateStatus from '../src/api/protocol-v2/DeviceGetFirmwareUpdateStatus';
+import DeviceGetOnboardingStatus from '../src/api/protocol-v2/DeviceGetOnboardingStatus';
 import DeviceInfoGet from '../src/api/protocol-v2/DeviceInfoGet';
 import DeviceReboot from '../src/api/protocol-v2/DeviceReboot';
+import DeviceSettingsGet from '../src/api/protocol-v2/DeviceSettingsGet';
+import DeviceSettingsPageShow from '../src/api/protocol-v2/DeviceSettingsPageShow';
+import DeviceSettingsSet from '../src/api/protocol-v2/DeviceSettingsSet';
+import DeviceUploadWallpaper from '../src/api/protocol-v2/DeviceUploadWallpaper';
 import DeviceSessionGet from '../src/api/protocol-v2/DeviceSessionGet';
 import DeviceStatusGet from '../src/api/protocol-v2/DeviceStatusGet';
 import FilesystemFormat from '../src/api/protocol-v2/FilesystemFormat';
@@ -56,6 +62,7 @@ import {
   getProtocolV2WalletSession,
   refreshProtocolV2DeviceStatus,
 } from '../src/protocols/protocol-v2/walletSession';
+import { runMethodWithUnlockRetry } from '../src/protocols/protocol-v2/unlockRetry';
 import { buildProfileFromProtocolV2, buildProtocolV2FeaturesPayload } from '../src/deviceProfile';
 import {
   getDeviceType,
@@ -80,6 +87,175 @@ jest.mock('../src/data/config', () => ({
   DEFAULT_DOMAIN: 'https://jssdk.onekey.so/1.0.0/',
 }));
 
+describe('DeviceUploadWallpaper', () => {
+  test('encodes, uploads and applies a Pro2 wallpaper', async () => {
+    const rgba = new Uint8Array(604 * 1024 * 4).fill(255);
+    const typedCall = jest.fn().mockImplementation((request, _response, params) => {
+      if (request === 'FilesystemDirMake') return { message: { message: 'directory ready' } };
+      if (request === 'FilesystemFileWrite') {
+        const file = params.file as { data: Uint8Array; offset: number };
+        return { message: { processed_byte: file.offset + file.data.byteLength } };
+      }
+      if (request === 'DeviceSettingsSet') {
+        return { message: { message: 'wallpaper applied' } };
+      }
+      throw new Error(`Unexpected request: ${request}`);
+    });
+    const method = new DeviceUploadWallpaper({
+      id: 1,
+      payload: { method: 'deviceUploadWallpaper', width: 604, height: 1024, rgba },
+    });
+    (method as any).device = stubDevice({ commands: { typedCall } });
+
+    method.init();
+    const result = await method.run();
+
+    expect(method.requireProtocolV2).toBe(true);
+    expect(method.unlockPolicy).toBe('retry-on-locked');
+    expect(typedCall).toHaveBeenNthCalledWith(1, 'FilesystemDirMake', 'Success', {
+      path: 'vol0:/wallpapers/user',
+    });
+    const fileWriteCall = typedCall.mock.calls.find(call => call[0] === 'FilesystemFileWrite');
+    expect(fileWriteCall?.[2]).toMatchObject({
+      file: { path: expect.stringMatching(/^vol0:\/wallpapers\/user\/wallpaper-[a-f0-9]+\.bin$/) },
+      overwrite: true,
+      append: false,
+    });
+    expect(typedCall).toHaveBeenLastCalledWith('DeviceSettingsSet', 'Success', {
+      settings: { wallpaper_path: result.path },
+    });
+    expect(typedCall.mock.calls.some(call => call[0] === 'SetWallpaper')).toBe(false);
+    expect(result).toMatchObject({ colorFormat: 'RGB565', message: 'wallpaper applied' });
+  });
+
+  test('文件上传失败时不修改 wallpaper_path', async () => {
+    const typedCall = jest.fn().mockImplementation(request => {
+      if (request === 'FilesystemDirMake') return { message: {} };
+      if (request === 'FilesystemFileWrite') throw new Error('write failed');
+      return { message: {} };
+    });
+    const method = new DeviceUploadWallpaper({
+      id: 1,
+      payload: {
+        method: 'deviceUploadWallpaper',
+        width: 604,
+        height: 1024,
+        rgba: new Uint8Array(604 * 1024 * 4),
+      },
+    });
+    (method as any).device = stubDevice({ commands: { typedCall } });
+    method.init();
+
+    await expect(method.run()).rejects.toThrow('write failed');
+    expect(typedCall.mock.calls.some(call => call[0] === 'DeviceSettingsSet')).toBe(false);
+  });
+
+  test('rejects unsafe filenames before device communication', () => {
+    const method = new DeviceUploadWallpaper({
+      id: 1,
+      payload: {
+        method: 'deviceUploadWallpaper',
+        width: 604,
+        height: 1024,
+        rgba: new Uint8Array(604 * 1024 * 4),
+        fileName: '../wallpaper.bin',
+      },
+    });
+
+    expect(() => method.init()).toThrow('fileName');
+  });
+});
+
+describe('UploadPortfolio', () => {
+  test('stages the complete package before applying PortfolioUpdate', async () => {
+    const packageBytes = new Uint8Array([1, 2, 3]);
+    const typedCall = jest
+      .fn()
+      .mockResolvedValueOnce({ message: { processed_byte: 3 } })
+      .mockResolvedValueOnce({ message: { message: 'Portfolio updated' } });
+    const method = new UploadPortfolio({
+      id: 1,
+      payload: {
+        method: 'uploadPortfolio',
+        packageBytes,
+      },
+    });
+    (method as any).device = stubDevice({ commands: { typedCall } });
+    method.postMessage = jest.fn();
+
+    method.init();
+    const result = await method.run();
+
+    expect(typedCall).toHaveBeenNthCalledWith(
+      1,
+      'FilesystemFileWrite',
+      'FilesystemFile',
+      {
+        file: {
+          path: 'vol1:/portfolio/portfolio.pfol.pending',
+          offset: 0,
+          total_size: 3,
+          data: packageBytes,
+        },
+        overwrite: true,
+        append: false,
+        ui_percentage: 100,
+      },
+      { timeoutMs: undefined }
+    );
+    expect(typedCall).toHaveBeenNthCalledWith(2, 'PortfolioUpdate', 'Success', {});
+    expect(result).toMatchObject({
+      path: 'vol1:/portfolio/portfolio.pfol.pending',
+      processed_byte: 3,
+      portfolioUpdated: true,
+    });
+  });
+
+  test('does not apply PortfolioUpdate when staging fails', async () => {
+    const typedCall = jest.fn().mockRejectedValue(new Error('write failed'));
+    const method = new UploadPortfolio({
+      id: 1,
+      payload: {
+        method: 'uploadPortfolio',
+        packageBytes: new Uint8Array([1]),
+      },
+    });
+    (method as any).device = stubDevice({ commands: { typedCall } });
+
+    method.init();
+
+    await expect(method.run()).rejects.toThrow('write failed');
+    expect(typedCall).toHaveBeenCalledTimes(1);
+  });
+
+  test('stops after the acknowledged chunk when the operation is aborted', async () => {
+    const packageBytes = new Uint8Array(4001);
+    const abortController = new AbortController();
+    const typedCall = jest.fn().mockImplementationOnce(() => {
+      abortController.abort();
+      return Promise.resolve({ message: { processed_byte: 2048 } });
+    });
+    const method = new UploadPortfolio({
+      id: 1,
+      payload: {
+        method: 'uploadPortfolio',
+        packageBytes,
+        operationId: 'portfolio-1',
+      },
+    });
+    method.abortSignal = abortController.signal;
+    (method as any).device = stubDevice({ commands: { typedCall } });
+
+    method.init();
+
+    await expect(method.run()).rejects.toMatchObject({
+      errorCode: HardwareErrorCode.CallQueueActionCancelled,
+    });
+    expect(typedCall).toHaveBeenCalledTimes(1);
+    expect(typedCall).not.toHaveBeenCalledWith('PortfolioUpdate', 'Success', {});
+  });
+});
+
 const descriptor = {
   id: 'ble-id',
   path: 'usb-path',
@@ -151,10 +327,16 @@ describe('Protocol V2 feature adapter', () => {
         serial_no: 'PR2SERIAL',
       },
       fw: {
-        application_data: {
+        romloader: {
           version: '0.1.0',
+          build_id: 'rom-build',
           hash: [1, 2, 255],
         },
+        application_data: {
+          version: '9.8.7',
+          build_id: 'app-data-build',
+          hash: [9, 8, 7],
+        },
         bootloader: {
           version: '0.2.0',
           build_id: 'boot-build',
@@ -209,6 +391,8 @@ describe('Protocol V2 feature adapter', () => {
     expect(features.bootloaderVersion).toBe('0.2.0');
     expect(features.verify?.bootloaderBuildId).toBe('boot-build');
     expect(features.verify?.bootloaderHash).toBe('0a0b');
+    expect(features.boardVersion).toBe('0.1.0');
+    expect(features.verify?.boardBuildId).toBe('rom-build');
     expect(features.verify?.boardHash).toBe('0102ff');
     expect(features.bleName).toBe('Pro2 BLE');
     expect(features.bleVersion).toBe('4.5.6');
@@ -248,6 +432,32 @@ describe('Protocol V2 feature adapter', () => {
     expect(profile.status.bootloaderMode).toBe(true);
   });
 
+  test('marks current romloader-shaped Protocol V2 DeviceInfo as romloader mode', () => {
+    const deviceInfo = {
+      protocol_version: 1,
+      hw: {
+        serial_no: 'PR2ROM',
+      },
+      fw: {
+        romloader: {
+          version: '1.0.0',
+        },
+        bootloader: {
+          version: '2.0.0',
+        },
+      },
+    };
+    const features = normalizeProtocolV2Features(descriptor as any, deviceInfo);
+    const profile = buildProfileFromProtocolV2({ deviceInfo });
+
+    expect(features.mode).toBe('romloader');
+    expect(features.bootloaderMode).toBe(false);
+    expect(features.boardVersion).toBe('1.0.0');
+    expect(profile.status.mode).toBe('romloader');
+    expect(profile.status.bootloaderMode).toBe(false);
+    expect(profile.versions.board).toBe('1.0.0');
+  });
+
   test('uses DeviceSessionGet for Protocol V2 passphrase sessions', async () => {
     const features = normalizeProtocolV2Features(descriptor as any);
     features.firmwareVersion = '1.2.3';
@@ -272,7 +482,6 @@ describe('Protocol V2 feature adapter', () => {
     await expect(
       getPassphraseState(device, {
         expectPassphraseState: 'state-2',
-        allowCreateAttachPin: true,
       })
     ).rejects.toEqual(
       expect.objectContaining({
@@ -308,7 +517,33 @@ describe('Protocol V2 feature adapter', () => {
     expect(updateProtocolV2Features).not.toHaveBeenCalled();
   });
 
-  test('deviceSessionGet maps sessionId and does not mutate wallet cache', async () => {
+  test('deviceGetOnboardingStatus returns the real Protocol V2 onboarding stage', async () => {
+    const typedCall = jest.fn().mockResolvedValue({
+      type: 'DevOnboardingStatus',
+      message: { stage: 2, status_code: 3, detail_code: 4 },
+    });
+    const method = new DeviceGetOnboardingStatus({
+      payload: {
+        method: 'deviceGetOnboardingStatus',
+        connectId: 'connect-id',
+      },
+    });
+    method.init();
+    method.device = stubDevice({
+      originalDescriptor: { ...descriptor, protocolType: 'V2' },
+      commands: { typedCall },
+    }) as any;
+
+    await expect(method.run()).resolves.toEqual({
+      stage: 2,
+      status_code: 3,
+      detail_code: 4,
+    });
+    expect(typedCall).toHaveBeenCalledWith('DevGetOnboardingStatus', 'DevOnboardingStatus', {});
+    expect(method.requireProtocolV2).toBe(true);
+  });
+
+  test('deviceSessionGet sends an empty request and does not mutate wallet cache', async () => {
     const typedCall = jest.fn().mockResolvedValue({
       type: 'DeviceSession',
       message: { session_id: 'new-session', btc_test_address: 'state-a' },
@@ -318,7 +553,6 @@ describe('Protocol V2 feature adapter', () => {
       payload: {
         method: 'deviceSessionGet',
         connectId: 'connect-id',
-        sessionId: 'cached-session',
       },
     });
     method.init();
@@ -332,9 +566,7 @@ describe('Protocol V2 feature adapter', () => {
       session_id: 'new-session',
       btc_test_address: 'state-a',
     });
-    expect(typedCall).toHaveBeenCalledWith('DeviceSessionGet', 'DeviceSession', {
-      session_id: 'cached-session',
-    });
+    expect(typedCall).toHaveBeenCalledWith('DeviceSessionGet', 'DeviceSession', {});
     expect(updateInternalState).not.toHaveBeenCalled();
   });
 
@@ -343,7 +575,8 @@ describe('Protocol V2 feature adapter', () => {
     const api = createCoreApi(call as any);
 
     await api.deviceStatusGet('connect-id', { retryCount: 1 });
-    await api.deviceSessionGet('connect-id', { sessionId: 'cached-session' });
+    await api.deviceGetOnboardingStatus('connect-id', { retryCount: 1 });
+    await api.deviceSessionGet('connect-id', { retryCount: 1 });
 
     expect(call).toHaveBeenNthCalledWith(1, {
       method: 'deviceStatusGet',
@@ -351,9 +584,14 @@ describe('Protocol V2 feature adapter', () => {
       retryCount: 1,
     });
     expect(call).toHaveBeenNthCalledWith(2, {
+      method: 'deviceGetOnboardingStatus',
+      connectId: 'connect-id',
+      retryCount: 1,
+    });
+    expect(call).toHaveBeenNthCalledWith(3, {
       method: 'deviceSessionGet',
       connectId: 'connect-id',
-      sessionId: 'cached-session',
+      retryCount: 1,
     });
   });
 
@@ -415,7 +653,7 @@ describe('Protocol V2 feature adapter', () => {
     expect(device.getInternalState()).toBeUndefined();
   });
 
-  test('clears the selected Pro2 cache entry after invalid session rejection', async () => {
+  test('retries without the selected Pro2 cache entry after invalid session rejection', async () => {
     const device = Device.fromDescriptor({
       id: 'cache-device-3',
       path: 'cache-path-3',
@@ -433,12 +671,49 @@ describe('Protocol V2 feature adapter', () => {
     );
     device.passphraseState = 'state-a';
     preloadSessionCache('stable-device-3', 'state-a', 'session-a');
-    (device as any).commands = {
-      typedCall: jest.fn().mockRejectedValue(new Error('Failure_InvalidSession,no error message')),
-    };
+    const typedCall = jest
+      .fn()
+      .mockRejectedValueOnce(new Error('Failure_ProcessError,Failure_InvalidSession'))
+      .mockResolvedValueOnce({
+        type: 'DeviceSession',
+        message: { session_id: 'session-b', btc_test_address: 'state-a' },
+      });
+    (device as any).commands = { typedCall };
+
+    await expect(getProtocolV2WalletSession(device)).resolves.toMatchObject({
+      passphraseState: 'state-a',
+      newSession: 'session-b',
+    });
+    expect(typedCall.mock.calls).toEqual([
+      ['DeviceSessionGet', 'DeviceSession', { session_id: 'session-a' }],
+      ['DeviceSessionGet', 'DeviceSession', {}],
+    ]);
+    expect(device.getInternalState()).toBe('session-b');
+  });
+
+  test('does not retry an invalid Pro2 session when no cached session was sent', async () => {
+    const device = Device.fromDescriptor({
+      id: 'cache-device-no-session',
+      path: 'cache-path-no-session',
+      protocolType: 'V2',
+    } as any);
+    (device as any).features = normalizeProtocolV2Features(
+      { ...descriptor, protocolType: 'V2' } as any,
+      {
+        status: {
+          device_id: 'stable-device-no-session',
+          unlocked: true,
+          passphrase_enabled: true,
+        },
+      }
+    );
+    const typedCall = jest
+      .fn()
+      .mockRejectedValue(new Error('Failure_ProcessError,Failure_InvalidSession'));
+    (device as any).commands = { typedCall };
 
     await expect(getProtocolV2WalletSession(device)).rejects.toThrow('Failure_InvalidSession');
-    expect(device.getInternalState()).toBeUndefined();
+    expect(typedCall.mock.calls).toEqual([['DeviceSessionGet', 'DeviceSession', {}]]);
   });
 
   test('rejects a mismatched Pro2 wallet state and clears the selected cache entry', async () => {
@@ -547,7 +822,7 @@ describe('Protocol V2 feature adapter', () => {
     expect(typedCall).toHaveBeenCalledWith('DeviceStatusGet', 'DeviceStatus', {});
   });
 
-  test('returns unified GetPassphraseState object payload for existing Pro devices', async () => {
+  test('returns passphrase state string for existing Pro devices', async () => {
     const features = {
       deviceId: 'pro-device-id',
       deviceType: 'pro',
@@ -580,12 +855,7 @@ describe('Protocol V2 feature adapter', () => {
       getCurrentPassphraseProtection: () => true,
     }) as any;
 
-    await expect(method.run()).resolves.toEqual({
-      passphraseState: 'state-pro',
-      sessionId: 'session-pro',
-      unlockedAttachPin: false,
-      passphraseProtection: true,
-    });
+    await expect(method.run()).resolves.toBe('state-pro');
     expect(updateInternalState).toHaveBeenCalledWith(
       true,
       'state-pro',
@@ -595,7 +865,7 @@ describe('Protocol V2 feature adapter', () => {
     );
   });
 
-  test('uses features for GetPassphraseState response metadata', async () => {
+  test('returns passphrase state string for Pro2 devices', async () => {
     const features = {
       deviceId: null,
       deviceType: 'pro2',
@@ -630,12 +900,7 @@ describe('Protocol V2 feature adapter', () => {
       getCurrentPassphraseProtection: () => true,
     }) as any;
 
-    await expect(method.run()).resolves.toEqual({
-      passphraseState: 'state-pro2',
-      sessionId: 'session-pro2',
-      unlockedAttachPin: true,
-      passphraseProtection: true,
-    });
+    await expect(method.run()).resolves.toBe('state-pro2');
     expect(getFeatures).not.toHaveBeenCalled();
   });
 
@@ -673,12 +938,7 @@ describe('Protocol V2 feature adapter', () => {
       getCurrentPassphraseProtection: () => true,
     }) as any;
 
-    await expect(method.run()).resolves.toEqual({
-      passphraseState: 'state-pro2-new',
-      sessionId: undefined,
-      unlockedAttachPin: false,
-      passphraseProtection: true,
-    });
+    await expect(method.run()).resolves.toBe('state-pro2-new');
     expect(clearInternalState).toHaveBeenCalledTimes(1);
     expect(updateInternalState).toHaveBeenCalledWith(
       true,
@@ -1578,16 +1838,10 @@ describe('Protocol V2 feature adapter', () => {
       if (requestType === 'DeviceSessionAskPin') {
         return {
           type: 'DeviceSessionPinResult',
-          message: { unlocked: false, passphrase_protection: false },
-        };
-      }
-      if (requestType === 'DeviceStatusGet') {
-        return {
-          type: 'DeviceStatus',
           message: {
-            device_id: 'PRO2-DEVICE-ID',
             unlocked: true,
-            passphrase_enabled: true,
+            unlocked_attach_pin: true,
+            passphrase_protection: true,
           },
         };
       }
@@ -1608,22 +1862,24 @@ describe('Protocol V2 feature adapter', () => {
 
     const features = await device.unlockDevice();
 
-    expect(typedCall.mock.calls).toEqual([
-      ['DeviceSessionAskPin', 'DeviceSessionPinResult'],
-      ['DeviceStatusGet', 'DeviceStatus', {}],
-    ]);
+    expect(typedCall.mock.calls).toEqual([['DeviceSessionAskPin', 'DeviceSessionPinResult']]);
     expect(typedCall).not.toHaveBeenCalledWith('GetAddress', 'Address', expect.anything());
     expect(typedCall).not.toHaveBeenCalledWith('GetFeatures', 'Features', {});
     expect(features).toMatchObject({
       deviceType: 'pro2',
-      deviceId: 'PRO2-DEVICE-ID',
       firmwareVersion: '1.2.3',
       unlocked: true,
+      unlockedAttachPin: true,
       passphraseProtection: true,
     });
+    expect(features.raw?.protocolV2DeviceInfo?.status).toMatchObject({
+      unlocked: true,
+      unlocked_by_attach_to_pin: true,
+      passphrase_enabled: true,
+    });
   });
 
-  test('syncs Protocol V2 features passphrase state from DeviceStatusGet after unlock', async () => {
+  test('syncs Protocol V2 features passphrase state from DeviceSessionPinResult after unlock', async () => {
     const device = Device.fromDescriptor({ ...descriptor, protocolType: 'V2' } as any);
     (device as any).features = normalizeProtocolV2Features(
       { ...descriptor, protocolType: 'V2' } as any,
@@ -1637,20 +1893,10 @@ describe('Protocol V2 feature adapter', () => {
       if (requestType === 'DeviceSessionAskPin') {
         return {
           type: 'DeviceSessionPinResult',
-          message: {
-            unlocked: false,
-            unlocked_attach_pin: false,
-            passphrase_protection: false,
-          },
-        };
-      }
-      if (requestType === 'DeviceStatusGet') {
-        return {
-          type: 'DeviceStatus',
           message: {
             unlocked: true,
-            unlocked_by_attach_to_pin: true,
-            passphrase_enabled: true,
+            unlocked_attach_pin: true,
+            passphrase_protection: true,
           },
         };
       }
@@ -1660,7 +1906,9 @@ describe('Protocol V2 feature adapter', () => {
 
     await device.unlockDevice();
 
+    expect(typedCall.mock.calls).toEqual([['DeviceSessionAskPin', 'DeviceSessionPinResult']]);
     expect((device as any).profile).toBeUndefined();
+    expect(device.features?.unlocked).toBe(true);
     expect(device.features?.passphraseProtection).toBe(true);
     expect(device.features?.unlockedAttachPin).toBe(true);
   });
@@ -2818,6 +3066,16 @@ describe('Protocol V2 firmware update targets', () => {
       payload: {
         method: 'firmwareUpdateV4',
         platform: 'web',
+        targetsToUpdate: [
+          'boot',
+          'app_v1',
+          'app_v2',
+          'coprocessor',
+          'se01',
+          'se02',
+          'se03',
+          'se04',
+        ],
       },
     });
     method.init();
@@ -2931,6 +3189,7 @@ describe('Protocol V2 firmware update targets', () => {
       payload: {
         method: 'firmwareUpdateV4',
         platform: 'web',
+        targetsToUpdate: ['resource'],
       },
     });
     method.init();
@@ -2980,7 +3239,7 @@ describe('Protocol V2 firmware update targets', () => {
     getFirmwareLatestReleaseSpy.mockRestore();
   });
 
-  test('skips Pro2 firmware components when configured versions are already installed', async () => {
+  test('does not download Pro2 firmware components that App did not select', async () => {
     const method = new FirmwareUpdateV4({
       id: 1,
       payload: {
@@ -3671,6 +3930,97 @@ describe('Protocol V2 reboot methods', () => {
   });
 });
 
+describe('Protocol V2 protected method execution', () => {
+  const deviceLockedError = () =>
+    Object.assign(new Error('Device locked'), {
+      errorCode: HardwareErrorCode.DeviceLocked,
+    });
+
+  test('unlocks and retries an opted-in Protocol V2 method once', async () => {
+    const calls: string[] = [];
+    const method = {
+      unlockPolicy: 'retry-on-locked',
+      run: jest
+        .fn()
+        .mockImplementationOnce(() => {
+          calls.push('run-1');
+          return Promise.reject(deviceLockedError());
+        })
+        .mockImplementationOnce(() => {
+          calls.push('run-2');
+          return Promise.resolve({ message: 'ok' });
+        }),
+    };
+    const device = {
+      isProtocolV2: () => true,
+      unlockDevice: jest.fn(() => {
+        calls.push('unlock');
+        return Promise.resolve();
+      }),
+    };
+
+    await expect(runMethodWithUnlockRetry(method as any, device as any)).resolves.toEqual({
+      message: 'ok',
+    });
+    expect(calls).toEqual(['run-1', 'unlock', 'run-2']);
+  });
+
+  test('does not unlock a Protocol V1 device or a method without the policy', async () => {
+    for (const [isProtocolV2, unlockPolicy] of [
+      [false, 'retry-on-locked'],
+      [true, 'none'],
+    ] as const) {
+      const error = deviceLockedError();
+      const method = {
+        unlockPolicy,
+        run: jest.fn().mockRejectedValue(error),
+      };
+      const device = {
+        isProtocolV2: () => isProtocolV2,
+        unlockDevice: jest.fn(),
+      };
+
+      await expect(runMethodWithUnlockRetry(method as any, device as any)).rejects.toBe(error);
+      expect(device.unlockDevice).not.toHaveBeenCalled();
+      expect(method.run).toHaveBeenCalledTimes(1);
+    }
+  });
+
+  test('does not retry when unlock fails or when the retry is still locked', async () => {
+    const initialError = deviceLockedError();
+    const unlockError = new Error('PIN cancelled');
+    const unlockFailMethod = {
+      unlockPolicy: 'retry-on-locked',
+      run: jest.fn().mockRejectedValue(initialError),
+    };
+    const unlockFailDevice = {
+      isProtocolV2: () => true,
+      unlockDevice: jest.fn().mockRejectedValue(unlockError),
+    };
+
+    await expect(
+      runMethodWithUnlockRetry(unlockFailMethod as any, unlockFailDevice as any)
+    ).rejects.toBe(unlockError);
+    expect(unlockFailMethod.run).toHaveBeenCalledTimes(1);
+
+    const retryError = deviceLockedError();
+    const retryFailMethod = {
+      unlockPolicy: 'retry-on-locked',
+      run: jest.fn().mockRejectedValueOnce(initialError).mockRejectedValueOnce(retryError),
+    };
+    const retryFailDevice = {
+      isProtocolV2: () => true,
+      unlockDevice: jest.fn().mockResolvedValue(undefined),
+    };
+
+    await expect(
+      runMethodWithUnlockRetry(retryFailMethod as any, retryFailDevice as any)
+    ).rejects.toBe(retryError);
+    expect(retryFailMethod.run).toHaveBeenCalledTimes(2);
+    expect(retryFailDevice.unlockDevice).toHaveBeenCalledTimes(1);
+  });
+});
+
 describe('Protocol V2 current low-level methods', () => {
   test('sends ProtocolInfoRequest from protocolInfoRequest', async () => {
     const typedCall = jest.fn().mockResolvedValue({ message: { version: 1 } });
@@ -3724,6 +4074,106 @@ describe('Protocol V2 current low-level methods', () => {
     expect(typedCall).toHaveBeenLastCalledWith('DeviceFactoryInfoGet', 'DeviceFactoryInfo', {});
   });
 
+  test('gets Protocol V2 device settings', async () => {
+    const typedCall = jest.fn().mockResolvedValue({ message: { brightness: 80 } });
+    const method = new DeviceSettingsGet({
+      id: 1,
+      payload: { method: 'deviceSettingsGet' },
+    });
+    method.init();
+    (method as any).device = stubDevice({ commands: { typedCall } });
+
+    await expect(method.run()).resolves.toEqual({ brightness: 80 });
+    expect(typedCall).toHaveBeenCalledWith('DeviceSettingsGet', 'DeviceSettings', {});
+  });
+
+  test('sets Protocol V2 device settings without passphrase fields', async () => {
+    const typedCall = jest.fn().mockResolvedValue({ message: { message: 'ok' } });
+    const method = new DeviceSettingsSet({
+      id: 1,
+      payload: {
+        method: 'deviceSettingsSet',
+        settings: {
+          label: 'My Pro 2',
+          brightness: 80,
+          airgap_mode: true,
+          passphrase_enable: true,
+        },
+      },
+    });
+    method.init();
+    (method as any).device = stubDevice({ commands: { typedCall } });
+
+    await method.run();
+
+    expect(typedCall).toHaveBeenCalledWith('DeviceSettingsSet', 'Success', {
+      settings: {
+        label: 'My Pro 2',
+        brightness: 80,
+      },
+    });
+  });
+
+  test('opens non-passphrase Protocol V2 settings pages', async () => {
+    const typedCall = jest.fn().mockResolvedValue({ message: { message: 'ok' } });
+    const method = new DeviceSettingsPageShow({
+      id: 1,
+      payload: {
+        method: 'deviceSettingsPageShow',
+        page: 'DeviceAirgap',
+        fieldName: 'airgap_mode',
+      },
+    });
+    method.init();
+    (method as any).device = stubDevice({ commands: { typedCall } });
+
+    await method.run();
+
+    expect(typedCall).toHaveBeenCalledWith('DeviceSettingsPageShow', 'Success', {
+      page: 3,
+      field_name: 'airgap_mode',
+    });
+  });
+
+  test('opens the Protocol V2 passphrase settings page', async () => {
+    const typedCall = jest.fn().mockResolvedValue({ message: { message: 'ok' } });
+    const method = new DeviceSettingsPageShow({
+      id: 1,
+      payload: {
+        method: 'deviceSettingsPageShow',
+        page: 'DevicePassphrase',
+      },
+    });
+    method.init();
+    (method as any).device = stubDevice({ commands: { typedCall } });
+
+    await method.run();
+
+    expect(typedCall).toHaveBeenCalledWith('DeviceSettingsPageShow', 'Success', {
+      page: 2,
+      field_name: undefined,
+    });
+  });
+
+  test('marks Protocol V2 settings methods for unlock-on-locked retry', () => {
+    const methods = [
+      new DeviceSettingsGet({ id: 1, payload: { method: 'deviceSettingsGet' } }),
+      new DeviceSettingsSet({
+        id: 2,
+        payload: { method: 'deviceSettingsSet', settings: { brightness: 80 } },
+      }),
+      new DeviceSettingsPageShow({
+        id: 3,
+        payload: { method: 'deviceSettingsPageShow', page: 'DevicePassphrase' },
+      }),
+    ];
+
+    methods.forEach(method => {
+      method.init();
+      expect(method.unlockPolicy).toBe('retry-on-locked');
+    });
+  });
+
   test('sends FilesystemPermissionFix from filesystemPermissionFix', async () => {
     const typedCall = jest.fn().mockResolvedValue({ message: {} });
     const method = new FilesystemPermissionFix({