@onekeyfe/hd-core 1.2.0-alpha.28 → 1.2.0-alpha.29

package/__tests__/open-wallet-session.test.ts

@@ -184,7 +184,6 @@ describe('openWalletSession', () => {
       walletType: 'standard',
       deviceId: 'device-1',
       passphraseState: null,
-      sessionId: 'main-wallet-session',
       resumed: false,
     });
     expect(method.payload.useEmptyPassphrase).toBe(true);
@@ -261,7 +260,6 @@ describe('openWalletSession', () => {
       walletType: 'hidden',
       deviceId: 'device-1',
       passphraseState: 'hidden-state-after-unlock',
-      sessionId: 'hidden-session-after-unlock',
       resumed: false,
     });
     expect(device.unlockDevice).toHaveBeenCalledWith(DeviceSessionPinType.Main);
@@ -295,7 +293,6 @@ describe('openWalletSession', () => {
       walletType: 'hidden',
       deviceId: 'device-1',
       passphraseState: 'new-hidden-state',
-      sessionId: 'new-hidden-session',
       resumed: false,
     });
     expect(typedCall).toHaveBeenCalledWith('ProtocolInfoRequest', 'ProtocolInfo', {
@@ -369,7 +366,6 @@ describe('openWalletSession', () => {
       walletType: 'hidden',
       deviceId: 'device-1',
       passphraseState: 'hidden-state',
-      sessionId: 'renewed-session',
       resumed: true,
     });
     expect(typedCall).toHaveBeenCalledWith('DeviceSessionGet', 'DeviceSession', {
@@ -567,7 +563,7 @@ describe('openWalletSession', () => {
     expect(device.clearInternalState).toHaveBeenCalled();
   });
 
-  test('selects a hidden wallet and returns the CLI compatibility session', async () => {
+  test('selects a hidden wallet without exposing the internal device session', async () => {
     const typedCall = jest
       .fn()
       .mockResolvedValueOnce({ message: { version: 2 } })
@@ -592,7 +588,6 @@ describe('openWalletSession', () => {
       walletType: 'hidden',
       deviceId: 'device-1',
       passphraseState: 'hidden-state',
-      sessionId: 'hidden-session',
       resumed: false,
     });
     expect(typedCall).toHaveBeenCalledWith('DeviceSessionAskPassphrase', 'Success', {});
@@ -759,7 +754,6 @@ describe('openWalletSession', () => {
       walletType: 'hidden',
       deviceId: 'device-1',
       passphraseState: 'hidden-state',
-      sessionId: 'renewed-session',
       resumed: true,
     });
     expect(typedCall).toHaveBeenCalledWith('DeviceSessionGet', 'DeviceSession', {

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

@@ -1 +1 @@
-{"version":3,"file":"OpenWalletSession.d.ts","sourceRoot":"","sources":["../../src/api/OpenWalletSession.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAG1C,OAAO,KAAK,EACV,uBAAuB,EACvB,wBAAwB,EACzB,MAAM,gCAAgC,CAAC;AAsExC,MAAM,CAAC,OAAO,OAAO,iBAAkB,SAAQ,UAAU,CAAC,uBAAuB,CAAC;IAChF,qBAAqB;IAIrB,IAAI;IAOE,GAAG,IAAI,OAAO,CAAC,wBAAwB,CAAC;CAqH/C"}
+{"version":3,"file":"OpenWalletSession.d.ts","sourceRoot":"","sources":["../../src/api/OpenWalletSession.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAG1C,OAAO,KAAK,EACV,uBAAuB,EACvB,wBAAwB,EACzB,MAAM,gCAAgC,CAAC;AA+DxC,MAAM,CAAC,OAAO,OAAO,iBAAkB,SAAQ,UAAU,CAAC,uBAAuB,CAAC;IAChF,qBAAqB;IAIrB,IAAI;IAOE,GAAG,IAAI,OAAO,CAAC,wBAAwB,CAAC;CAmH/C"}

package/dist/index.d.ts

@@ -1423,8 +1423,6 @@ type OpenWalletSessionPayloadBase = {
     protocol: 'V1' | 'V2';
     deviceId: string;
     resumed: boolean;
-    /** Forwarded only when the firmware response contains a wallet session id. */
-    sessionId?: string;
 };
 type OpenWalletSessionPayload = OpenWalletSessionPayloadBase & ({
     walletType: 'standard';

package/dist/index.js

@@ -45853,12 +45853,13 @@ const wasResumed = (session) => !!session &&
     typeof session === 'object' &&
     'resumed' in session &&
     session.resumed === true;
-const forwardSessionId = (session) => session.newSession ? { sessionId: session.newSession } : {};
 const requireHiddenWalletResponse = (session) => {
     if (!session.passphraseState) {
         throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.DeviceInitializeFailed, 'Hidden wallet response is missing passphraseState');
     }
-    return Object.assign({ passphraseState: session.passphraseState }, forwardSessionId(session));
+    return {
+        passphraseState: session.passphraseState,
+    };
 };
 const normalizeParams = (payload) => {
     if (payload.mode === undefined) {
@@ -45930,7 +45931,13 @@ class OpenWalletSession extends BaseMethod {
                     this.device.clearInternalState();
                     throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.DeviceCheckUnlockTypeError);
                 }
-                return Object.assign(Object.assign({ protocol, walletType: 'standard', deviceId, passphraseState: null }, forwardSessionId(session)), { resumed: wasResumed(session) });
+                return {
+                    protocol,
+                    walletType: 'standard',
+                    deviceId,
+                    passphraseState: null,
+                    resumed: wasResumed(session),
+                };
             }
             if (this.params.mode === 'resume-hidden') {
                 if (isProtocolV2) {
@@ -45982,7 +45989,7 @@ class OpenWalletSession extends BaseMethod {
                 resumed: wasResumed(session),
             };
             return this.device.getCurrentPassphraseProtection() === false
-                ? Object.assign(Object.assign(Object.assign({}, responseBase), { walletType: 'standard', passphraseState: null }), forwardSessionId(session)) : Object.assign(Object.assign(Object.assign({}, responseBase), { walletType: 'hidden' }), requireHiddenWalletResponse(session));
+                ? Object.assign(Object.assign({}, responseBase), { walletType: 'standard', passphraseState: null }) : Object.assign(Object.assign(Object.assign({}, responseBase), { walletType: 'hidden' }), requireHiddenWalletResponse(session));
         });
     }
 }

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

@@ -16,7 +16,6 @@ type OpenWalletSessionPayloadBase = {
     protocol: 'V1' | 'V2';
     deviceId: string;
     resumed: boolean;
-    sessionId?: string;
 };
 export type OpenWalletSessionPayload = OpenWalletSessionPayloadBase & ({
     walletType: 'standard';

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

@@ -1 +1 @@
-{"version":3,"file":"openWalletSession.d.ts","sourceRoot":"","sources":["../../../src/types/api/openWalletSession.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAExD,MAAM,MAAM,uBAAuB,GAC/B;IACE,IAAI,EAAE,UAAU,CAAC;IACjB,QAAQ,CAAC,EAAE,KAAK,CAAC;IACjB,eAAe,CAAC,EAAE,KAAK,CAAC;CACzB,GACD;IACE,IAAI,EAAE,eAAe,CAAC;IACtB,QAAQ,CAAC,EAAE,KAAK,CAAC;IACjB,eAAe,CAAC,EAAE,KAAK,CAAC;CACzB,GACD;IACE,IAAI,EAAE,eAAe,CAAC;IACtB,QAAQ,EAAE,MAAM,CAAC;IACjB,eAAe,EAAE,MAAM,CAAC;CACzB,CAAC;AAEN,KAAK,4BAA4B,GAAG;IAClC,QAAQ,EAAE,IAAI,GAAG,IAAI,CAAC;IACtB,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,OAAO,CAAC;IAEjB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,wBAAwB,GAAG,4BAA4B,GACjE,CACI;IACE,UAAU,EAAE,UAAU,CAAC;IACvB,eAAe,EAAE,IAAI,CAAC;CACvB,GACD;IACE,UAAU,EAAE,QAAQ,CAAC;IACrB,eAAe,EAAE,MAAM,CAAC;CACzB,CACJ,CAAC;AAMJ,MAAM,CAAC,OAAO,UAAU,iBAAiB,CACvC,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,YAAY,GAAG,uBAAuB,GAC7C,QAAQ,CAAC,wBAAwB,CAAC,CAAC"}
+{"version":3,"file":"openWalletSession.d.ts","sourceRoot":"","sources":["../../../src/types/api/openWalletSession.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAExD,MAAM,MAAM,uBAAuB,GAC/B;IACE,IAAI,EAAE,UAAU,CAAC;IACjB,QAAQ,CAAC,EAAE,KAAK,CAAC;IACjB,eAAe,CAAC,EAAE,KAAK,CAAC;CACzB,GACD;IACE,IAAI,EAAE,eAAe,CAAC;IACtB,QAAQ,CAAC,EAAE,KAAK,CAAC;IACjB,eAAe,CAAC,EAAE,KAAK,CAAC;CACzB,GACD;IACE,IAAI,EAAE,eAAe,CAAC;IACtB,QAAQ,EAAE,MAAM,CAAC;IACjB,eAAe,EAAE,MAAM,CAAC;CACzB,CAAC;AAEN,KAAK,4BAA4B,GAAG;IAClC,QAAQ,EAAE,IAAI,GAAG,IAAI,CAAC;IACtB,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,OAAO,CAAC;CAClB,CAAC;AAEF,MAAM,MAAM,wBAAwB,GAAG,4BAA4B,GACjE,CACI;IACE,UAAU,EAAE,UAAU,CAAC;IACvB,eAAe,EAAE,IAAI,CAAC;CACvB,GACD;IACE,UAAU,EAAE,QAAQ,CAAC;IACrB,eAAe,EAAE,MAAM,CAAC;CACzB,CACJ,CAAC;AAMJ,MAAM,CAAC,OAAO,UAAU,iBAAiB,CACvC,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,YAAY,GAAG,uBAAuB,GAC7C,QAAQ,CAAC,wBAAwB,CAAC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-core",
-  "version": "1.2.0-alpha.28",
+  "version": "1.2.0-alpha.29",
   "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.28",
-    "@onekeyfe/hd-transport": "1.2.0-alpha.28",
+    "@onekeyfe/hd-shared": "1.2.0-alpha.29",
+    "@onekeyfe/hd-transport": "1.2.0-alpha.29",
     "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": "b7c7f9f53c4d745f127d03e0b173e8b759bf8e15"
+  "gitHead": "4a4019e439cc472f89fd15ab47e84ef0ed43166a"
 }

package/src/api/OpenWalletSession.ts

@@ -27,13 +27,7 @@ const wasResumed = (session: unknown) =>
   'resumed' in session &&
   (session as { resumed?: unknown }).resumed === true;
 
-const forwardSessionId = (session: { newSession?: string }) =>
-  session.newSession ? { sessionId: session.newSession } : {};
-
-const requireHiddenWalletResponse = (session: {
-  passphraseState?: string;
-  newSession?: string;
-}) => {
+const requireHiddenWalletResponse = (session: { passphraseState?: string }) => {
   if (!session.passphraseState) {
     throw ERRORS.TypedError(
       HardwareErrorCode.DeviceInitializeFailed,
@@ -42,7 +36,6 @@ const requireHiddenWalletResponse = (session: {
   }
   return {
     passphraseState: session.passphraseState,
-    ...forwardSessionId(session),
   };
 };
 
@@ -132,7 +125,6 @@ export default class OpenWalletSession extends BaseMethod<OpenWalletSessionParam
         walletType: 'standard',
         deviceId,
         passphraseState: null,
-        ...forwardSessionId(session),
         resumed: wasResumed(session),
       };
     }
@@ -200,7 +192,6 @@ export default class OpenWalletSession extends BaseMethod<OpenWalletSessionParam
           ...responseBase,
           walletType: 'standard',
           passphraseState: null,
-          ...forwardSessionId(session),
         }
       : {
           ...responseBase,

package/src/types/api/openWalletSession.ts

@@ -21,8 +21,6 @@ type OpenWalletSessionPayloadBase = {
   protocol: 'V1' | 'V2';
   deviceId: string;
   resumed: boolean;
-  /** Forwarded only when the firmware response contains a wallet session id. */
-  sessionId?: string;
 };
 
 export type OpenWalletSessionPayload = OpenWalletSessionPayloadBase &