@onekeyfe/hd-core 1.2.0-alpha.119 → 1.2.0-alpha.120

package/__tests__/device-settings.test.ts

@@ -77,7 +77,7 @@ describe('DeviceSettings protocol routing', () => {
     expect(method.unlockPolicy).toBe('unlock-before-run');
   });
 
-  it('uses ApplySettings and commits the confirmed patch for Protocol V1', async () => {
+  it('uses ApplySettings and refreshes Protocol V1 settings from the device', async () => {
     const { device, typedCall, updateState } = createDevice({ protocol: 'V1' });
     const method = new DeviceSettings({
       id: 1,
@@ -107,13 +107,8 @@ describe('DeviceSettings protocol routing', () => {
       use_ble: true,
       haptic_feedback: undefined,
     });
-    expect(updateState).toHaveBeenCalledWith(
-      {
-        identity: { label: 'Shared Label' },
-        settings: { language: 'ja', bleEnabled: true },
-      },
-      'settings-write'
-    );
+    expect(device.getDeviceState).toHaveBeenCalledWith({ refreshSections: ['settings'] });
+    expect(updateState).not.toHaveBeenCalled();
   });
 
   it('normalizes legacy Protocol V1 never values before ApplySettings', async () => {
@@ -138,15 +133,33 @@ describe('DeviceSettings protocol routing', () => {
         auto_shutdown_delay_ms: DEVICE_SETTINGS_NEVER_TIMEOUT_MS,
       })
     );
-    expect(updateState).toHaveBeenCalledWith(
-      {
-        settings: {
-          autoLockDelayMs: DEVICE_SETTINGS_NEVER_TIMEOUT_MS,
-          autoShutdownDelayMs: DEVICE_SETTINGS_NEVER_TIMEOUT_MS,
-        },
+    expect(device.getDeviceState).toHaveBeenCalledWith({ refreshSections: ['settings'] });
+    expect(updateState).not.toHaveBeenCalled();
+  });
+
+  it('refreshes Protocol V1 settings after the on-device brightness update completes', async () => {
+    const { device, typedCall, updateState, getDeviceState } = createDevice({ protocol: 'V1' });
+    const method = new DeviceSettings({
+      id: 3,
+      payload: {
+        method: 'deviceSettings',
+        changeBrightness: true,
       },
-      'settings-write'
+    });
+    method.init();
+    (method as any).device = device;
+
+    await expect(method.run()).resolves.toEqual({ message: 'Success' });
+    expect(typedCall).toHaveBeenCalledWith(
+      'ApplySettings',
+      'Success',
+      expect.objectContaining({ change_brightness: true })
+    );
+    expect(getDeviceState).toHaveBeenCalledWith({ refreshSections: ['settings'] });
+    expect(typedCall.mock.invocationCallOrder[0]).toBeLessThan(
+      getDeviceState.mock.invocationCallOrder[0]
     );
+    expect(updateState).not.toHaveBeenCalled();
   });
 
   it('uses DeviceSettingsSet and reloads Protocol V2 status and settings from the device', async () => {
@@ -325,7 +338,7 @@ describe('DeviceSettings protocol routing', () => {
       'Success',
       expect.objectContaining({ use_passphrase: true })
     );
-    expect(getDeviceState).not.toHaveBeenCalled();
+    expect(getDeviceState).toHaveBeenCalledWith({ refreshSections: ['settings'] });
   });
 
   it('rejects combining a Pro2 device-side toggle with direct settings', async () => {

package/__tests__/device-upload-resource.test.ts

@@ -0,0 +1,53 @@
+import { EDeviceType } from '@onekeyfe/hd-shared';
+import { ResourceType } from '@onekeyfe/hd-transport';
+
+import DeviceUploadResource from '../src/api/device/DeviceUploadResource';
+
+jest.mock('../src/data/config', () => ({
+  DEFAULT_DOMAIN: 'https://example.com/',
+  getSDKVersion: () => '0.0.0-test',
+}));
+
+describe('DeviceUploadResource state refresh', () => {
+  it('refreshes Protocol V1 settings inside a wallpaper update', async () => {
+    const typedCall = jest.fn().mockResolvedValue({
+      type: 'Success',
+      message: { message: 'Success' },
+    });
+    const getDeviceState = jest.fn().mockResolvedValue({
+      settings: { language: 'en-US' },
+    });
+    const method = new DeviceUploadResource({
+      id: 1,
+      payload: {
+        method: 'deviceUploadResource',
+        suffix: 'jpg',
+        dataHex: '00',
+        thumbnailDataHex: '00',
+        blurDataHex: '00',
+        resType: ResourceType.WallPaper,
+      },
+    });
+    method.init();
+    (method as any).device = {
+      commands: { typedCall },
+      getCurrentDeviceType: () => EDeviceType.Pro,
+      getCurrentFirmwareVersionString: () => '4.21.0',
+      getDeviceState,
+    };
+
+    await expect(method.run()).resolves.toEqual({
+      message: 'Success',
+      applyScreen: false,
+    });
+    expect(typedCall).toHaveBeenCalledWith(
+      'ResourceUpload',
+      ['ResourceRequest', 'ZoomRequest', 'BlurRequest', 'Success'],
+      expect.objectContaining({ res_type: ResourceType.WallPaper })
+    );
+    expect(getDeviceState).toHaveBeenCalledWith({ refreshSections: ['settings'] });
+    expect(typedCall.mock.invocationCallOrder[0]).toBeLessThan(
+      getDeviceState.mock.invocationCallOrder[0]
+    );
+  });
+});

package/__tests__/protocol-v2-unlock-policy.test.ts

@@ -2,6 +2,7 @@ import { DeviceSessionPinType } from '@onekeyfe/hd-transport';
 
 import ConfluxSignMessageCIP23 from '../src/api/conflux/ConfluxSignMessageCIP23';
 import DeviceLock from '../src/api/device/DeviceLock';
+import DeviceSettings from '../src/api/device/DeviceSettings';
 import OpenWalletSession from '../src/api/OpenWalletSession';
 import { runMethodWithUnlockPolicy } from '../src/protocols/protocol-v2/unlockPolicyRunner';
 
@@ -160,6 +161,36 @@ describe('Protocol V2 unlock semantics', () => {
     expect(device.unlockDevice).toHaveBeenCalledWith(DeviceSessionPinType.Main, expect.any(Object));
   });
 
+  test('allows either PIN type when pre-unlocking device settings', async () => {
+    const method = new DeviceSettings({
+      id: 1,
+      payload: { method: 'deviceSettings', autoLockDelayMs: 60_000 },
+    });
+    method.init();
+    const features = { unlocked: false };
+    const device = {
+      features,
+      commands: {
+        typedCall: jest.fn().mockResolvedValue({ message: { unlocked: false } }),
+      },
+      isProtocolV2: () => true,
+      isBootloader: () => false,
+      isRomloader: () => false,
+      updateProtocolV2Status: jest.fn(() => features),
+      unlockDevice: jest.fn().mockImplementation(() => {
+        features.unlocked = true;
+        return Promise.resolve(features);
+      }),
+    };
+    method.run = jest.fn().mockResolvedValue({ message: 'ok' });
+
+    await expect(runMethodWithUnlockPolicy(method, device as any)).resolves.toEqual({
+      message: 'ok',
+    });
+
+    expect(device.unlockDevice).toHaveBeenCalledWith(DeviceSessionPinType.Any, expect.any(Object));
+  });
+
   test('pre-unlocks a locked standard wallet before wallet-session preparation', async () => {
     const calls: string[] = [];
     const features = {

package/__tests__/protocol-v2.test.ts

@@ -4145,7 +4145,7 @@ describe('Protocol V2 firmware update targets', () => {
     );
   });
 
-  test('uses Protocol V2 features after BLE final reconnect without V1 Initialize', async () => {
+  test('accepts uninitialized Protocol V2 features after BLE final reconnect', async () => {
     const method = new FirmwareUpdateV4({
       id: 1,
       payload: {
@@ -4173,7 +4173,7 @@ describe('Protocol V2 firmware update targets', () => {
       if (name === 'DeviceStatusGet') {
         return Promise.resolve({
           type: 'DeviceStatus',
-          message: { init_states: true, unlocked: true },
+          message: { init_states: false, unlocked: false },
         });
       }
       if (name === 'ProtocolInfoRequest') {
@@ -4194,7 +4194,7 @@ describe('Protocol V2 firmware update targets', () => {
       getCommands: () => commands,
       updateProtocolV2Features: jest.fn(() => ({
         bootloaderMode: false,
-        mode: 'normal',
+        mode: 'notInitialized',
         firmwareVersion: '0.0.0',
         bootloaderVersion: '0.0.0',
         bleVersion: '0.0.0',
@@ -5609,6 +5609,7 @@ describe('Protocol V2 firmware update targets', () => {
 
   test.each([
     [{ mode: 'normal', bootloaderMode: false }, true],
+    [{ mode: 'notInitialized', bootloaderMode: false }, true],
     [{ mode: 'bootloader', bootloaderMode: true }, false],
   ])('derives firmware completion from the runtime-state probe: %o', async (features, expected) => {
     const method = new FirmwareUpdateV4({

package/dist/api/BaseMethod.d.ts

@@ -1,5 +1,5 @@
 import { type EFirmwareType } from '@onekeyfe/hd-shared';
-import { type ProtocolType } from '@onekeyfe/hd-transport';
+import { type DeviceSessionPinType, type ProtocolType } from '@onekeyfe/hd-transport';
 import type { Device } from '../device/Device';
 import type DeviceConnector from '../device/DeviceConnector';
 import type { DeviceFirmwareRange } from '../types';
@@ -38,6 +38,7 @@ export declare abstract class BaseMethod<Params = undefined> {
     getPreWarmKey(): string;
     strictCheckDeviceSupport: boolean;
     unlockPolicy: UnlockPolicy;
+    protocolV2PreUnlockPinType?: DeviceSessionPinType;
     protocolV2UnlockContext?: ProtocolV2UnlockContext;
     getSupportedProtocols(): readonly ProtocolType[];
     supportsProtocol(protocol: ProtocolType): boolean;

package/dist/api/BaseMethod.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"BaseMethod.d.ts","sourceRoot":"","sources":["../../src/api/BaseMethod.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"BaseMethod.d.ts","sourceRoot":"","sources":["../../src/api/BaseMethod.ts"],"names":[],"mappings":"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"}

package/dist/api/FirmwareUpdateV4.d.ts

@@ -79,6 +79,7 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
     private waitForProtocolV2FirmwareUpdateComplete;
     private exitProtocolV2BootloaderToNormal;
     private probeProtocolV2NormalMode;
+    private isProtocolV2ApplicationMode;
     private waitForProtocolV2FinalFeatures;
     private getProtocolV2VersionResult;
     private completeProtocolV2FinalVerification;

package/dist/api/FirmwareUpdateV4.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"FirmwareUpdateV4.d.ts","sourceRoot":"","sources":["../../src/api/FirmwareUpdateV4.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"FirmwareUpdateV4.d.ts","sourceRoot":"","sources":["../../src/api/FirmwareUpdateV4.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAkD,MAAM,qBAAqB,CAAC;AAyBlG,OAAO,EAAE,wBAAwB,EAAE,MAAM,qCAAqC,CAAC;AAkC/E,OAAO,KAAK,EAEV,sBAAsB,EAEvB,MAAM,6BAA6B,CAAC;AAmFrC,wBAAgB,wCAAwC,CACtD,UAAU,EAAE,WAAW,GAAG,MAAM,GAAG,SAAS,EAC5C,MAAM,EAAE,sBAAsB,EAC9B,0BAA0B,UAAQ,QAiCnC;AAsVD,eAAO,MAAM,oCAAoC,WACvC,WAAW,GAAG,UAAU,eACnB,MAAM,GAAG,SAAS,YAKhC,CAAC;AAEF,eAAO,MAAM,iCAAiC,0BACrB,MAAM,uBACR,MAAM,iBACZ,MAAM,eACR,MAAM,SAsBpB,CAAC;AAUF,MAAM,CAAC,OAAO,OAAO,gBAAiB,SAAQ,wBAAwB,CAAC,sBAAsB,CAAC;IAC5F,OAAO,CAAC,8BAA8B,CAAC,CAAS;IAEhD,OAAO,CAAC,sBAAsB,CAAC,CAAS;IAExC,OAAO,CAAC,oCAAoC,CAAS;IAErD,qBAAqB;IAIrB,OAAO,CAAC,yBAAyB,CAA4B;IAE7D,OAAO,CAAC,2BAA2B,CAAS;IAE5C,OAAO,CAAC,iCAAiC,CAAS;IAElD,OAAO,CAAC,iCAAiC,CAA6B;IAEtE,OAAO,CAAC,6BAA6B,CAAC,CAAW;IAEjD,OAAO,CAAC,6BAA6B,CAAS;IAE9C,OAAO,CAAC,iCAAiC,CAA6B;IAEtE,OAAO,CAAC,kCAAkC,CAAC,CAAW;IAEtD,IAAI;IA0LJ,OAAO,CAAC,8BAA8B;IAwBhC,GAAG;;;;;YAKK,aAAa;YAwJb,4BAA4B;YAkB5B,0BAA0B;YAY1B,8BAA8B;YAK9B,+BAA+B;YAqG/B,gCAAgC;YAiIhC,qCAAqC;YAmJrC,gCAAgC;YAgBhC,uCAAuC;YA+HvC,8BAA8B;IA8B5C,OAAO,CAAC,8BAA8B;IA0BtC,OAAO,CAAC,kCAAkC;IAc1C,OAAO,CAAC,gCAAgC;IAsDxC,OAAO,CAAC,6BAA6B;YAsBvB,2BAA2B;IAWzC,OAAO,CAAC,yBAAyB;IAKjC,OAAO,CAAC,oCAAoC;IAY5C,OAAO,CAAC,4BAA4B;IAUpC,OAAO,CAAC,kCAAkC;IAS1C,OAAO,CAAC,8BAA8B;YAMxB,iCAAiC;YAOjC,iCAAiC;YAmBjC,iCAAiC;IAM/C,OAAO,CAAC,uBAAuB;IAI/B,OAAO,CAAC,mCAAmC;IAe3C,OAAO,CAAC,iCAAiC;IAWzC,OAAO,CAAC,2BAA2B;IAsBnC,OAAO,CAAC,yBAAyB;IAiBjC,OAAO,CAAC,wBAAwB;YAkBlB,iCAAiC;YA6CjC,uCAAuC;YAsCvC,+BAA+B;IA6E7C,OAAO,CAAC,6BAA6B;YAMvB,8BAA8B;YA+C9B,kCAAkC;IA+BhD,OAAO,CAAC,0BAA0B;IAUlC,OAAO,CAAC,yBAAyB;YAcnB,4BAA4B;IAkBpC,6BAA6B;YAkBrB,+BAA+B;IAkD7C,OAAO,CAAC,6BAA6B;YAkCvB,6BAA6B;YA0B7B,0CAA0C;YA6B1C,uBAAuB;YAiCvB,8BAA8B;YAsE9B,6BAA6B;IAuE3C,OAAO,CAAC,mCAAmC;YAI7B,0BAA0B;IAaxC,OAAO,CAAC,4BAA4B;IAyGpC,OAAO,CAAC,6BAA6B;IAcrC,OAAO,CAAC,qCAAqC;IAyB7C,OAAO,CAAC,kCAAkC;YAgB5B,uCAAuC;YAuPvC,gCAAgC;YAehC,yBAAyB;IASvC,OAAO,CAAC,2BAA2B;YAMrB,8BAA8B;IAQ5C,OAAO,CAAC,0BAA0B;YAkBpB,mCAAmC;YAWnC,qCAAqC;YAgDrC,yBAAyB;YA8DzB,8BAA8B;IAU5C,OAAO,CAAC,kCAAkC;YAQ5B,cAAc;YAuCd,6BAA6B;YAW7B,0BAA0B;YAS1B,6BAA6B;YAa7B,gBAAgB;IAiB9B,OAAO,CAAC,qBAAqB;CAM9B"}

package/dist/api/device/DeviceSettings.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DeviceSettings.d.ts","sourceRoot":"","sources":["../../../src/api/device/DeviceSettings.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAgB3C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AA0D5D,MAAM,CAAC,OAAO,OAAO,cAAe,SAAQ,UAAU,CAAC,aAAa,CAAC;IACnE,qBAAqB;IAIrB,IAAI;IAwEJ,eAAe;;;;;;;IAWT,GAAG;CAyIV"}
+{"version":3,"file":"DeviceSettings.d.ts","sourceRoot":"","sources":["../../../src/api/device/DeviceSettings.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAa3C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AA0D5D,MAAM,CAAC,OAAO,OAAO,cAAe,SAAQ,UAAU,CAAC,aAAa,CAAC;IACnE,qBAAqB;IAIrB,IAAI;IA0EJ,eAAe;;;;;;;IAWT,GAAG;CAyIV"}

package/dist/api/device/DeviceUploadResource.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DeviceUploadResource.d.ts","sourceRoot":"","sources":["../../../src/api/device/DeviceUploadResource.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAK3C,OAAO,KAAK,EAA8B,4BAA4B,EAAE,MAAM,aAAa,CAAC;AAC5F,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AACxE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAE7D,MAAM,CAAC,OAAO,OAAO,oBAAqB,SAAQ,UAAU,CAAC,cAAc,CAAC;IAC1E,UAAU;;;;MAIR;IAEF,OAAO,CAAC,cAAc,CAIpB;IAEF,eAAe;;;;;IAQf,qBAAqB;IAgBrB,IAAI;IA+CJ,OAAO,CAAC,YAAY;IAMpB,OAAO,CAAC,cAAc;IAoBtB,sBAAsB,QAEhB,qBAAqB,iBAAiB,CAAC,GACvC,qBAAqB,aAAa,CAAC,GACnC,qBAAqB,aAAa,CAAC,GACnC,qBAAqB,SAAS,CAAC,KAClC,QAAQ,4BAA4B,CAAC,CAuDtC;IAEI,GAAG;CAaV"}
+{"version":3,"file":"DeviceUploadResource.d.ts","sourceRoot":"","sources":["../../../src/api/device/DeviceUploadResource.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAK3C,OAAO,KAAK,EAA8B,4BAA4B,EAAE,MAAM,aAAa,CAAC;AAC5F,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AACxE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAE7D,MAAM,CAAC,OAAO,OAAO,oBAAqB,SAAQ,UAAU,CAAC,cAAc,CAAC;IAC1E,UAAU;;;;MAIR;IAEF,OAAO,CAAC,cAAc,CAIpB;IAEF,eAAe;;;;;IAQf,qBAAqB;IAgBrB,IAAI;IA+CJ,OAAO,CAAC,YAAY;IAMpB,OAAO,CAAC,cAAc;IAoBtB,sBAAsB,QAEhB,qBAAqB,iBAAiB,CAAC,GACvC,qBAAqB,aAAa,CAAC,GACnC,qBAAqB,aAAa,CAAC,GACnC,qBAAqB,SAAS,CAAC,KAClC,QAAQ,4BAA4B,CAAC,CAuDtC;IAEI,GAAG;CAiBV"}

package/dist/index.js

@@ -44617,22 +44617,6 @@ const mapProtocolV2DeviceStatusToState = (status) => {
         raw: { protocolV2DeviceStatus: status },
     });
 };
-const mapApplySettingsToState = (settings) => {
-    const identity = definedEntries({ label: settings.label });
-    const status = definedEntries({ passphraseProtection: settings.use_passphrase });
-    const stateSettings = definedEntries({
-        language: settings.language,
-        autoLockDelayMs: settings.auto_lock_delay_ms,
-        autoShutdownDelayMs: settings.auto_shutdown_delay_ms,
-        displayRotation: settings.display_rotation,
-        passphraseAlwaysOnDevice: settings.passphrase_always_on_device,
-        safetyChecks: normalizeSafetyCheckLevel(settings.safety_checks),
-        experimentalFeatures: settings.experimental_features,
-        hapticFeedback: settings.haptic_feedback,
-        bleEnabled: settings.use_ble,
-    });
-    return Object.assign(Object.assign(Object.assign({}, (Object.keys(identity).length ? { identity } : {})), (Object.keys(status).length ? { status } : {})), (Object.keys(stateSettings).length ? { settings: stateSettings } : {}));
-};
 const mapDeviceSettingsToState = (settings) => {
     const identity = definedEntries({ label: settings.label });
     const status = definedEntries({ passphraseProtection: settings.passphrase_enable });
@@ -48434,6 +48418,8 @@ class DeviceSettings extends BaseMethod {
             })
             : getProtocolV2SettingsBehavior({ kind: 'page', page });
         this.unlockPolicy = behavior.unlockPolicy;
+        this.protocolV2PreUnlockPinType =
+            behavior.unlockPolicy === 'unlock-before-run' ? hdTransport.DeviceSessionPinType.Any : undefined;
         this.protocolV2UiInteraction = behavior.uiInteraction;
     }
     getVersionRange() {
@@ -48517,7 +48503,7 @@ class DeviceSettings extends BaseMethod {
                 }
                 const protocolV1Params = Object.assign(Object.assign({}, this.params), { auto_lock_delay_ms: normalizeProtocolV1DelayMs(this.params.auto_lock_delay_ms), auto_shutdown_delay_ms: normalizeProtocolV1DelayMs(this.params.auto_shutdown_delay_ms) });
                 const res = yield this.device.commands.typedCall('ApplySettings', 'Success', protocolV1Params);
-                this.device.updateState(mapApplySettingsToState(protocolV1Params), 'settings-write');
+                yield this.device.getDeviceState({ refreshSections: ['settings'] });
                 return res.message;
             }
             catch (error) {
@@ -48716,7 +48702,11 @@ class DeviceUploadResource extends BaseMethod {
                 this.checkUploadNFTSupport();
             }
             const res = yield this.device.commands.typedCall('ResourceUpload', ['ResourceRequest', 'ZoomRequest', 'BlurRequest', 'Success'], this.params);
-            return this.processResourceRequest(res);
+            const result = yield this.processResourceRequest(res);
+            if (this.payload.resType === hdTransport.Messages.ResourceType.WallPaper) {
+                yield this.device.getDeviceState({ refreshSections: ['settings'] });
+            }
+            return result;
         });
     }
 }
@@ -53675,9 +53665,12 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
         return __awaiter(this, void 0, void 0, function* () {
             const features = yield this.device.probeProtocolV2RuntimeState(deviceInfo, PROTOCOL_V2_SHORT_RESPONSE_TIMEOUT);
             this.protocolV2LastRuntimeProbeFeatures = features;
-            return features.mode === 'normal' && !features.bootloaderMode;
+            return this.isProtocolV2ApplicationMode(features);
         });
     }
+    isProtocolV2ApplicationMode(features) {
+        return ((features.mode === 'normal' || features.mode === 'notInitialized') && !features.bootloaderMode);
+    }
     waitForProtocolV2FinalFeatures() {
         return __awaiter(this, void 0, void 0, function* () {
             const features = yield this.waitForProtocolV2ReconnectAndFeatures(PROTOCOL_V2_FINAL_RECONNECT_TIMEOUT);
@@ -53728,7 +53721,7 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
                     });
                     this.assertProtocolV2DeviceInfoIdentity(deviceInfo);
                     const features = yield this.device.probeProtocolV2RuntimeState(deviceInfo, PROTOCOL_V2_SHORT_RESPONSE_TIMEOUT);
-                    if (features.mode === 'normal' && !features.bootloaderMode) {
+                    if (this.isProtocolV2ApplicationMode(features)) {
                         return features;
                     }
                     lastError = hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.DeviceNotFound, 'Protocol V2 device is still in bootloader mode');
@@ -54871,6 +54864,9 @@ const createProtocolV2UnlockContext = () => ({
 });
 const resolvePreUnlockPinType = (method) => {
     var _a, _b;
+    if (method.protocolV2PreUnlockPinType !== undefined) {
+        return method.protocolV2PreUnlockPinType;
+    }
     const targetsKnownHiddenWallet = method.useDevicePassphraseState &&
         ((_a = method.payload) === null || _a === void 0 ? void 0 : _a.useEmptyPassphrase) !== true &&
         typeof ((_b = method.payload) === null || _b === void 0 ? void 0 : _b.passphraseState) === 'string' &&

package/dist/protocols/protocol-v2/unlockPolicyRunner.d.ts

@@ -5,7 +5,7 @@ export type ProtocolV2UnlockContext = {
     preflightCompleted: boolean;
 };
 export declare const createProtocolV2UnlockContext: () => ProtocolV2UnlockContext;
-type RunnableMethod = Pick<BaseMethod, 'run' | 'unlockPolicy' | 'useDevicePassphraseState' | 'protocolV2UiInteraction' | 'protocolV2UiMode' | 'params' | 'payload'> & {
+type RunnableMethod = Pick<BaseMethod, 'run' | 'unlockPolicy' | 'useDevicePassphraseState' | 'protocolV2UiInteraction' | 'protocolV2UiMode' | 'protocolV2PreUnlockPinType' | 'params' | 'payload'> & {
     name?: string;
     protocolV2UnlockContext?: ProtocolV2UnlockContext;
 };

package/dist/protocols/protocol-v2/unlockPolicyRunner.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"unlockPolicyRunner.d.ts","sourceRoot":"","sources":["../../../src/protocols/protocol-v2/unlockPolicyRunner.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAElD,OAAO,KAAK,EAAE,kCAAkC,EAAE,MAAM,iBAAiB,CAAC;AAI1E,MAAM,MAAM,uBAAuB,GAAG;IACpC,kBAAkB,EAAE,OAAO,CAAC;CAC7B,CAAC;AAEF,eAAO,MAAM,6BAA6B,QAAO,uBAE/C,CAAC;AAEH,KAAK,cAAc,GAAG,IAAI,CACxB,UAAU,EACR,KAAK,GACL,cAAc,GACd,0BAA0B,GAC1B,yBAAyB,GACzB,kBAAkB,GAClB,QAAQ,GACR,SAAS,CACZ,GAAG;IACF,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,uBAAuB,CAAC,EAAE,uBAAuB,CAAC;CACnD,CAAC;AAEF,KAAK,wBAAwB,GAAG,IAAI,CAClC,kCAAkC,EAClC,wBAAwB,GAAG,wBAAwB,CACpD,CAAC;AAEF,KAAK,gCAAgC,CAAC,CAAC,IAAI;IACzC,OAAO,CAAC,EAAE,uBAAuB,CAAC;IAClC,aAAa,CAAC,EAAE,wBAAwB,CAAC;IACzC,uBAAuB,CAAC,EAAE,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACrD,OAAO,CAAC,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IAC9B,GAAG,CAAC,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,CAAC;CACxB,CAAC;AAeF,wBAAsB,yBAAyB,CAAC,CAAC,GAAG,OAAO,EACzD,MAAM,EAAE,cAAc,EACtB,MAAM,EAAE,MAAM,EACd,OAAO,GAAE,gCAAgC,CAAC,CAAC,CAAM,GAChD,OAAO,CAAC,CAAC,CAAC,CAiEZ"}
+{"version":3,"file":"unlockPolicyRunner.d.ts","sourceRoot":"","sources":["../../../src/protocols/protocol-v2/unlockPolicyRunner.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAElD,OAAO,KAAK,EAAE,kCAAkC,EAAE,MAAM,iBAAiB,CAAC;AAI1E,MAAM,MAAM,uBAAuB,GAAG;IACpC,kBAAkB,EAAE,OAAO,CAAC;CAC7B,CAAC;AAEF,eAAO,MAAM,6BAA6B,QAAO,uBAE/C,CAAC;AAEH,KAAK,cAAc,GAAG,IAAI,CACxB,UAAU,EACR,KAAK,GACL,cAAc,GACd,0BAA0B,GAC1B,yBAAyB,GACzB,kBAAkB,GAClB,4BAA4B,GAC5B,QAAQ,GACR,SAAS,CACZ,GAAG;IACF,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,uBAAuB,CAAC,EAAE,uBAAuB,CAAC;CACnD,CAAC;AAEF,KAAK,wBAAwB,GAAG,IAAI,CAClC,kCAAkC,EAClC,wBAAwB,GAAG,wBAAwB,CACpD,CAAC;AAEF,KAAK,gCAAgC,CAAC,CAAC,IAAI;IACzC,OAAO,CAAC,EAAE,uBAAuB,CAAC;IAClC,aAAa,CAAC,EAAE,wBAAwB,CAAC;IACzC,uBAAuB,CAAC,EAAE,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACrD,OAAO,CAAC,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IAC9B,GAAG,CAAC,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,CAAC;CACxB,CAAC;AAkBF,wBAAsB,yBAAyB,CAAC,CAAC,GAAG,OAAO,EACzD,MAAM,EAAE,cAAc,EACtB,MAAM,EAAE,MAAM,EACd,OAAO,GAAE,gCAAgC,CAAC,CAAC,CAAM,GAChD,OAAO,CAAC,CAAC,CAAC,CAiEZ"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-core",
-  "version": "1.2.0-alpha.119",
+  "version": "1.2.0-alpha.120",
   "description": "Core processes and APIs for communicating with OneKey hardware devices.",
   "author": "OneKey",
   "homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
@@ -25,8 +25,8 @@
     "url": "https://github.com/OneKeyHQ/hardware-js-sdk/issues"
   },
   "dependencies": {
-    "@onekeyfe/hd-shared": "1.2.0-alpha.119",
-    "@onekeyfe/hd-transport": "1.2.0-alpha.119",
+    "@onekeyfe/hd-shared": "1.2.0-alpha.120",
+    "@onekeyfe/hd-transport": "1.2.0-alpha.120",
     "axios": "1.15.2",
     "bignumber.js": "^9.0.2",
     "buffer": "^6.0.3",
@@ -46,5 +46,5 @@
     "@types/w3c-web-usb": "^1.0.10",
     "@types/web-bluetooth": "^0.0.21"
   },
-  "gitHead": "63d9140aec732cf5c3d74bec8d62e6344e14eb10"
+  "gitHead": "8aaff2584cedc5fcb5dc68e0ca19588e9965bb8a"
 }

package/src/api/BaseMethod.ts

@@ -6,7 +6,11 @@ import {
   createDeviceNotSupportMethodError,
   createNeedUpgradeFirmwareHardwareError,
 } from '@onekeyfe/hd-shared';
-import { Enum_SafetyCheckLevel, type ProtocolType } from '@onekeyfe/hd-transport';
+import {
+  type DeviceSessionPinType,
+  Enum_SafetyCheckLevel,
+  type ProtocolType,
+} from '@onekeyfe/hd-transport';
 
 import { createDeviceMessage } from '../events/device';
 import { UI_REQUEST } from '../constants/ui-request';
@@ -167,6 +171,9 @@ export abstract class BaseMethod<Params = undefined> {
   /** Non-wallet methods may explicitly require Protocol V2 pre-unlock. */
   unlockPolicy: UnlockPolicy = 'none';
 
+  /** PIN type accepted by an explicit Protocol V2 pre-unlock. */
+  protocolV2PreUnlockPinType?: DeviceSessionPinType;
+
   /** Shared by composite methods so nested calls do not repeat the root preflight. */
   protocolV2UnlockContext?: ProtocolV2UnlockContext;
 

package/src/api/FirmwareUpdateV4.ts

@@ -2896,7 +2896,13 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
       PROTOCOL_V2_SHORT_RESPONSE_TIMEOUT
     );
     this.protocolV2LastRuntimeProbeFeatures = features;
-    return features.mode === 'normal' && !features.bootloaderMode;
+    return this.isProtocolV2ApplicationMode(features);
+  }
+
+  private isProtocolV2ApplicationMode(features: Features) {
+    return (
+      (features.mode === 'normal' || features.mode === 'notInitialized') && !features.bootloaderMode
+    );
   }
 
   private async waitForProtocolV2FinalFeatures() {
@@ -2958,7 +2964,7 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
           deviceInfo,
           PROTOCOL_V2_SHORT_RESPONSE_TIMEOUT
         );
-        if (features.mode === 'normal' && !features.bootloaderMode) {
+        if (this.isProtocolV2ApplicationMode(features)) {
           return features;
         }
         lastError = ERRORS.TypedError(

package/src/api/device/DeviceSettings.ts

@@ -1,13 +1,10 @@
 import { HardwareErrorCode, TypedError } from '@onekeyfe/hd-shared';
-import { DeviceSettingsPage } from '@onekeyfe/hd-transport';
+import { DeviceSessionPinType, DeviceSettingsPage } from '@onekeyfe/hd-transport';
 
 import { BaseMethod } from '../BaseMethod';
 import { invalidParameter } from '../helpers/filesystemValidation';
 import { validateParams } from '../helpers/paramsValidator';
-import {
-  mapApplySettingsToState,
-  mapCommonSettingsToProtocolV2,
-} from '../../device/DeviceStateMapper';
+import { mapCommonSettingsToProtocolV2 } from '../../device/DeviceStateMapper';
 import { getProtocolV2SettingsBehavior } from '../../protocols/protocol-v2/settingsUnlockPolicy';
 import {
   DEVICE_SETTINGS_NEVER_TIMEOUT_MS,
@@ -149,6 +146,8 @@ export default class DeviceSettings extends BaseMethod<ApplySettings> {
           })
         : getProtocolV2SettingsBehavior({ kind: 'page', page });
     this.unlockPolicy = behavior.unlockPolicy;
+    this.protocolV2PreUnlockPinType =
+      behavior.unlockPolicy === 'unlock-before-run' ? DeviceSessionPinType.Any : undefined;
     this.protocolV2UiInteraction = behavior.uiInteraction;
   }
 
@@ -269,7 +268,7 @@ export default class DeviceSettings extends BaseMethod<ApplySettings> {
         'Success',
         protocolV1Params
       );
-      this.device.updateState(mapApplySettingsToState(protocolV1Params), 'settings-write');
+      await this.device.getDeviceState({ refreshSections: ['settings'] });
       return res.message;
     } catch (error) {
       if (error.message?.toLowerCase().includes('no setting provided')) {

package/src/api/device/DeviceUploadResource.ts

@@ -198,6 +198,10 @@ export default class DeviceUploadResource extends BaseMethod<ResourceUpload> {
       this.params
     );
 
-    return this.processResourceRequest(res);
+    const result = await this.processResourceRequest(res);
+    if (this.payload.resType === PROTO.ResourceType.WallPaper) {
+      await this.device.getDeviceState({ refreshSections: ['settings'] });
+    }
+    return result;
   }
 }

package/src/protocols/protocol-v2/unlockPolicyRunner.ts

@@ -27,6 +27,7 @@ type RunnableMethod = Pick<
   | 'useDevicePassphraseState'
   | 'protocolV2UiInteraction'
   | 'protocolV2UiMode'
+  | 'protocolV2PreUnlockPinType'
   | 'params'
   | 'payload'
 > & {
@@ -48,6 +49,9 @@ type RunMethodWithUnlockPolicyOptions<T> = {
 };
 
 const resolvePreUnlockPinType = (method: RunnableMethod) => {
+  if (method.protocolV2PreUnlockPinType !== undefined) {
+    return method.protocolV2PreUnlockPinType;
+  }
   const targetsKnownHiddenWallet =
     method.useDevicePassphraseState &&
     method.payload?.useEmptyPassphrase !== true &&