@onekeyfe/hd-core 1.2.2-alpha.10 → 1.2.2-alpha.11

package/__tests__/logBlockEvent.test.ts

@@ -7,36 +7,6 @@ import {
 } from '../src/events';
 
 describe('getLogBlockLabel', () => {
-  it('blocks evmSignTypedData params before logging large typed data', () => {
-    expect(
-      getLogBlockLabel({
-        method: 'evmSignTypedData',
-        data: {
-          message: {
-            data: `0x${'ab'.repeat(4096)}`,
-          },
-        },
-      })
-    ).toBe('evmSignTypedData');
-  });
-
-  it('blocks evmSignTypedData iframe call payload before bridge logging', () => {
-    expect(
-      getLogBlockLabel({
-        event: 'iframe-call',
-        type: 'iframe-call',
-        payload: {
-          method: 'evmSignTypedData',
-          data: {
-            message: {
-              data: `0x${'ab'.repeat(4096)}`,
-            },
-          },
-        },
-      })
-    ).toBe('evmSignTypedData');
-  });
-
   it('keeps existing sensitive UI response blocking', () => {
     expect(getLogBlockLabel({ type: UI_RESPONSE.RECEIVE_PIN })).toBe(UI_RESPONSE.RECEIVE_PIN);
   });
@@ -53,119 +23,72 @@ describe('getLogBlockLabel', () => {
           },
         })
       ).toBe(type);
-    }
-  );
-
-  it('blocks openWalletSession wallet identifiers in direct and iframe call logging', () => {
-    const payload = {
-      method: 'openWalletSession',
-      mode: 'resume-hidden',
-      deviceId: 'device-id',
-      passphraseState: 'wallet-identifier',
-    };
-
-    expect(getLogBlockLabel(payload)).toBe('openWalletSession');
-    expect(
-      getLogBlockLabel({
-        event: 'iframe-call',
-        type: 'iframe-call',
-        payload,
-      })
-    ).toBe('openWalletSession');
-  });
-
-  it('keeps openWalletSession metadata while redacting wallet session identifiers', () => {
-    const safeResponse = getSafeLogPayload(
-      {
-        success: true,
-        payload: {
-          protocol: 'V2',
-          walletType: 'hidden',
-          deviceId: 'device-id',
-          passphraseState: 'wallet-identifier',
-          sessionId: 'wallet-session-id',
-          resumed: false,
-        },
-      },
-      'openWalletSession'
-    );
-
-    expect(safeResponse).toEqual({
-      method: 'openWalletSession',
-      success: true,
-      payload: {
-        protocol: 'V2',
-        walletType: 'hidden',
-        deviceId: 'device-id',
-        passphraseState: '[REDACTED]',
-        sessionId: '[REDACTED]',
-        resumed: false,
-      },
-    });
-  });
-
-  it.each(['deviceUploadNft', 'deviceUploadWallpaper', 'uploadPortfolio'])(
-    'skips large Base64 resource payload logging for %s',
-    method => {
-      const request = { method, path: 'resource.bin', data: 'A'.repeat(1024 * 1024) };
-      expect(getLogBlockLabel(request)).toBe(method);
-      expect(getSafeLogPayload(request, method)).toEqual({
-        method,
+      expect(
+        getSafeLogPayload(
+          {
+            type,
+            payload: {
+              passphraseState: 'wallet-identifier',
+            },
+          },
+          type
+        )
+      ).toEqual({
+        method: type,
         payload: '[REDACTED]',
       });
     }
   );
 
-  it.each(['fileWrite', 'fileRead'])(
-    'keeps metadata and replaces binary payloads with their size for %s',
+  it.each(['deviceUploadNft', 'deviceUploadWallpaper', 'uploadPortfolio', 'fileWrite', 'fileRead'])(
+    'skips large resource or binary payload logging for %s',
     method => {
-      const request = { method, path: 'resource.bin', data: new Uint8Array(1024) };
+      const request = { method, path: 'resource.bin', data: 'A'.repeat(1024) };
       expect(getLogBlockLabel(request)).toBe(method);
       expect(getSafeLogPayload(request, method)).toEqual({
         method,
-        path: 'resource.bin',
-        data: '[BINARY:1024]',
+        payload: '[REDACTED]',
       });
     }
   );
 
-  it.each(['evmSignMessage', 'btcSignMessage', 'evmSignTransaction'])(
-    'blocks request and response payload logging for signing method %s',
-    method => {
-      expect(getLogBlockLabel({ method, message: 'sensitive signing payload' })).toBe(method);
-      expect(
-        getLogBlockLabel({
-          event: 'iframe-call',
-          payload: { method, message: 'sensitive signing payload' },
-        })
-      ).toBe(method);
-    }
-  );
+  it('logs signing requests and responses as-is', () => {
+    const request = {
+      method: 'btcSignMessage',
+      path: "m/44'/0'/0'/0/0",
+      messageHex: '68656c6c6f',
+      coin: 'Bitcoin',
+    };
+    const iframeRequest = {
+      event: 'iframe-call',
+      payload: request,
+    };
+    const response = {
+      success: true,
+      payload: {
+        signature: 'signature-bytes',
+        address: 'bc1qexample',
+      },
+    };
+
+    expect(getLogBlockLabel(request)).toBeUndefined();
+    expect(getLogBlockLabel(iframeRequest)).toBeUndefined();
+    expect(getSafeLogPayload(request)).toBe(request);
+    expect(getSafeLogPayload(response)).toBe(response);
+  });
 
   it('keeps ordinary API requests and responses visible', () => {
     const request = { method: 'getDeviceState', connectId: 'connect-id', scope: 'runtime' };
     const response = { success: true, payload: { protocol: 'V2', initialized: true } };
 
     expect(getLogBlockLabel(request)).toBeUndefined();
-    expect(getSafeLogPayload(request)).toEqual(request);
-    expect(getSafeLogPayload(response)).toEqual(response);
-  });
-
-  it('redacts sensitive keys even for ordinary API payloads', () => {
-    expect(
-      getSafeLogPayload({
-        method: 'ordinaryMethod',
-        payload: { session_id: 'session-secret', nested: { pin: '1234' } },
-      })
-    ).toEqual({
-      method: 'ordinaryMethod',
-      payload: { session_id: '[REDACTED]', nested: { pin: '[REDACTED]' } },
-    });
+    expect(getSafeLogPayload(request)).toBe(request);
+    expect(getSafeLogPayload(response)).toBe(response);
   });
 
-  it('puts sensitive API method names in the log label', () => {
-    expect(formatLogMethodLabel('response:', 'openWalletSession')).toBe(
-      'response: [openWalletSession]'
+  it('puts blocked method names in the log label', () => {
+    expect(formatLogMethodLabel('response:', 'deviceUploadNft')).toBe(
+      'response: [deviceUploadNft]'
     );
     expect(formatLogMethodLabel('response:')).toBe('response:');
   });

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

@@ -2080,6 +2080,59 @@ describe('openWalletSession', () => {
     expect(deviceWalletSessionStore.get('device-1', 'hidden-state')).toBe('renewed-session');
   });
 
+  test('recovers the current Attach PIN wallet when the cached session is invalid', async () => {
+    const typedCall = jest
+      .fn()
+      .mockResolvedValueOnce({ message: { version: 2 } })
+      .mockRejectedValueOnce(
+        Object.assign(new Error('Invalid session'), {
+          errorCode: HardwareErrorCode.WalletSessionInvalid,
+        })
+      )
+      .mockResolvedValueOnce({
+        message: {
+          btc_test_address: 'hidden-state',
+          session_id: 'renewed-session',
+        },
+      });
+    const promptPassphrase = jest.fn();
+    const method = new OpenWalletSession({
+      payload: {
+        method: 'openWalletSession',
+        connectId: 'connect-id',
+        mode: 'resume-hidden',
+        deviceId: 'device-1',
+        passphraseState: 'hidden-state',
+      },
+    });
+    method.init();
+    deviceWalletSessionStore.set('device-1', 'hidden-state', 'expired-session');
+    const device = createDevice({ unlockedAttachPin: true, typedCall, promptPassphrase });
+    method.device = device as any;
+
+    await expect(method.run()).resolves.toEqual({
+      protocol: 'V2',
+      walletType: 'hidden',
+      deviceId: 'device-1',
+      passphraseState: 'hidden-state',
+      resumed: false,
+    });
+    expect(typedCall.mock.calls.filter(call => call[0] === 'DeviceSessionGet')).toEqual([
+      [
+        'DeviceSessionGet',
+        'DeviceSession',
+        {
+          session_id: 'expired-session',
+          btc_test_address: 'hidden-state',
+        },
+      ],
+      ['DeviceSessionGet', 'DeviceSession', {}],
+    ]);
+    expect(promptPassphrase).not.toHaveBeenCalled();
+    expect(device.lockDevice).not.toHaveBeenCalled();
+    expect(deviceWalletSessionStore.get('device-1', 'hidden-state')).toBe('renewed-session');
+  });
+
   test('selects the expected hidden wallet when Protocol V2 has no cached session', async () => {
     const typedCall = jest
       .fn()

package/dist/events/logBlockEvent.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"logBlockEvent.d.ts","sourceRoot":"","sources":["../../src/events/logBlockEvent.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,aAAa,EAAE,GAAG,CAAC,MAAM,CAKpC,CAAC;AAkEH,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS,CAmBrE;AAED,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,OAAO,EAAE,UAAU,CAAC,EAAE,MAAM,GAAG,OAAO,CAoB9E;AAED,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,GAAG,MAAM,CAE/E"}
+{"version":3,"file":"logBlockEvent.d.ts","sourceRoot":"","sources":["../../src/events/logBlockEvent.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,aAAa,EAAE,GAAG,CAAC,MAAM,CAKpC,CAAC;AAYH,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS,CAmBrE;AAED,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,OAAO,EAAE,UAAU,CAAC,EAAE,MAAM,GAAG,OAAO,CAK9E;AAED,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,GAAG,MAAM,CAE/E"}

package/dist/index.js

@@ -41663,61 +41663,13 @@ const LogBlockEvent = new Set([
     UI_RESPONSE.RECEIVE_PIN,
     UI_RESPONSE.RECEIVE_PASSPHRASE,
 ]);
-const LogLabelMethod = new Set([
-    'openWalletSession',
+const LogPayloadBlockMethod = new Set([
     'deviceUploadNft',
     'deviceUploadWallpaper',
     'uploadPortfolio',
     'fileWrite',
     'fileRead',
 ]);
-const LogPayloadBlockMethod = new Set([
-    'deviceUploadNft',
-    'deviceUploadWallpaper',
-    'uploadPortfolio',
-]);
-const SensitiveLogKeys = new Set([
-    'devicestate',
-    'entropy',
-    'expectedpassphrasestate',
-    'mnemonic',
-    'passphrase',
-    'passphrasestate',
-    'password',
-    'pin',
-    'privatekey',
-    'seed',
-    'session',
-    'sessionid',
-    'walletsessionid',
-    'xprv',
-]);
-const normalizeLogKey = (key) => key.replace(/[_-]/g, '').toLowerCase();
-const isSigningMethod = (methodName) => /sign/i.test(methodName);
-const redactLogValue = (value, seen) => {
-    if (ArrayBuffer.isView(value)) {
-        return `[BINARY:${value.byteLength}]`;
-    }
-    if (value instanceof ArrayBuffer) {
-        return `[BINARY:${value.byteLength}]`;
-    }
-    if (Array.isArray(value)) {
-        return value.map(item => redactLogValue(item, seen));
-    }
-    if (!value || typeof value !== 'object')
-        return value;
-    if (seen.has(value))
-        return '[CIRCULAR]';
-    seen.add(value);
-    const redacted = Object.fromEntries(Object.entries(value).map(([key, item]) => [
-        key,
-        SensitiveLogKeys.has(normalizeLogKey(key)) && item !== null && item !== undefined
-            ? '[REDACTED]'
-            : redactLogValue(item, seen),
-    ]));
-    seen.delete(value);
-    return redacted;
-};
 function getLogBlockLabel(message) {
     if (!message || typeof message !== 'object')
         return undefined;
@@ -41726,26 +41678,16 @@ function getLogBlockLabel(message) {
         return type;
     }
     const methodName = method !== null && method !== void 0 ? method : payload === null || payload === void 0 ? void 0 : payload.method;
-    if (methodName && (LogLabelMethod.has(methodName) || isSigningMethod(methodName))) {
+    if (methodName && LogPayloadBlockMethod.has(methodName)) {
         return methodName;
     }
     return undefined;
 }
 function getSafeLogPayload(value, blockLabel) {
-    if (blockLabel &&
-        (LogBlockEvent.has(blockLabel) ||
-            LogPayloadBlockMethod.has(blockLabel) ||
-            isSigningMethod(blockLabel))) {
+    if (blockLabel) {
         return { method: blockLabel, payload: '[REDACTED]' };
     }
-    const redactedValue = redactLogValue(value, new WeakSet());
-    if (blockLabel &&
-        redactedValue &&
-        typeof redactedValue === 'object' &&
-        !Array.isArray(redactedValue)) {
-        return Object.assign(Object.assign({}, redactedValue), { method: blockLabel });
-    }
-    return redactedValue;
+    return value;
 }
 function formatLogMethodLabel(label, methodName) {
     return methodName ? `${label} [${methodName}]` : label;
@@ -41869,7 +41811,7 @@ const selectDeviceSession = (device, expectedPassphraseState, deriveCardano, onS
     return getDeviceSession(device, buildDeviceSessionGetRequest());
 });
 function getProtocolV2WalletSession(device, options) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
     return __awaiter(this, void 0, void 0, function* () {
         const forceWalletSelection = (options === null || options === void 0 ? void 0 : options.forceWalletSelection) === true || (options === null || options === void 0 ? void 0 : options.initSession) === true;
         const readCurrentAttachPinSession = (options === null || options === void 0 ? void 0 : options.readCurrentAttachPinSession) === true;
@@ -41940,7 +41882,7 @@ function getProtocolV2WalletSession(device, options) {
             return keepAttachPin ? Object.assign(session, { viaAttachPin: true }) : session;
         });
         const rejectMismatchedAttachPinWallet = () => __awaiter(this, void 0, void 0, function* () {
-            var _m;
+            var _o;
             const features = yield refreshProtocolV2DeviceStatus(device);
             markWalletStatusRefreshed();
             if (features.unlockedAttachPin !== true) {
@@ -41949,10 +41891,10 @@ function getProtocolV2WalletSession(device, options) {
             try {
                 yield device.lockDevice();
             }
-            catch (_o) {
+            catch (_p) {
             }
             if (options === null || options === void 0 ? void 0 : options.rejectAttachPinForMainWallet) {
-                (_m = device.clearStandardInternalState) === null || _m === void 0 ? void 0 : _m.call(device);
+                (_o = device.clearStandardInternalState) === null || _o === void 0 ? void 0 : _o.call(device);
                 device.clearInternalState();
             }
             else {
@@ -41961,11 +41903,11 @@ function getProtocolV2WalletSession(device, options) {
             throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.DeviceCheckUnlockTypeError);
         });
         const lockAttachPinBeforePassphraseSelection = () => __awaiter(this, void 0, void 0, function* () {
-            var _p;
+            var _q;
             if (readCurrentAttachPinSession || (options === null || options === void 0 ? void 0 : options.onlyMainPin)) {
                 return;
             }
-            if (((_p = device.features) === null || _p === void 0 ? void 0 : _p.unlockedAttachPin) !== true) {
+            if (((_q = device.features) === null || _q === void 0 ? void 0 : _q.unlockedAttachPin) !== true) {
                 return;
             }
             yield rejectMismatchedAttachPinWallet();
@@ -41986,8 +41928,8 @@ function getProtocolV2WalletSession(device, options) {
             }
         });
         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) {
+            var _r;
+            if (((_r = device.features) === null || _r === void 0 ? void 0 : _r.passphraseProtection) === true) {
                 yield selectMainPin();
                 yield askDevicePassphrase(device, {
                     passphrase: '',
@@ -42052,6 +41994,9 @@ function getProtocolV2WalletSession(device, options) {
                     throw error;
                 }
                 resumed = false;
+                if (((_g = device.features) === null || _g === void 0 ? void 0 : _g.unlockedAttachPin) === true) {
+                    response = yield getDeviceSession(device, sessionGetRequest());
+                }
             }
         }
         else if (expectedPassphraseState) {
@@ -42080,7 +42025,7 @@ function getProtocolV2WalletSession(device, options) {
         }
         catch (error) {
             if (options === null || options === void 0 ? void 0 : options.onlyMainPin) {
-                (_g = device.clearStandardInternalState) === null || _g === void 0 ? void 0 : _g.call(device);
+                (_h = device.clearStandardInternalState) === null || _h === void 0 ? void 0 : _h.call(device);
             }
             else {
                 device.clearInternalState();
@@ -42095,7 +42040,7 @@ function getProtocolV2WalletSession(device, options) {
                 throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.WalletSessionInvalid);
             }
             if (options === null || options === void 0 ? void 0 : options.onlyMainPin) {
-                (_h = device.clearStandardInternalState) === null || _h === void 0 ? void 0 : _h.call(device);
+                (_j = device.clearStandardInternalState) === null || _j === void 0 ? void 0 : _j.call(device);
                 yield selectStandardWallet(true);
                 response = yield getDeviceSession(device, sessionGetRequest());
             }
@@ -42110,7 +42055,7 @@ function getProtocolV2WalletSession(device, options) {
             }
             catch (error) {
                 if (options === null || options === void 0 ? void 0 : options.onlyMainPin) {
-                    (_j = device.clearStandardInternalState) === null || _j === void 0 ? void 0 : _j.call(device);
+                    (_k = device.clearStandardInternalState) === null || _k === void 0 ? void 0 : _k.call(device);
                 }
                 else {
                     device.clearInternalState();
@@ -42133,7 +42078,7 @@ function getProtocolV2WalletSession(device, options) {
             if (sessionIsAttachPinWallet(response)) {
                 response = yield askEmptyPassphraseAndGet({ deriveCardano: true, keepAttachPin: true });
             }
-            else if (((_k = device.features) === null || _k === void 0 ? void 0 : _k.passphraseProtection) === false) {
+            else if (((_l = device.features) === null || _l === void 0 ? void 0 : _l.passphraseProtection) === false) {
                 response = yield getDeviceSession(device, buildDeviceSessionGetRequest());
             }
             else if (options === null || options === void 0 ? void 0 : options.onlyMainPin) {
@@ -42150,7 +42095,7 @@ function getProtocolV2WalletSession(device, options) {
             }
             catch (error) {
                 if (options === null || options === void 0 ? void 0 : options.onlyMainPin) {
-                    (_l = device.clearStandardInternalState) === null || _l === void 0 ? void 0 : _l.call(device);
+                    (_m = device.clearStandardInternalState) === null || _m === void 0 ? void 0 : _m.call(device);
                 }
                 else {
                     device.clearInternalState();

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;;;;;;GA6XF;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;;;;;;GAkYF;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.10",
+  "version": "1.2.2-alpha.11",
   "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.10",
-    "@onekeyfe/hd-transport": "1.2.2-alpha.10",
+    "@onekeyfe/hd-shared": "1.2.2-alpha.11",
+    "@onekeyfe/hd-transport": "1.2.2-alpha.11",
     "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": "d20768b7fa33a0aaf42fd65691c2ef7fdae7d7c2"
+  "gitHead": "8928100acb893d72361eb74422d5e2a0f7af77d8"
 }

package/src/events/logBlockEvent.ts

@@ -8,8 +8,9 @@ export const LogBlockEvent: Set<string> = new Set([
   UI_RESPONSE.RECEIVE_PASSPHRASE,
 ]);
 
-const LogLabelMethod: Set<string> = new Set([
-  'openWalletSession',
+// These resource/file APIs did not exist in 1.1.32. Skip the payload so
+// the log layer does not copy huge Base64 or binary data.
+const LogPayloadBlockMethod: Set<string> = new Set([
   'deviceUploadNft',
   'deviceUploadWallpaper',
   'uploadPortfolio',
@@ -17,61 +18,6 @@ const LogLabelMethod: Set<string> = new Set([
   'fileRead',
 ]);
 
-// 资源上传参数可能包含很大的 Base64 字符串。这里按方法整段跳过，避免日志层
-// 递归复制和序列化这些数据；资源 API 与传输内容本身保持不变。
-const LogPayloadBlockMethod: Set<string> = new Set([
-  'deviceUploadNft',
-  'deviceUploadWallpaper',
-  'uploadPortfolio',
-]);
-
-const SensitiveLogKeys: Set<string> = new Set([
-  'devicestate',
-  'entropy',
-  'expectedpassphrasestate',
-  'mnemonic',
-  'passphrase',
-  'passphrasestate',
-  'password',
-  'pin',
-  'privatekey',
-  'seed',
-  'session',
-  'sessionid',
-  'walletsessionid',
-  'xprv',
-]);
-
-const normalizeLogKey = (key: string) => key.replace(/[_-]/g, '').toLowerCase();
-
-const isSigningMethod = (methodName: string) => /sign/i.test(methodName);
-
-const redactLogValue = (value: unknown, seen: WeakSet<object>): unknown => {
-  if (ArrayBuffer.isView(value)) {
-    return `[BINARY:${value.byteLength}]`;
-  }
-  if (value instanceof ArrayBuffer) {
-    return `[BINARY:${value.byteLength}]`;
-  }
-  if (Array.isArray(value)) {
-    return value.map(item => redactLogValue(item, seen));
-  }
-  if (!value || typeof value !== 'object') return value;
-  if (seen.has(value)) return '[CIRCULAR]';
-
-  seen.add(value);
-  const redacted = Object.fromEntries(
-    Object.entries(value as Record<string, unknown>).map(([key, item]) => [
-      key,
-      SensitiveLogKeys.has(normalizeLogKey(key)) && item !== null && item !== undefined
-        ? '[REDACTED]'
-        : redactLogValue(item, seen),
-    ])
-  );
-  seen.delete(value);
-  return redacted;
-};
-
 export function getLogBlockLabel(message: unknown): string | undefined {
   if (!message || typeof message !== 'object') return undefined;
 
@@ -86,7 +32,7 @@ export function getLogBlockLabel(message: unknown): string | undefined {
   }
 
   const methodName = method ?? payload?.method;
-  if (methodName && (LogLabelMethod.has(methodName) || isSigningMethod(methodName))) {
+  if (methodName && LogPayloadBlockMethod.has(methodName)) {
     return methodName;
   }
 
@@ -94,25 +40,10 @@ export function getLogBlockLabel(message: unknown): string | undefined {
 }
 
 export function getSafeLogPayload(value: unknown, blockLabel?: string): unknown {
-  if (
-    blockLabel &&
-    (LogBlockEvent.has(blockLabel) ||
-      LogPayloadBlockMethod.has(blockLabel) ||
-      isSigningMethod(blockLabel))
-  ) {
+  if (blockLabel) {
     return { method: blockLabel, payload: '[REDACTED]' };
   }
-
-  const redactedValue = redactLogValue(value, new WeakSet());
-  if (
-    blockLabel &&
-    redactedValue &&
-    typeof redactedValue === 'object' &&
-    !Array.isArray(redactedValue)
-  ) {
-    return { ...redactedValue, method: blockLabel };
-  }
-  return redactedValue;
+  return value;
 }
 
 export function formatLogMethodLabel(label: string, methodName?: string): string {

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

@@ -234,9 +234,9 @@ export async function getProtocolV2WalletSession(
   const forceWalletSelection =
     options?.forceWalletSelection === true || options?.initSession === true;
   const readCurrentAttachPinSession = options?.readCurrentAttachPinSession === true;
-  const sessionIsAttachPinWallet = (session?: { viaAttachPin?: boolean }) =>
+  const sessionIsAttachPinWallet = (session?: unknown) =>
     readCurrentAttachPinSession ||
-    session?.viaAttachPin === true ||
+    (session as { viaAttachPin?: boolean } | undefined)?.viaAttachPin === true ||
     device.features?.unlockedAttachPin === true;
 
   if (forceWalletSelection) {
@@ -455,6 +455,11 @@ export async function getProtocolV2WalletSession(
         throw error;
       }
       resumed = false;
+      if (device.features?.unlockedAttachPin === true) {
+        // Locking invalidates the old handle, but Attach PIN already selected the wallet.
+        // Read the current session and validate its passphrase state below.
+        response = await getDeviceSession(device, sessionGetRequest());
+      }
     }
   } else if (expectedPassphraseState) {
     try {