@onekeyfe/hd-core 1.2.6-alpha.3 → 1.2.6

package/__tests__/core-error-output.test.ts

@@ -6,8 +6,6 @@ import TransportManager from '../src/data-manager/TransportManager';
 import { IFRAME } from '../src/events';
 import SearchDevices from '../src/api/SearchDevices';
 import { DeviceList } from '../src/device/DeviceList';
-import { Device } from '../src/device/Device';
-import { DevicePool } from '../src/device/DevicePool';
 
 jest.mock('../src/data/config', () => ({
   getSDKVersion: jest.fn(() => '1.0.0-test'),
@@ -207,112 +205,3 @@ describe('Core 错误输出边界', () => {
     await core.dispose();
   });
 });
-
-describe('Portfolio firmware compatibility through Core', () => {
-  afterEach(() => {
-    jest.restoreAllMocks();
-  });
-
-  test.each(
-    (['pro2', 'neo'] as const).flatMap(deviceType =>
-      (['silent', 'progress'] as const).map(uiMode => ({ deviceType, uiMode }))
-    )
-  )(
-    'checks the current $deviceType firmware before a $uiMode upload',
-    async ({ deviceType, uiMode }) => {
-      DevicePool.resetState();
-      jest.spyOn(DataManager, 'getSettings').mockReturnValue('react-native' as never);
-      const device = Device.fromDescriptor({
-        id: 'portfolio-device',
-        path: 'portfolio-device',
-        commType: 'ble',
-        protocolType: 'V2',
-      } as never);
-      jest.spyOn(Device, 'fromDescriptor').mockReturnValue(device);
-      jest.spyOn(device, 'acquire').mockResolvedValue(undefined);
-      jest.spyOn(device, 'initialize').mockResolvedValue(undefined);
-      jest.spyOn(device, 'release').mockResolvedValue(undefined);
-      jest.spyOn(device, 'ensureProtocolV2RuntimeContext').mockResolvedValue({
-        version: 2,
-        supported_messages: [60805, 61400],
-      });
-      const typedCall = jest.fn();
-      device.commands = {
-        typedCall,
-        disposed: false,
-        dispose: jest.fn(),
-        checkDisposed: jest.fn(),
-      } as never;
-      const core = initCore();
-      let id = 0;
-      const upload = () =>
-        core.handleMessage({
-          id: ++id,
-          type: IFRAME.CALL,
-          payload: {
-            method: 'uploadPortfolio',
-            connectId: 'portfolio-device',
-            connectProtocol: 'V2',
-            packageBase64: 'AQID',
-            uiMode,
-          },
-        } as never);
-
-      try {
-        // Reuse one device across version changes to cover a retry after upgrading.
-        for (const firmwareVersion of ['1.0.1', '1.0.2', '1.0.3', '1.0.10']) {
-          device.features = {
-            protocol: 'V2',
-            deviceType,
-            firmwareType: 'universal',
-            firmwareVersion,
-            mode: 'normal',
-            initialized: true,
-            bootloaderMode: false,
-            capabilities: [],
-          } as never;
-          typedCall.mockReset();
-          typedCall
-            .mockResolvedValueOnce({ message: { processed_byte: 3 } })
-            .mockResolvedValueOnce({ message: { message: 'Portfolio updated' } });
-
-          const response = await upload();
-          if (firmwareVersion === '1.0.1' || firmwareVersion === '1.0.2') {
-            expect(response).toMatchObject({
-              success: false,
-              payload: {
-                code: HardwareErrorCode.CallMethodNeedUpgradeFirmware,
-                params: { current: firmwareVersion, require: '1.0.3', method: 'uploadPortfolio' },
-              },
-            });
-            expect(typedCall).not.toHaveBeenCalled();
-          } else {
-            expect(response).toMatchObject({ success: true, payload: { portfolioUpdated: true } });
-            expect(typedCall).toHaveBeenCalledTimes(2);
-            expect(typedCall).toHaveBeenLastCalledWith('PortfolioUpdate', 'Success', {});
-          }
-        }
-
-        typedCall.mockReset();
-        typedCall
-          .mockResolvedValueOnce({ message: { processed_byte: 3 } })
-          .mockRejectedValueOnce(
-            ERRORS.TypedError(
-              HardwareErrorCode.RuntimeError,
-              'Failure_DataError,Invalid portfolio package'
-            )
-          );
-        await expect(upload()).resolves.toMatchObject({
-          success: false,
-          payload: {
-            code: HardwareErrorCode.RuntimeError,
-            error: 'Failure_DataError,Invalid portfolio package',
-          },
-        });
-      } finally {
-        await core.dispose();
-        DevicePool.resetState();
-      }
-    }
-  );
-});

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

@@ -160,9 +160,20 @@ describe('DeviceStateMapper', () => {
     expect(patch.status?.unlocked).toBeNull();
   });
 
-  test.each([undefined, { version: '1.0.2', build_id: 'old-p2', hash: [0x01, 0x02] }])(
-    'clears cached loader P2 version and verification when normal firmware reports P1',
-    applicationData => {
+  test.each([
+    { mode: 'normal', applicationData: undefined },
+    {
+      mode: 'normal',
+      applicationData: { version: '1.0.2', build_id: 'old-p2', hash: [0x01, 0x02] },
+    },
+    { mode: 'notInitialized', applicationData: undefined },
+    {
+      mode: 'notInitialized',
+      applicationData: { version: '1.0.2', build_id: 'old-p2', hash: [0x01, 0x02] },
+    },
+  ] as const)(
+    'clears cached loader P2 version and verification in $mode application mode',
+    ({ mode, applicationData }) => {
       const patch = mapProtocolV2DeviceInfoToState(
         {
           main_mcu: {
@@ -170,7 +181,7 @@ describe('DeviceStateMapper', () => {
             application_data: applicationData,
           },
         } as ProtocolV2DeviceInfo,
-        'normal'
+        mode
       );
 
       expect(patch.versions).toMatchObject({

package/__tests__/firmware-update/firmware-update-v4-install-poll.test.ts

@@ -868,6 +868,13 @@ describe('FirmwareUpdateV4 install polling', () => {
       p1UpdatedAt: 0,
       loaderBeforeUpdate: false,
     },
+    {
+      scenario: 'uninitialized firmware P1 updated while P2 is unobservable',
+      updatedAt: Infinity,
+      p1UpdatedAt: 0,
+      loaderBeforeUpdate: false,
+      applicationMode: 'notInitialized',
+    },
     {
       scenario: 'P2-only install cannot be inferred from an already updated P1',
       updatedAt: Infinity,
@@ -893,6 +900,7 @@ describe('FirmwareUpdateV4 install polling', () => {
       skipReconnect,
       statusUnavailable,
       differentDevice,
+      applicationMode,
     }) => {
       let now = 0;
       jest.spyOn(Date, 'now').mockImplementation(() => now);
@@ -951,7 +959,7 @@ describe('FirmwareUpdateV4 install polling', () => {
             const normal =
               options?.forceRuntimeContextRefresh && (!loaderBeforeUpdate || now >= updatedAt);
             finalFeatures = {
-              mode: normal ? 'normal' : 'bootloader',
+              mode: normal ? applicationMode ?? 'normal' : 'bootloader',
               bootloaderMode: !normal,
               firmwareVersion: info.main_mcu?.application?.version,
             } as Features;

package/__tests__/firmware-update/firmware-update-v4-optional-versions.test.ts

@@ -0,0 +1,166 @@
+import FirmwareUpdateV4 from '../../src/api/FirmwareUpdateV4';
+
+import type { ProtocolV2DeviceInfo } from '@onekeyfe/hd-transport';
+import type { Device } from '../../src/device/Device';
+import type { Features } from '../../src/types';
+import type { FirmwareUpdateV4Params } from '../../src/types/api/firmwareUpdate';
+
+jest.mock('../../src/data/config', () => ({
+  DEFAULT_DOMAIN: 'https://example.com/',
+  getSDKVersion: () => '0.0.0-test',
+}));
+
+type InstallTarget = { target_id: number; path: string };
+type PollingMethod = {
+  params: FirmwareUpdateV4Params;
+  isBleReconnect: () => boolean;
+  protocolV2InstallNeedsReconnect: boolean;
+  protocolV2ExpectedSerialNumber: string;
+  protocolV2InstallBaselineVersions: Map<number, string>;
+  protocolV2LatestFinalFeatures?: Features;
+  protocolV2LatestFinalDeviceInfo?: ProtocolV2DeviceInfo;
+  reconnectProtocolV2Device: () => Promise<void>;
+  waitForProtocolV2FirmwareUpdateComplete: (
+    targets: InstallTarget[],
+    requireCurrentInstallStatus: boolean
+  ) => Promise<void>;
+  assertExpectedProtocolV2Versions: () => void;
+};
+
+type Scenario = {
+  scenario: string;
+  expectedTargetVersions?: FirmwareUpdateV4Params['expectedTargetVersions'];
+  currentVersion?: string;
+  p2Only?: boolean;
+  missingBaseline?: boolean;
+  loaderMode?: boolean;
+  completes: boolean;
+};
+
+const scenarios: Scenario[] = [
+  { scenario: 'omitted expected versions', completes: true },
+  { scenario: 'empty expected versions', expectedTargetVersions: {}, completes: true },
+  {
+    scenario: 'only a P1 expected version',
+    expectedTargetVersions: { app_v1: '1.0.3' },
+    completes: true,
+  },
+  {
+    scenario: 'matching paired expected versions',
+    expectedTargetVersions: { app_v1: '1.0.3', app_v2: '1.0.3' },
+    completes: true,
+  },
+  {
+    scenario: 'a mismatched expected P2 version',
+    expectedTargetVersions: { app_v2: '1.0.4' },
+    completes: false,
+  },
+  { scenario: 'unchanged P1', currentVersion: '1.0.2', completes: false },
+  { scenario: 'P2-only without expected versions', p2Only: true, completes: false },
+  { scenario: 'a missing P1 baseline', missingBaseline: true, completes: false },
+  { scenario: 'a device still in loader mode', loaderMode: true, completes: false },
+];
+
+describe.each([
+  { transport: 'USB', isBle: false, platform: 'desktop' as const },
+  { transport: 'BLE', isBle: true, platform: 'native' as const },
+])('FirmwareUpdateV4 direct binaries over $transport', ({ isBle, platform }) => {
+  afterEach(() => {
+    jest.restoreAllMocks();
+  });
+
+  describe.each([
+    { endpoint: 'empty records', unavailable: false },
+    { endpoint: 'unavailable status handler', unavailable: true },
+  ])('$endpoint without observed install evidence', ({ unavailable }) => {
+    test.each(scenarios)('$scenario', async scenario => {
+      let now = 0;
+      jest.spyOn(Date, 'now').mockImplementation(() => now);
+      jest.spyOn(global, 'setTimeout').mockImplementation(((
+        callback: () => void,
+        delay: number
+      ) => {
+        now += delay;
+        callback();
+        return 0;
+      }) as typeof setTimeout);
+
+      const method = new FirmwareUpdateV4({
+        id: 1,
+        payload: {
+          method: 'firmwareUpdateV4',
+          connectId: 'pro2-optional-version-test',
+          platform,
+          ...(!scenario.p2Only ? { applicationP1Binary: new ArrayBuffer(1) } : {}),
+          applicationP2Binary: new ArrayBuffer(1),
+          ...(scenario.expectedTargetVersions !== undefined
+            ? { expectedTargetVersions: scenario.expectedTargetVersions }
+            : {}),
+        },
+      });
+      method.init();
+
+      const firmwareVersion = scenario.currentVersion ?? '1.0.3';
+      const deviceInfo = {
+        hw: { serial_no: 'pro2-optional-version-test' },
+        main_mcu: { application: { version: firmwareVersion } },
+      } as ProtocolV2DeviceInfo;
+      const features = {
+        mode: scenario.loaderMode ? 'bootloader' : 'normal',
+        bootloaderMode: !!scenario.loaderMode,
+        firmwareVersion,
+      } as Features;
+      const typedCall = jest.fn().mockImplementation((type: string) => {
+        if (type === 'DeviceInfoGet') return { type: 'DeviceInfo', message: deviceInfo };
+        if (type === 'DeviceFirmwareUpdateStatusGet') {
+          if (unavailable) throw new Error('unsupported message');
+          return { type: 'DeviceFirmwareUpdateStatus', message: { records: [] } };
+        }
+        throw new Error(`Unexpected command: ${type}`);
+      });
+      const probeProtocolV2RuntimeState = jest.fn().mockResolvedValue(features);
+      method.device = {
+        originalDescriptor: { path: 'pro2-optional-version-test' },
+        getCommands: () => ({ typedCall }),
+        probeProtocolV2RuntimeState,
+        setCancelableAction: jest.fn(),
+      } as unknown as Device;
+      method.postProgressMessage = jest.fn();
+
+      const pollingMethod = method as unknown as PollingMethod;
+      expect(pollingMethod.params.expectedTargetVersions).toEqual(scenario.expectedTargetVersions);
+      pollingMethod.isBleReconnect = () => isBle;
+      pollingMethod.protocolV2InstallNeedsReconnect = true;
+      pollingMethod.protocolV2ExpectedSerialNumber = 'pro2-optional-version-test';
+      pollingMethod.protocolV2InstallBaselineVersions = new Map([
+        [4, '1.0.2'],
+        [5, '1.0.2'],
+      ]);
+      if (scenario.missingBaseline) pollingMethod.protocolV2InstallBaselineVersions.delete(4);
+      pollingMethod.reconnectProtocolV2Device = jest.fn().mockResolvedValue(undefined);
+      const targets = [
+        { target_id: 4, path: 'vol0:/application_p1.bin' },
+        { target_id: 5, path: 'vol0:/application_p2.bin' },
+      ].filter(target => !scenario.p2Only || target.target_id === 5);
+
+      const polling = pollingMethod.waitForProtocolV2FirmwareUpdateComplete(targets, true);
+      if (scenario.completes) {
+        await expect(polling).resolves.toBeUndefined();
+        expect(now).toBe(0);
+        expect(method.postProgressMessage).toHaveBeenCalledWith(100, 'installingFirmware');
+        pollingMethod.protocolV2LatestFinalFeatures = features;
+        pollingMethod.protocolV2LatestFinalDeviceInfo = deviceInfo;
+        expect(() => pollingMethod.assertExpectedProtocolV2Versions()).not.toThrow();
+      } else {
+        await expect(polling).rejects.toMatchObject({
+          params: { firmwareUpdateCode: 'FirmwareInstallTimeout' },
+        });
+        expect(now).toBe(600_000);
+        expect(method.postProgressMessage).not.toHaveBeenCalledWith(100, 'installingFirmware');
+      }
+      expect(probeProtocolV2RuntimeState).toHaveBeenLastCalledWith(deviceInfo, expect.any(Number), {
+        forceRuntimeContextRefresh: true,
+      });
+    });
+  });
+});

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":"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"}

package/dist/api/UploadPortfolio.d.ts

@@ -5,11 +5,6 @@ export type UploadPortfolioParams = {
     uiMode?: 'silent' | 'progress';
 };
 export default class UploadPortfolio extends FileWrite {
-    getVersionRange(): {
-        model_pro2: {
-            min: string;
-        };
-    };
     init(): void;
     run(): Promise<{
         portfolioUpdated: boolean;

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

@@ -1 +1 @@
-{"version":3,"file":"UploadPortfolio.d.ts","sourceRoot":"","sources":["../../src/api/UploadPortfolio.ts"],"names":[],"mappings":"AAIA,OAAO,SAAS,MAAM,aAAa,CAAC;AAEpC,MAAM,MAAM,qBAAqB,GAAG;IAClC,aAAa,EAAE,MAAM,CAAC;IACtB,SAAS,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IAE5B,MAAM,CAAC,EAAE,QAAQ,GAAG,UAAU,CAAC;CAChC,CAAC;AAQF,MAAM,CAAC,OAAO,OAAO,eAAgB,SAAQ,SAAS;IACpD,eAAe;;;;;IAKf,IAAI;IAuBE,GAAG;;;;;;;;CAsBV"}
+{"version":3,"file":"UploadPortfolio.d.ts","sourceRoot":"","sources":["../../src/api/UploadPortfolio.ts"],"names":[],"mappings":"AAIA,OAAO,SAAS,MAAM,aAAa,CAAC;AAEpC,MAAM,MAAM,qBAAqB,GAAG;IAClC,aAAa,EAAE,MAAM,CAAC;IACtB,SAAS,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IAE5B,MAAM,CAAC,EAAE,QAAQ,GAAG,UAAU,CAAC;CAChC,CAAC;AAQF,MAAM,CAAC,OAAO,OAAO,eAAgB,SAAQ,SAAS;IACpD,IAAI;IAuBE,GAAG;;;;;;;;CAsBV"}

package/dist/device/DeviceStateMapper.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DeviceStateMapper.d.ts","sourceRoot":"","sources":["../../src/device/DeviceStateMapper.ts"],"names":[],"mappings":"AAWA,OAAO,KAAK,EACV,aAAa,EAEb,cAAc,EACd,YAAY,EACZ,oBAAoB,EACrB,MAAM,wBAAwB,CAAC;AAChC,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,KAAK,EAEV,eAAe,EACf,gBAAgB,EAChB,QAAQ,EACR,cAAc,EACf,MAAM,UAAU,CAAC;AAClB,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AAsDxE,eAAO,MAAM,kBAAkB,aAAc,QAAQ,KAAG,gBAqEtD,CAAC;AAEH,eAAO,MAAM,4BAA4B,uBACnB,cAAc,KACjC,gBAA0F,CAAC;AAc9F,eAAO,MAAM,kCAAkC,aAAc,cAAc,KAAG,gBAgE7E,CAAC;AAEF,eAAO,MAAM,8BAA8B,SACnC,oBAAoB,SACpB,eAAe,KACpB,gBAyGF,CAAC;AAEF,eAAO,MAAM,gCAAgC,WAAY,YAAY,KAAG,gBActE,CAAC;AAEH,eAAO,MAAM,uBAAuB,aAAc,aAAa,KAAG,gBAmBjE,CAAC;AAEF,eAAO,MAAM,wBAAwB,aAAc,cAAc,KAAG,gBA0BnE,CAAC;AAEF,eAAO,MAAM,6BAA6B,aAAc,oBAAoB,KAAG,cAe3E,CAAC"}
+{"version":3,"file":"DeviceStateMapper.d.ts","sourceRoot":"","sources":["../../src/device/DeviceStateMapper.ts"],"names":[],"mappings":"AAWA,OAAO,KAAK,EACV,aAAa,EAEb,cAAc,EACd,YAAY,EACZ,oBAAoB,EACrB,MAAM,wBAAwB,CAAC;AAChC,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,KAAK,EAEV,eAAe,EACf,gBAAgB,EAChB,QAAQ,EACR,cAAc,EACf,MAAM,UAAU,CAAC;AAClB,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AAsDxE,eAAO,MAAM,kBAAkB,aAAc,QAAQ,KAAG,gBAqEtD,CAAC;AAEH,eAAO,MAAM,4BAA4B,uBACnB,cAAc,KACjC,gBAA0F,CAAC;AAc9F,eAAO,MAAM,kCAAkC,aAAc,cAAc,KAAG,gBAgE7E,CAAC;AAEF,eAAO,MAAM,8BAA8B,SACnC,oBAAoB,SACpB,eAAe,KACpB,gBAiHF,CAAC;AAEF,eAAO,MAAM,gCAAgC,WAAY,YAAY,KAAG,gBActE,CAAC;AAEH,eAAO,MAAM,uBAAuB,aAAc,aAAa,KAAG,gBAmBjE,CAAC;AAEF,eAAO,MAAM,wBAAwB,aAAc,cAAc,KAAG,gBA0BnE,CAAC;AAEF,eAAO,MAAM,6BAA6B,aAAc,oBAAoB,KAAG,cAe3E,CAAC"}

package/dist/index.js

@@ -44899,7 +44899,9 @@ const mapProtocolV2DeviceInfoToState = (info, mode = 'unknown') => {
         versions: definedEntries({
             firmware: imageVersion((_d = info.main_mcu) === null || _d === void 0 ? void 0 : _d.application),
             applicationP1: imageVersion((_e = info.main_mcu) === null || _e === void 0 ? void 0 : _e.application),
-            applicationP2: mode === 'normal' ? null : imageVersion((_f = info.main_mcu) === null || _f === void 0 ? void 0 : _f.application_data),
+            applicationP2: mode === 'normal' || mode === 'notInitialized'
+                ? null
+                : imageVersion((_f = info.main_mcu) === null || _f === void 0 ? void 0 : _f.application_data),
             bootloader: imageVersion((_g = info.main_mcu) === null || _g === void 0 ? void 0 : _g.bootloader),
             board: imageVersion((_h = info.main_mcu) === null || _h === void 0 ? void 0 : _h.romloader),
             ble: imageVersion((_j = info.coprocessor) === null || _j === void 0 ? void 0 : _j.application),
@@ -44917,8 +44919,12 @@ const mapProtocolV2DeviceInfoToState = (info, mode = 'unknown') => {
             firmwareHash: imageHash((_u = info.main_mcu) === null || _u === void 0 ? void 0 : _u.application),
             applicationP1BuildId: imageBuildId((_v = info.main_mcu) === null || _v === void 0 ? void 0 : _v.application),
             applicationP1Hash: imageHash((_w = info.main_mcu) === null || _w === void 0 ? void 0 : _w.application),
-            applicationP2BuildId: mode === 'normal' ? null : imageBuildId((_x = info.main_mcu) === null || _x === void 0 ? void 0 : _x.application_data),
-            applicationP2Hash: mode === 'normal' ? null : imageHash((_y = info.main_mcu) === null || _y === void 0 ? void 0 : _y.application_data),
+            applicationP2BuildId: mode === 'normal' || mode === 'notInitialized'
+                ? null
+                : imageBuildId((_x = info.main_mcu) === null || _x === void 0 ? void 0 : _x.application_data),
+            applicationP2Hash: mode === 'normal' || mode === 'notInitialized'
+                ? null
+                : imageHash((_y = info.main_mcu) === null || _y === void 0 ? void 0 : _y.application_data),
             bootloaderBuildId: imageBuildId((_z = info.main_mcu) === null || _z === void 0 ? void 0 : _z.bootloader),
             bootloaderHash: imageHash((_0 = info.main_mcu) === null || _0 === void 0 ? void 0 : _0.bootloader),
             boardBuildId: imageBuildId((_1 = info.main_mcu) === null || _1 === void 0 ? void 0 : _1.romloader),
@@ -53297,7 +53303,7 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
             app_v1: features
                 ? getDeviceFirmwareVersion(features).join('.')
                 : (_c = (_b = deviceInfo === null || deviceInfo === void 0 ? void 0 : deviceInfo.main_mcu) === null || _b === void 0 ? void 0 : _b.application) === null || _c === void 0 ? void 0 : _c.version,
-            app_v2: (features === null || features === void 0 ? void 0 : features.mode) === 'normal'
+            app_v2: features && this.isProtocolV2ApplicationMode(features)
                 ? getDeviceFirmwareVersion(features).join('.')
                 : (_e = (_d = deviceInfo === null || deviceInfo === void 0 ? void 0 : deviceInfo.main_mcu) === null || _d === void 0 ? void 0 : _d.application_data) === null || _e === void 0 ? void 0 : _e.version,
             coprocessor: features ? getDeviceBLEFirmwareVersion(features).join('.') : undefined,
@@ -54171,7 +54177,7 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
         versions.set(ProtocolV2FirmwareTargetType.FW_MGMT_TARGET_BOOTLOADER, getDeviceBootloaderVersion(features).join('.'));
         const applicationVersion = getDeviceFirmwareVersion(features).join('.');
         versions.set(ProtocolV2FirmwareTargetType.FW_MGMT_TARGET_APPLICATION_P1, applicationVersion);
-        const applicationP2Version = features.mode === 'normal'
+        const applicationP2Version = this.isProtocolV2ApplicationMode(features)
             ? applicationVersion
             : (_b = (_a = deviceInfo === null || deviceInfo === void 0 ? void 0 : deviceInfo.main_mcu) === null || _a === void 0 ? void 0 : _a.application_data) === null || _b === void 0 ? void 0 : _b.version;
         if (applicationP2Version) {
@@ -54198,8 +54204,9 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
         const p2TargetId = ProtocolV2FirmwareTargetType.FW_MGMT_TARGET_APPLICATION_P2;
         return (expectedTargetIds.size > 0 &&
             Array.from(expectedTargetIds).every(targetId => {
-                var _a, _b, _c;
-                if (targetId === p2TargetId && ((_a = this.protocolV2LastRuntimeProbeFeatures) === null || _a === void 0 ? void 0 : _a.mode) === 'normal') {
+                var _a, _b, _c, _d;
+                if (targetId === p2TargetId &&
+                    this.isProtocolV2ApplicationMode(this.protocolV2LastRuntimeProbeFeatures)) {
                     if (!expectedTargetIds.has(p1TargetId))
                         return false;
                     const previousP1Version = this.protocolV2InstallBaselineVersions.get(p1TargetId);
@@ -54207,7 +54214,8 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
                     return (previousP1Version !== undefined &&
                         currentP1Version !== undefined &&
                         previousP1Version !== currentP1Version &&
-                        currentP1Version === ((_c = (_b = this.params) === null || _b === void 0 ? void 0 : _b.expectedTargetVersions) === null || _c === void 0 ? void 0 : _c.app_v2));
+                        (((_b = (_a = this.params) === null || _a === void 0 ? void 0 : _a.expectedTargetVersions) === null || _b === void 0 ? void 0 : _b.app_v2) === undefined ||
+                            currentP1Version === ((_d = (_c = this.params) === null || _c === void 0 ? void 0 : _c.expectedTargetVersions) === null || _d === void 0 ? void 0 : _d.app_v2)));
                 }
                 const previousVersion = this.protocolV2InstallBaselineVersions.get(targetId);
                 const currentVersion = currentVersions.get(targetId);
@@ -55547,9 +55555,6 @@ const PORTFOLIO_PACKAGE_MAX_BYTES = 128 * 1024;
 const FILESYSTEM_FILE_WRITE_MESSAGE_TYPE = 60805;
 const PORTFOLIO_UPDATE_MESSAGE_TYPE = 61400;
 class UploadPortfolio extends FileWrite {
-    getVersionRange() {
-        return { model_pro2: { min: '1.0.3' } };
-    }
     init() {
         const { packageBase64, timeoutMs, uiMode = 'silent' } = this.payload;
         const packageBytes = decodeCanonicalBase64({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-core",
-  "version": "1.2.6-alpha.3",
+  "version": "1.2.6",
   "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.6-alpha.3",
-    "@onekeyfe/hd-transport": "1.2.6-alpha.3",
+    "@onekeyfe/hd-shared": "1.2.6",
+    "@onekeyfe/hd-transport": "1.2.6",
     "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": "4ca9104edb5113a625070484628fe4b2a56478e5"
+  "gitHead": "84345adb00215008eb8b29b2595a41368145ed95"
 }

package/src/api/FirmwareUpdateV4.ts

@@ -1390,7 +1390,7 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
         : deviceInfo?.main_mcu?.application?.version,
       // Production boot verifies P2 against P1 before normal firmware can run.
       app_v2:
-        features?.mode === 'normal'
+        features && this.isProtocolV2ApplicationMode(features)
           ? getDeviceFirmwareVersion(features).join('.')
           : deviceInfo?.main_mcu?.application_data?.version,
       coprocessor: features ? getDeviceBLEFirmwareVersion(features).join('.') : undefined,
@@ -2531,10 +2531,9 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
     );
     const applicationVersion = getDeviceFirmwareVersion(features).join('.');
     versions.set(ProtocolV2FirmwareTargetType.FW_MGMT_TARGET_APPLICATION_P1, applicationVersion);
-    const applicationP2Version =
-      features.mode === 'normal'
-        ? applicationVersion
-        : deviceInfo?.main_mcu?.application_data?.version;
+    const applicationP2Version = this.isProtocolV2ApplicationMode(features)
+      ? applicationVersion
+      : deviceInfo?.main_mcu?.application_data?.version;
     if (applicationP2Version) {
       versions.set(
         ProtocolV2FirmwareTargetType.FW_MGMT_TARGET_APPLICATION_P2,
@@ -2571,7 +2570,10 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
     return (
       expectedTargetIds.size > 0 &&
       Array.from(expectedTargetIds).every(targetId => {
-        if (targetId === p2TargetId && this.protocolV2LastRuntimeProbeFeatures?.mode === 'normal') {
+        if (
+          targetId === p2TargetId &&
+          this.isProtocolV2ApplicationMode(this.protocolV2LastRuntimeProbeFeatures)
+        ) {
           // P1 must change in this install; a pre-existing P1 version cannot prove a P2-only update.
           if (!expectedTargetIds.has(p1TargetId)) return false;
           const previousP1Version = this.protocolV2InstallBaselineVersions.get(p1TargetId);
@@ -2580,7 +2582,8 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
             previousP1Version !== undefined &&
             currentP1Version !== undefined &&
             previousP1Version !== currentP1Version &&
-            currentP1Version === this.params?.expectedTargetVersions?.app_v2
+            (this.params?.expectedTargetVersions?.app_v2 === undefined ||
+              currentP1Version === this.params?.expectedTargetVersions?.app_v2)
           );
         }
         const previousVersion = this.protocolV2InstallBaselineVersions.get(targetId);

package/src/api/UploadPortfolio.ts

@@ -18,11 +18,6 @@ const FILESYSTEM_FILE_WRITE_MESSAGE_TYPE = 60805;
 const PORTFOLIO_UPDATE_MESSAGE_TYPE = 61400;
 
 export default class UploadPortfolio extends FileWrite {
-  getVersionRange() {
-    // Pro2 and Neo rotated the Portfolio verification key in firmware 1.0.3.
-    return { model_pro2: { min: '1.0.3' } };
-  }
-
   init() {
     const { packageBase64, timeoutMs, uiMode = 'silent' } = this.payload as UploadPortfolioParams;
     const packageBytes = decodeCanonicalBase64({

package/src/device/DeviceStateMapper.ts

@@ -272,7 +272,10 @@ export const mapProtocolV2DeviceInfoToState = (
       firmware: imageVersion(info.main_mcu?.application),
       applicationP1: imageVersion(info.main_mcu?.application),
       // The running application does not report P2; discard a loader-era version.
-      applicationP2: mode === 'normal' ? null : imageVersion(info.main_mcu?.application_data),
+      applicationP2:
+        mode === 'normal' || mode === 'notInitialized'
+          ? null
+          : imageVersion(info.main_mcu?.application_data),
       bootloader: imageVersion(info.main_mcu?.bootloader),
       board: imageVersion(info.main_mcu?.romloader),
       ble: imageVersion(info.coprocessor?.application),
@@ -291,8 +294,13 @@ export const mapProtocolV2DeviceInfoToState = (
       applicationP1BuildId: imageBuildId(info.main_mcu?.application),
       applicationP1Hash: imageHash(info.main_mcu?.application),
       applicationP2BuildId:
-        mode === 'normal' ? null : imageBuildId(info.main_mcu?.application_data),
-      applicationP2Hash: mode === 'normal' ? null : imageHash(info.main_mcu?.application_data),
+        mode === 'normal' || mode === 'notInitialized'
+          ? null
+          : imageBuildId(info.main_mcu?.application_data),
+      applicationP2Hash:
+        mode === 'normal' || mode === 'notInitialized'
+          ? null
+          : imageHash(info.main_mcu?.application_data),
       bootloaderBuildId: imageBuildId(info.main_mcu?.bootloader),
       bootloaderHash: imageHash(info.main_mcu?.bootloader),
       boardBuildId: imageBuildId(info.main_mcu?.romloader),