@onekeyfe/hd-core 1.2.2-alpha.7 → 1.2.2-alpha.8

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

@@ -154,7 +154,7 @@ describe('openWalletSession', () => {
     expect(typedCall).toHaveBeenCalledWith('DeviceSessionGet', 'DeviceSession', standardSessionGet);
   });
 
-  test('selects the Main PIN before opening the standard wallet when passphrase is disabled', async () => {
+  test('opens the already-unlocked standard wallet without repeating Main PIN when passphrase is disabled', async () => {
     const typedCall = jest.fn((request: string) => {
       if (request === 'ProtocolInfoRequest') {
         return { message: { version: 2 } };
@@ -173,11 +173,7 @@ describe('openWalletSession', () => {
 
     await getProtocolV2WalletSession(device as any, { onlyMainPin: true });
 
-    expect(device.unlockDevice).toHaveBeenCalledWith(DeviceSessionPinType.Main, {
-      source: 'wallet-session-coordinator',
-      reason: 'open-wallet',
-      deviceOnly: true,
-    });
+    expect(device.unlockDevice).not.toHaveBeenCalled();
     expect(typedCall).not.toHaveBeenCalledWith(
       'DeviceSessionAskPassphrase',
       'Success',
@@ -186,6 +182,47 @@ describe('openWalletSession', () => {
     expect(typedCall).toHaveBeenCalledWith('DeviceSessionGet', 'DeviceSession', standardSessionGet);
   });
 
+  test('still requires Main PIN when a cached standard session resolves to another wallet', async () => {
+    let sessionGetCount = 0;
+    const typedCall = jest.fn((request: string) => {
+      if (request === 'ProtocolInfoRequest') {
+        return { message: { version: 2 } };
+      }
+      if (request === 'DeviceSessionGet') {
+        sessionGetCount += 1;
+        return {
+          message: {
+            btc_test_address:
+              sessionGetCount === 1 ? 'unexpected-wallet-state' : 'cached-standard-state',
+            session_id:
+              sessionGetCount === 1 ? 'unexpected-wallet-session' : 'cached-standard-session',
+          },
+        };
+      }
+      throw new Error(`Unexpected request: ${request}`);
+    });
+    const device = createDevice({ passphraseProtection: false, typedCall });
+    device.getStandardInternalState = jest.fn(() => ({
+      passphraseState: 'cached-standard-state',
+      sessionId: 'cached-standard-session',
+    }));
+    device.clearStandardInternalState = jest.fn();
+
+    await expect(
+      getProtocolV2WalletSession(device as any, { onlyMainPin: true })
+    ).resolves.toMatchObject({
+      passphraseState: 'cached-standard-state',
+      newSession: 'cached-standard-session',
+    });
+
+    expect(device.unlockDevice).toHaveBeenCalledWith(DeviceSessionPinType.Main, {
+      source: 'wallet-session-coordinator',
+      reason: 'session-recovery',
+      deviceOnly: true,
+    });
+    expect(sessionGetCount).toBe(2);
+  });
+
   test('reuses a Main PIN selected by the current preflight when passphrase is disabled', async () => {
     const typedCall = jest.fn((request: string) => {
       if (request === 'ProtocolInfoRequest') {

package/dist/index.js

@@ -41981,7 +41981,7 @@ function getProtocolV2WalletSession(device, options) {
                 standardWalletSelected = true;
             }
         });
-        const selectStandardWallet = () => __awaiter(this, void 0, void 0, function* () {
+        const selectStandardWallet = (forceMainPin = false) => __awaiter(this, void 0, void 0, function* () {
             var _q;
             if (((_q = device.features) === null || _q === void 0 ? void 0 : _q.passphraseProtection) === true) {
                 yield selectMainPin();
@@ -41992,7 +41992,8 @@ function getProtocolV2WalletSession(device, options) {
                 standardWalletSelected = true;
             }
             else if (!standardWalletSelected) {
-                yield selectMainPin(true);
+                yield selectMainPin(forceMainPin);
+                standardWalletSelected = true;
             }
         });
         if (readCurrentAttachPinSession) {
@@ -42091,7 +42092,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 selectStandardWallet();
+                yield selectStandardWallet(true);
                 response = yield getDeviceSession(device, sessionGetRequest());
             }
             else {

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;AA8JD,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;IAEtB,4BAA4B,CAAC,EAAE,OAAO,CAAC;IACvC,6BAA6B,CAAC,EAAE,OAAO,CAAC;IACxC,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,aAAa,CAAC,EAAE,OAAO,CAAC;IAExB,2BAA2B,CAAC,EAAE,OAAO,CAAC;IAEtC,eAAe,CAAC,EAAE,OAAO,CAAC;CAC3B;;;;;;GAuXF;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;AA8JD,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;IAEtB,4BAA4B,CAAC,EAAE,OAAO,CAAC;IACvC,6BAA6B,CAAC,EAAE,OAAO,CAAC;IACxC,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,aAAa,CAAC,EAAE,OAAO,CAAC;IAExB,2BAA2B,CAAC,EAAE,OAAO,CAAC;IAEtC,eAAe,CAAC,EAAE,OAAO,CAAC;CAC3B;;;;;;GAyXF;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.2-alpha.7",
+  "version": "1.2.2-alpha.8",
   "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.2-alpha.7",
-    "@onekeyfe/hd-transport": "1.2.2-alpha.7",
+    "@onekeyfe/hd-shared": "1.2.2-alpha.8",
+    "@onekeyfe/hd-transport": "1.2.2-alpha.8",
     "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": "29b87f1c04fea60459d900ef1f61cb9f17eaa4d3"
+  "gitHead": "7a5d129ea1db0b3eb230e309ab29ed3e9e7f141e"
 }

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

@@ -371,7 +371,7 @@ export async function getProtocolV2WalletSession(
     }
   };
 
-  const selectStandardWallet = async () => {
+  const selectStandardWallet = async (forceMainPin = false) => {
     if (device.features?.passphraseProtection === true) {
       // Main PIN authenticates the device; an empty host passphrase selects the standard derivation.
       await selectMainPin();
@@ -387,8 +387,10 @@ export async function getProtocolV2WalletSession(
       standardWalletSelected = true;
     } else if (!standardWalletSelected) {
       // Without passphrase protection there is no empty-passphrase selector.
-      // Main PIN selection is the only authoritative switch back to the standard wallet.
-      await selectMainPin(true);
+      // An unlocked non-Attach-PIN device is already in the only available wallet context.
+      // Force Main PIN only when recovering from a mismatched cached standard session.
+      await selectMainPin(forceMainPin);
+      standardWalletSelected = true;
     }
   };
 
@@ -499,7 +501,7 @@ export async function getProtocolV2WalletSession(
     }
     if (options?.onlyMainPin) {
       device.clearStandardInternalState?.();
-      await selectStandardWallet();
+      await selectStandardWallet(true);
       response = await getDeviceSession(device, sessionGetRequest());
     } else {
       device.clearInternalState();