@onekeyfe/hd-core 1.1.27-alpha.34 → 1.1.27-alpha.35

package/__tests__/protocol-v2.test.ts

@@ -13,6 +13,7 @@ import DeviceGetOnboardingStatus from '../src/api/protocol-v2/DeviceGetOnboardin
 import EVMSignMessageEIP712 from '../src/api/evm/EVMSignMessageEIP712';
 import FirmwareUpdateV3 from '../src/api/FirmwareUpdateV3';
 import FirmwareUpdateV4 from '../src/api/FirmwareUpdateV4';
+import GetPassphraseState from '../src/api/GetPassphraseState';
 import GetOnekeyFeatures from '../src/api/GetOnekeyFeatures';
 import { batchGetPublickeys } from '../src/api/helpers/batchGetPublickeys';
 import SuiSignTransaction from '../src/api/sui/SuiSignTransaction';
@@ -164,6 +165,51 @@ describe('Protocol V2 feature adapter', () => {
     });
   });
 
+  test('returns unified GetPassphraseState object payload for existing Pro devices', async () => {
+    const features = {
+      device_id: 'pro-device-id',
+      onekey_device_type: 'PRO',
+      onekey_firmware_version: '4.15.0',
+      passphrase_protection: true,
+      session_id: 'feature-session',
+      unlocked_attach_pin: true,
+    };
+    const typedCall = jest.fn().mockResolvedValue({
+      type: 'PassphraseState',
+      message: {
+        passphrase_state: 'state-pro',
+        session_id: 'session-pro',
+        unlocked_attach_pin: false,
+      },
+    });
+    const updateInternalState = jest.fn();
+    const method = new GetPassphraseState({
+      payload: {
+        method: 'getPassphraseState',
+        connectId: 'connect-id',
+      },
+    });
+    method.device = {
+      features,
+      commands: { typedCall },
+      updateInternalState,
+    } as any;
+
+    await expect(method.run()).resolves.toEqual({
+      passphrase_state: 'state-pro',
+      session_id: 'session-pro',
+      unlocked_attach_pin: false,
+      passphrase_protection: true,
+    });
+    expect(updateInternalState).toHaveBeenCalledWith(
+      true,
+      'state-pro',
+      'pro-device-id',
+      'session-pro',
+      'feature-session'
+    );
+  });
+
   test('stores Pro2 passphrase sessions without selecting them implicitly', async () => {
     const device = Device.fromDescriptor({ ...descriptor, protocolType: 'V2' } as any);
     const typedCall = jest.fn().mockResolvedValue({
@@ -337,10 +383,7 @@ describe('Protocol V2 feature adapter', () => {
     stellar.init();
     benfen.init();
 
-    const stellarRange = getMethodVersionRange(
-      features,
-      type => stellar.getVersionRange()[type]
-    );
+    const stellarRange = getMethodVersionRange(features, type => stellar.getVersionRange()[type]);
     const benfenRange = getMethodVersionRange(features, type => benfen.getVersionRange()[type]);
     const neuraiRange = getMethodVersionRange(
       features,
@@ -521,7 +564,7 @@ describe('API compatibility handling', () => {
 
   test('uses chunk transfer for large Sui transactions on Protocol V2', async () => {
     const rawTx = '0x'.concat('ab'.repeat(5000));
-    const typedCall = jest.fn(async () => ({
+    const typedCall = jest.fn(() => ({
       type: 'SuiSignedTx',
       message: {
         public_key: '',

package/dist/api/GetPassphraseState.d.ts

@@ -1,11 +1,11 @@
 import { BaseMethod } from './BaseMethod';
 export default class GetPassphraseState extends BaseMethod {
     init(): void;
-    run(): Promise<string | {
+    run(): Promise<{
         passphrase_state: string | undefined;
         session_id: string | undefined;
         unlocked_attach_pin: boolean | undefined;
         passphrase_protection: boolean | null;
-    } | undefined>;
+    }>;
 }
 //# sourceMappingURL=GetPassphraseState.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"GetPassphraseState.d.ts","sourceRoot":"","sources":["../../src/api/GetPassphraseState.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE1C,MAAM,CAAC,OAAO,OAAO,kBAAmB,SAAQ,UAAU;IACxD,IAAI;IAKE,GAAG;;;;;;CA8BV"}
+{"version":3,"file":"GetPassphraseState.d.ts","sourceRoot":"","sources":["../../src/api/GetPassphraseState.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE1C,MAAM,CAAC,OAAO,OAAO,kBAAmB,SAAQ,UAAU;IACxD,IAAI;IAKE,GAAG;;;;;;CAuBV"}

package/dist/index.d.ts

@@ -523,7 +523,7 @@ declare function getDeviceInfo(connectId?: string, params?: CommonParams & GetDe
 
 declare function getOnekeyFeatures(connectId?: string, params?: CommonParams): Response<OnekeyFeatures>;
 
-type GetPassphraseStatePayload = string | {
+type GetPassphraseStatePayload = {
     passphrase_state?: string;
     session_id?: string;
     unlocked_attach_pin?: boolean;

package/dist/index.js

@@ -42217,18 +42217,13 @@ class GetPassphraseState extends BaseMethod {
             });
             const { features } = this.device;
             const isPro2 = getDeviceType(features) === hdShared.EDeviceType.Pro2;
-            if (isPro2) {
-                return Promise.resolve({
-                    passphrase_state: passphraseState,
-                    session_id: (_a = newSession !== null && newSession !== void 0 ? newSession : features === null || features === void 0 ? void 0 : features.session_id) !== null && _a !== void 0 ? _a : undefined,
-                    unlocked_attach_pin: unlockedAttachPin,
-                    passphrase_protection: (_b = features === null || features === void 0 ? void 0 : features.passphrase_protection) !== null && _b !== void 0 ? _b : null,
-                });
-            }
-            if (features && features.passphrase_protection === true) {
-                return Promise.resolve(passphraseState);
-            }
-            return Promise.resolve(undefined);
+            const passphraseProtection = (_a = features === null || features === void 0 ? void 0 : features.passphrase_protection) !== null && _a !== void 0 ? _a : null;
+            return Promise.resolve({
+                passphrase_state: isPro2 || passphraseProtection === true ? passphraseState : undefined,
+                session_id: (_b = newSession !== null && newSession !== void 0 ? newSession : features === null || features === void 0 ? void 0 : features.session_id) !== null && _b !== void 0 ? _b : undefined,
+                unlocked_attach_pin: unlockedAttachPin !== null && unlockedAttachPin !== void 0 ? unlockedAttachPin : features === null || features === void 0 ? void 0 : features.unlocked_attach_pin,
+                passphrase_protection: passphraseProtection,
+            });
         });
     }
 }

package/dist/types/api/getPassphraseState.d.ts

@@ -1,5 +1,5 @@
 import type { CommonParams, Response } from '../params';
-export type GetPassphraseStatePayload = string | {
+export type GetPassphraseStatePayload = {
     passphrase_state?: string;
     session_id?: string;
     unlocked_attach_pin?: boolean;

package/dist/types/api/getPassphraseState.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getPassphraseState.d.ts","sourceRoot":"","sources":["../../../src/types/api/getPassphraseState.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAExD,MAAM,MAAM,yBAAyB,GACjC,MAAM,GACN;IACE,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,qBAAqB,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC;CACxC,CAAC;AAEN,MAAM,MAAM,wBAAwB,GAAG,YAAY,GAAG;IACpD,oBAAoB,CAAC,EAAE,OAAO,CAAC;CAChC,CAAC;AAEF,MAAM,CAAC,OAAO,UAAU,kBAAkB,CACxC,SAAS,CAAC,EAAE,MAAM,EAClB,MAAM,CAAC,EAAE,wBAAwB,GAChC,QAAQ,CAAC,yBAAyB,CAAC,CAAC"}
+{"version":3,"file":"getPassphraseState.d.ts","sourceRoot":"","sources":["../../../src/types/api/getPassphraseState.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAExD,MAAM,MAAM,yBAAyB,GAAG;IACtC,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,qBAAqB,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC;CACxC,CAAC;AAEF,MAAM,MAAM,wBAAwB,GAAG,YAAY,GAAG;IACpD,oBAAoB,CAAC,EAAE,OAAO,CAAC;CAChC,CAAC;AAEF,MAAM,CAAC,OAAO,UAAU,kBAAkB,CACxC,SAAS,CAAC,EAAE,MAAM,EAClB,MAAM,CAAC,EAAE,wBAAwB,GAChC,QAAQ,CAAC,yBAAyB,CAAC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-core",
-  "version": "1.1.27-alpha.34",
+  "version": "1.1.27-alpha.35",
   "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.1.27-alpha.34",
-    "@onekeyfe/hd-transport": "1.1.27-alpha.34",
+    "@onekeyfe/hd-shared": "1.1.27-alpha.35",
+    "@onekeyfe/hd-transport": "1.1.27-alpha.35",
     "axios": "1.15.2",
     "bignumber.js": "^9.0.2",
     "bytebuffer": "^5.0.1",
@@ -44,5 +44,5 @@
     "@types/w3c-web-usb": "^1.0.10",
     "@types/web-bluetooth": "^0.0.21"
   },
-  "gitHead": "ff1863a1ff300ada1314b7315e5ab827663d9f4c"
+  "gitHead": "3a5eb264b57a6cc2338d1f9534be0ba265c2db35"
 }

package/src/api/GetPassphraseState.ts

@@ -24,21 +24,14 @@ export default class GetPassphraseState extends BaseMethod {
 
     const { features } = this.device;
     const isPro2 = getDeviceType(features) === EDeviceType.Pro2;
-
-    if (isPro2) {
-      return Promise.resolve({
-        passphrase_state: passphraseState,
-        session_id: newSession ?? features?.session_id ?? undefined,
-        unlocked_attach_pin: unlockedAttachPin,
-        passphrase_protection: features?.passphrase_protection ?? null,
-      });
-    }
+    const passphraseProtection = features?.passphrase_protection ?? null;
 
     // refresh device info
-    if (features && features.passphrase_protection === true) {
-      return Promise.resolve(passphraseState);
-    }
-
-    return Promise.resolve(undefined);
+    return Promise.resolve({
+      passphrase_state: isPro2 || passphraseProtection === true ? passphraseState : undefined,
+      session_id: newSession ?? features?.session_id ?? undefined,
+      unlocked_attach_pin: unlockedAttachPin ?? features?.unlocked_attach_pin,
+      passphrase_protection: passphraseProtection,
+    });
   }
 }

package/src/types/api/getPassphraseState.ts

@@ -1,13 +1,11 @@
 import type { CommonParams, Response } from '../params';
 
-export type GetPassphraseStatePayload =
-  | string
-  | {
-      passphrase_state?: string;
-      session_id?: string;
-      unlocked_attach_pin?: boolean;
-      passphrase_protection?: boolean | null;
-    };
+export type GetPassphraseStatePayload = {
+  passphrase_state?: string;
+  session_id?: string;
+  unlocked_attach_pin?: boolean;
+  passphrase_protection?: boolean | null;
+};
 
 export type GetPassphraseStateParams = CommonParams & {
   allowCreateAttachPin?: boolean;