@onekeyfe/hd-core 1.2.0-alpha.43 → 1.2.0-alpha.44

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

@@ -98,11 +98,14 @@ describe('openWalletSession', () => {
     deviceWalletSessionStore.clear();
   });
 
-  test('reuses the authoritative Main wallet DeviceStatus', async () => {
+  test('selects the standard wallet explicitly when passphrase is enabled', async () => {
     const typedCall = jest.fn((request: string) => {
       if (request === 'ProtocolInfoRequest') {
         return { message: { version: 2 } };
       }
+      if (request === 'DeviceSessionAskPassphrase') {
+        return { message: {} };
+      }
       if (request === 'DeviceSessionGet') {
         return {
           message: {
@@ -125,6 +128,39 @@ describe('openWalletSession', () => {
     });
 
     expect(device.unlockDevice).not.toHaveBeenCalled();
+    expect(typedCall).toHaveBeenCalledWith('DeviceSessionAskPassphrase', 'Success', {
+      passphrase: '',
+      on_device: false,
+    });
+    expect(typedCall).toHaveBeenCalledWith('DeviceSessionGet', 'DeviceSession', {
+      seed_domains: [],
+    });
+  });
+
+  test('opens the standard wallet directly when passphrase is disabled', async () => {
+    const typedCall = jest.fn((request: string) => {
+      if (request === 'ProtocolInfoRequest') {
+        return { message: { version: 2 } };
+      }
+      if (request === 'DeviceSessionGet') {
+        return {
+          message: {
+            btc_test_address: 'standard-state',
+            session_id: 'standard-session',
+          },
+        };
+      }
+      throw new Error(`Unexpected request: ${request}`);
+    });
+    const device = createDevice({ passphraseProtection: false, typedCall });
+
+    await getProtocolV2WalletSession(device as any, { onlyMainPin: true });
+
+    expect(typedCall).not.toHaveBeenCalledWith(
+      'DeviceSessionAskPassphrase',
+      'Success',
+      expect.anything()
+    );
     expect(typedCall).toHaveBeenCalledWith('DeviceSessionGet', 'DeviceSession', {
       seed_domains: [],
     });
@@ -135,6 +171,9 @@ describe('openWalletSession', () => {
       if (request === 'ProtocolInfoRequest') {
         return { message: { version: 2 } };
       }
+      if (request === 'DeviceSessionAskPassphrase') {
+        return { message: {} };
+      }
       if (request === 'DeviceSessionGet') {
         return {
           message: {
@@ -865,6 +904,7 @@ describe('openWalletSession', () => {
     const typedCall = jest
       .fn()
       .mockResolvedValueOnce({ message: { version: 2 } })
+      .mockResolvedValueOnce({ message: {} })
       .mockResolvedValueOnce({
         message: {
           btc_test_address: 'main-wallet-state',
@@ -887,11 +927,15 @@ describe('openWalletSession', () => {
       passphraseState: null,
       resumed: false,
     });
-    expect(typedCall).toHaveBeenCalledTimes(2);
+    expect(typedCall).toHaveBeenCalledTimes(3);
     expect(typedCall).toHaveBeenCalledWith('ProtocolInfoRequest', 'ProtocolInfo', {
       eventless_wallet_session: true,
     });
     expect(device.unlockDevice).not.toHaveBeenCalled();
+    expect(typedCall).toHaveBeenCalledWith('DeviceSessionAskPassphrase', 'Success', {
+      passphrase: '',
+      on_device: false,
+    });
     expect(typedCall).toHaveBeenCalledWith('DeviceSessionGet', 'DeviceSession', {
       seed_domains: [],
     });
@@ -903,6 +947,7 @@ describe('openWalletSession', () => {
     const typedCall = jest
       .fn()
       .mockResolvedValueOnce({ message: { version: 2 } })
+      .mockResolvedValueOnce({ message: {} })
       .mockResolvedValueOnce({
         message: {
           btc_test_address: 'main-wallet-state',
@@ -954,6 +999,7 @@ describe('openWalletSession', () => {
     const typedCall = jest
       .fn()
       .mockResolvedValueOnce({ message: { version: 2 } })
+      .mockResolvedValueOnce({ message: {} })
       .mockResolvedValueOnce({
         message: {
           btc_test_address: 'main-wallet-state',

package/__tests__/protocol-v2.test.ts

@@ -786,6 +786,9 @@ describe('Protocol V2 feature adapter', () => {
         if (request === 'DeviceStatusGet') {
           return { type: 'DeviceStatus', message: { unlocked: true } };
         }
+        if (request === 'DeviceSessionAskPassphrase') {
+          return { type: 'Success', message: {} };
+        }
         if (request === 'DeviceSessionGet') {
           return {
             type: 'DeviceSession',
@@ -819,6 +822,10 @@ describe('Protocol V2 feature adapter', () => {
     expect(typedCall).toHaveBeenCalledWith('DeviceSessionAskPin', 'Success', {
       type: DeviceSessionPinType.Main,
     });
+    expect(typedCall).toHaveBeenCalledWith('DeviceSessionAskPassphrase', 'Success', {
+      passphrase: '',
+      on_device: false,
+    });
     expect(typedCall).toHaveBeenCalledWith('DeviceSessionGet', 'DeviceSession', {
       seed_domains: [],
     });
@@ -854,6 +861,7 @@ describe('Protocol V2 feature adapter', () => {
           },
         };
       }
+      if (request === 'DeviceSessionAskPassphrase') return { message: {} };
       if (request === 'DeviceSessionGet') {
         return {
           message: {
@@ -870,6 +878,9 @@ describe('Protocol V2 feature adapter', () => {
     await getProtocolV2WalletSession(device, { onlyMainPin: true });
 
     expect(typedCall.mock.calls.filter(call => call[0] === 'DeviceSessionAskPin')).toHaveLength(1);
+    expect(
+      typedCall.mock.calls.filter(call => call[0] === 'DeviceSessionAskPassphrase')
+    ).toHaveLength(1);
     expect(typedCall).toHaveBeenCalledWith('DeviceSessionGet', 'DeviceSession', {
       seed_domains: [],
     });
@@ -918,6 +929,7 @@ describe('Protocol V2 feature adapter', () => {
           },
         };
       }
+      if (request === 'DeviceSessionAskPassphrase') return { message: {} };
       if (request === 'DeviceSessionAskPin') {
         return { type: 'Success', message: { message: 'PIN verified' } };
       }
@@ -1012,6 +1024,7 @@ describe('Protocol V2 feature adapter', () => {
       if (request === 'DeviceStatusGet') {
         return { message: { device_id: deviceId, unlocked: true, passphrase_enabled: true } };
       }
+      if (request === 'DeviceSessionAskPassphrase') return { message: {} };
       if (request === 'DeviceSessionGet') {
         sessionGetCalls += 1;
         return {
@@ -2415,13 +2428,18 @@ describe('Protocol V2 feature adapter', () => {
     await expect(
       device.checkPassphraseStateSafety('stale-hidden-state', true, false)
     ).resolves.toBe(true);
-    expect(typedCall).toHaveBeenCalledTimes(2);
+    expect(typedCall).toHaveBeenCalledTimes(4);
     expect(typedCall).toHaveBeenCalledWith('ProtocolInfoRequest', 'ProtocolInfo', {
       eventless_wallet_session: true,
     });
     expect(typedCall).toHaveBeenCalledWith('DeviceSessionGet', 'DeviceSession', {
       seed_domains: [],
     });
+    expect(typedCall).toHaveBeenCalledWith('DeviceSessionAskPassphrase', 'Success', {
+      passphrase: '',
+      on_device: false,
+    });
+    expect(typedCall).toHaveBeenCalledWith('DeviceStatusGet', 'DeviceStatus', {});
     expect(typedCall).not.toHaveBeenCalledWith('DeviceSessionAskPin', 'Success', expect.anything());
   });
 

package/dist/index.js

@@ -40428,7 +40428,7 @@ function getProtocolV2WalletSession(device, options) {
             : undefined;
         let response;
         let resumed = false;
-        let mainWalletSelected = (options === null || options === void 0 ? void 0 : options.onlyMainPin) === true &&
+        let mainPinSelected = (options === null || options === void 0 ? void 0 : options.onlyMainPin) === true &&
             ((_d = device.features) === null || _d === void 0 ? void 0 : _d.unlocked) === true &&
             ((_e = device.features) === null || _e === void 0 ? void 0 : _e.unlockedAttachPin) === false;
         const clearCurrentWalletSession = () => {
@@ -40453,14 +40453,24 @@ function getProtocolV2WalletSession(device, options) {
             clearCurrentWalletSession();
             throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.DeviceCheckUnlockTypeError);
         });
-        const selectMainWallet = (force = false) => __awaiter(this, void 0, void 0, function* () {
-            if (force || !mainWalletSelected) {
+        const selectMainPin = (force = false) => __awaiter(this, void 0, void 0, function* () {
+            if (force || !mainPinSelected) {
                 yield device.unlockDevice(hdTransport.DeviceSessionPinType.Main, {
                     source: 'wallet-session-coordinator',
                     reason: expectedPassphraseState ? 'session-recovery' : 'open-wallet',
                     deviceOnly: true,
                 });
-                mainWalletSelected = true;
+                mainPinSelected = true;
+            }
+        });
+        const selectStandardWallet = () => __awaiter(this, void 0, void 0, function* () {
+            var _l;
+            yield selectMainPin();
+            if (((_l = device.features) === null || _l === void 0 ? void 0 : _l.passphraseProtection) === true) {
+                yield askDevicePassphrase(device, {
+                    passphrase: '',
+                    on_device: false,
+                });
             }
         });
         if (options === null || options === void 0 ? void 0 : options.onlyMainPin) {
@@ -40468,7 +40478,7 @@ function getProtocolV2WalletSession(device, options) {
             if (cachedStandardSession) {
                 try {
                     if (options === null || options === void 0 ? void 0 : options.selectMainWalletBeforeRestore) {
-                        yield selectMainWallet();
+                        yield selectMainPin();
                     }
                     response = yield getDeviceSession(device, buildDeviceSessionGetRequest({
                         sessionId: cachedStandardSession.sessionId,
@@ -40486,7 +40496,7 @@ function getProtocolV2WalletSession(device, options) {
                 }
             }
             if (!response) {
-                yield selectMainWallet();
+                yield selectStandardWallet();
                 response = yield getDeviceSession(device, buildDeviceSessionGetRequest({ deriveCardano: options === null || options === void 0 ? void 0 : options.deriveCardano }));
             }
         }
@@ -40549,7 +40559,7 @@ function getProtocolV2WalletSession(device, options) {
             }
             if (options === null || options === void 0 ? void 0 : options.onlyMainPin) {
                 (_h = device.clearStandardInternalState) === null || _h === void 0 ? void 0 : _h.call(device);
-                yield selectMainWallet(true);
+                yield selectStandardWallet();
                 response = yield getDeviceSession(device, buildDeviceSessionGetRequest({ deriveCardano: options === null || options === void 0 ? void 0 : options.deriveCardano }));
             }
             else {
@@ -40591,7 +40601,7 @@ function getProtocolV2WalletSession(device, options) {
         return {
             passphraseState: message.btc_test_address,
             newSession: message.session_id,
-            unlockedAttachPin: mainWalletSelected ? false : undefined,
+            unlockedAttachPin: mainPinSelected ? false : undefined,
             resumed,
         };
     });

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

@@ -1 +1 @@
-{"version":3,"file":"walletSession.d.ts","sourceRoot":"","sources":["../../../src/protocols/protocol-v2/walletSession.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAuBlD,wBAAsB,6BAA6B,CAAC,MAAM,EAAE,MAAM,0DAGjE;AAED,wBAAsB,6BAA6B,CAAC,MAAM,EAAE,MAAM,qCAGjE;AAED,wBAAsB,qCAAqC,CAAC,MAAM,EAAE,MAAM,oBAgBzE;AAsHD,wBAAsB,0BAA0B,CAC9C,MAAM,EAAE,MAAM,EACd,OAAO,CAAC,EAAE;IACR,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAE/B,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,uBAAuB,CAAC,EAAE,MAAM,CAAC;IACjC,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,6BAA6B,CAAC,EAAE,OAAO,CAAC;IACxC,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB;;;;;GAmNF;AAED,wBAAsB,8BAA8B,CAClD,MAAM,EAAE,MAAM,EACd,uBAAuB,EAAE,MAAM,EAC/B,aAAa,CAAC,EAAE,OAAO;;;;;GAOxB"}
+{"version":3,"file":"walletSession.d.ts","sourceRoot":"","sources":["../../../src/protocols/protocol-v2/walletSession.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAuBlD,wBAAsB,6BAA6B,CAAC,MAAM,EAAE,MAAM,0DAGjE;AAED,wBAAsB,6BAA6B,CAAC,MAAM,EAAE,MAAM,qCAGjE;AAED,wBAAsB,qCAAqC,CAAC,MAAM,EAAE,MAAM,oBAgBzE;AAsHD,wBAAsB,0BAA0B,CAC9C,MAAM,EAAE,MAAM,EACd,OAAO,CAAC,EAAE;IACR,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAE/B,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,uBAAuB,CAAC,EAAE,MAAM,CAAC;IACjC,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,6BAA6B,CAAC,EAAE,OAAO,CAAC;IACxC,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB;;;;;GA8NF;AAED,wBAAsB,8BAA8B,CAClD,MAAM,EAAE,MAAM,EACd,uBAAuB,EAAE,MAAM,EAC/B,aAAa,CAAC,EAAE,OAAO;;;;;GAOxB"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-core",
-  "version": "1.2.0-alpha.43",
+  "version": "1.2.0-alpha.44",
   "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.43",
-    "@onekeyfe/hd-transport": "1.2.0-alpha.43",
+    "@onekeyfe/hd-shared": "1.2.0-alpha.44",
+    "@onekeyfe/hd-transport": "1.2.0-alpha.44",
     "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": "2ea7c9d60472502a272a57f808aed3773ccd84c4"
+  "gitHead": "6de180b61cd4a64f41cf4ffd32eeb8a1cc4e64e7"
 }

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

@@ -215,7 +215,7 @@ export async function getProtocolV2WalletSession(
       : undefined;
   let response;
   let resumed = false;
-  let mainWalletSelected =
+  let mainPinSelected =
     options?.onlyMainPin === true &&
     device.features?.unlocked === true &&
     device.features?.unlockedAttachPin === false;
@@ -243,14 +243,25 @@ export async function getProtocolV2WalletSession(
     throw ERRORS.TypedError(HardwareErrorCode.DeviceCheckUnlockTypeError);
   };
 
-  const selectMainWallet = async (force = false) => {
-    if (force || !mainWalletSelected) {
+  const selectMainPin = async (force = false) => {
+    if (force || !mainPinSelected) {
       await device.unlockDevice(DeviceSessionPinType.Main, {
         source: 'wallet-session-coordinator',
         reason: expectedPassphraseState ? 'session-recovery' : 'open-wallet',
         deviceOnly: true,
       });
-      mainWalletSelected = true;
+      mainPinSelected = true;
+    }
+  };
+
+  const selectStandardWallet = async () => {
+    // Main PIN authenticates the device; an empty host passphrase selects the standard derivation.
+    await selectMainPin();
+    if (device.features?.passphraseProtection === true) {
+      await askDevicePassphrase(device, {
+        passphrase: '',
+        on_device: false,
+      });
     }
   };
 
@@ -259,7 +270,7 @@ export async function getProtocolV2WalletSession(
     if (cachedStandardSession) {
       try {
         if (options?.selectMainWalletBeforeRestore) {
-          await selectMainWallet();
+          await selectMainPin();
         }
         response = await getDeviceSession(
           device,
@@ -280,7 +291,7 @@ export async function getProtocolV2WalletSession(
     }
 
     if (!response) {
-      await selectMainWallet();
+      await selectStandardWallet();
       response = await getDeviceSession(
         device,
         buildDeviceSessionGetRequest({ deriveCardano: options?.deriveCardano })
@@ -348,7 +359,7 @@ export async function getProtocolV2WalletSession(
     }
     if (options?.onlyMainPin) {
       device.clearStandardInternalState?.();
-      await selectMainWallet(true);
+      await selectStandardWallet();
       response = await getDeviceSession(
         device,
         buildDeviceSessionGetRequest({ deriveCardano: options?.deriveCardano })
@@ -391,7 +402,7 @@ export async function getProtocolV2WalletSession(
   return {
     passphraseState: message.btc_test_address,
     newSession: message.session_id,
-    unlockedAttachPin: mainWalletSelected ? false : undefined,
+    unlockedAttachPin: mainPinSelected ? false : undefined,
     resumed,
   };
 }