@onekeyfe/hd-core 1.2.2-alpha.3 → 1.2.2-alpha.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-core",
-  "version": "1.2.2-alpha.3",
+  "version": "1.2.2-alpha.5",
   "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.3",
-    "@onekeyfe/hd-transport": "1.2.2-alpha.3",
+    "@onekeyfe/hd-shared": "1.2.2-alpha.5",
+    "@onekeyfe/hd-transport": "1.2.2-alpha.5",
     "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": "4efa66df8851607586d0ae6a431a63404beff51b"
+  "gitHead": "82503995b10dd1e293941594239423e3c640973b"
 }

package/src/api/OpenWalletSession.ts

@@ -160,7 +160,6 @@ export default class OpenWalletSession extends BaseMethod<OpenWalletSessionParam
       const session = isProtocolV2
         ? await getProtocolV2WalletSession(this.device, {
             onlyMainPin: true,
-            deriveCardano: this.payload.deriveCardano,
             selectMainWalletBeforeRestore:
               !hasAuthoritativeProtocolV2WalletStatus(state) ||
               state.status.unlockedAttachPin === true,
@@ -225,7 +224,6 @@ export default class OpenWalletSession extends BaseMethod<OpenWalletSessionParam
       const session = isProtocolV2
         ? await getProtocolV2WalletSession(this.device, {
             expectedPassphraseState: this.params.passphraseState,
-            deriveCardano: this.payload.deriveCardano,
           })
         : await getPassphraseStateWithRefreshDeviceInfo(this.device, {
             expectPassphraseState: this.params.passphraseState,
@@ -257,7 +255,6 @@ export default class OpenWalletSession extends BaseMethod<OpenWalletSessionParam
           ...(readCurrentAttachPinSession
             ? { readCurrentAttachPinSession: true }
             : { forceWalletSelection: true }),
-          deriveCardano: this.payload.deriveCardano,
         })
       : await getPassphraseStateWithRefreshDeviceInfo(this.device, { initSession: true });
     const refreshedState = isProtocolV2

package/src/api/allnetwork/AllNetworkGetAddressBase.ts

@@ -393,8 +393,8 @@ export default abstract class AllNetworkGetAddressBase extends BaseMethod<
           // the root fingerprint, so each nested chain method must resume the
           // requested standard or hidden wallet before sending its device command.
           const useEmptyPassphrase = this.payload.useEmptyPassphrase === true;
-          // false would AskPassphrase with [Standard] only and permanently drop Cardano
-          // from a reused session. Omit the flag for non-Cardano nested methods.
+          // Nested Cardano methods opt in to [Standard, Cardano] if Ask rebuilds.
+          // Other chains stay Standard-only.
           const deriveCardano = method.name.startsWith('cardano') ? true : undefined;
           const shouldResumeWalletSession = useEmptyPassphrase || !!this.payload.passphraseState;
           if (this.device.isProtocolV2() && shouldResumeWalletSession) {

package/src/core/index.ts

@@ -105,8 +105,10 @@ function resolveDeriveCardano(method: BaseMethod): boolean | undefined {
   if (method.name.startsWith('cardano')) {
     return true;
   }
-  if (typeof method.payload?.deriveCardano === 'boolean') {
-    return method.payload.deriveCardano;
+  // V1 Initialize only sends derive_cardano on an explicit true.
+  // V2 AskPassphrase maps true to [Standard, Cardano] and anything else to [Standard].
+  if (method.payload?.deriveCardano === true) {
+    return true;
   }
   return undefined;
 }

package/src/data/messages/messages-protocol-v2.json

@@ -12334,6 +12334,11 @@
         "btc_test_address": {
           "type": "string",
           "id": 2
+        },
+        "seed_domains": {
+          "rule": "repeated",
+          "type": "DeviceSessionSeedDomain",
+          "id": 3
         }
       }
     },
@@ -12847,57 +12852,36 @@
       },
       "reserved": [[2, 2], "placeholder"]
     },
-    "ViewContentPreview": {
+    "ViewData": {
       "fields": {
-        "content_key": {
-          "rule": "required",
-          "type": "uint32",
-          "id": 1
-        },
         "preview": {
           "rule": "required",
           "type": "bytes",
-          "id": 2
+          "id": 1
         },
         "total_bytes": {
+          "rule": "required",
           "type": "uint32",
-          "id": 3
+          "id": 2
         }
       }
     },
-    "ViewContentEntry": {
+    "ViewDataPage": {
       "fields": {
-        "entry_key": {
+        "chunk": {
           "rule": "required",
-          "type": "uint32",
+          "type": "bytes",
           "id": 1
         },
-        "value": {
-          "rule": "required",
-          "type": "bytes",
-          "id": 2
-        }
-      }
-    },
-    "ViewContentPage": {
-      "fields": {
         "page_index": {
           "rule": "required",
           "type": "uint32",
-          "id": 1
+          "id": 2
         },
         "page_count": {
           "rule": "required",
           "type": "uint32",
-          "id": 2
-        },
-        "chunk": {
-          "type": "bytes",
           "id": 3
-        },
-        "entry": {
-          "type": "ViewContentEntry",
-          "id": 4
         }
       }
     },
@@ -12956,8 +12940,8 @@
           "type": "string",
           "id": 9
         },
-        "content": {
-          "type": "ViewContentPreview",
+        "data": {
+          "type": "ViewData",
           "id": 10
         },
         "custom_field": {
@@ -12981,10 +12965,6 @@
         "text_arg": {
           "type": "string",
           "id": 3
-        },
-        "cancellable": {
-          "type": "bool",
-          "id": 4
         }
       }
     },
@@ -13023,10 +13003,6 @@
         "chain_id": {
           "type": "uint32",
           "id": 8
-        },
-        "content": {
-          "type": "ViewContentPreview",
-          "id": 9
         }
       }
     },

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

@@ -63,16 +63,22 @@ const negotiateEventlessWalletSession = async (device: Device) => {
 const getDeviceSession = async (device: Device, request: DeviceSessionGet) =>
   device.commands.typedCall('DeviceSessionGet', 'DeviceSession', request);
 
+const STANDARD_SEED_DOMAINS = [DeviceSessionSeedDomain.SeedDomain_Standard];
+const CARDANO_SEED_DOMAINS = [
+  DeviceSessionSeedDomain.SeedDomain_Standard,
+  DeviceSessionSeedDomain.SeedDomain_Cardano,
+];
+
 const buildDeviceSessionSeedDomains = (deriveCardano?: boolean): DeviceSessionSeedDomain[] =>
-  deriveCardano === undefined
-    ? []
-    : [
-        DeviceSessionSeedDomain.SeedDomain_Standard,
-        ...(deriveCardano ? [DeviceSessionSeedDomain.SeedDomain_Cardano] : []),
-      ];
-
-// Seed domains are applied when creating a passphrase session, not when reading/resuming one.
-// Current firmware rejects unknown DeviceSessionGet fields, including leftover seed_domains.
+  deriveCardano === true ? CARDANO_SEED_DOMAINS : STANDARD_SEED_DOMAINS;
+
+const deviceSessionHasCardano = (message: { seed_domains?: DeviceSessionSeedDomain[] }) =>
+  Array.isArray(message.seed_domains) &&
+  message.seed_domains.includes(DeviceSessionSeedDomain.SeedDomain_Cardano);
+
+// AskPassphrase.seed_domains selects which seeds to generate. DeviceSessionGet
+// only resumes or reads the current session; firmware rejects unknown Get
+// fields, including leftover seed_domains.
 const buildDeviceSessionGetRequest = ({
   sessionId,
   expectedPassphraseState,
@@ -459,6 +465,38 @@ export async function getProtocolV2WalletSession(
     }
   }
 
+  // DeviceSession.seed_domains reports what the SE already generated. Get
+  // cannot add Cardano, so a Cardano call on a Standard-only session must Ask again.
+  if (options?.deriveCardano === true && !deviceSessionHasCardano(message)) {
+    if (options?.resumeOnly) {
+      device.clearInternalState();
+      throw ERRORS.TypedError(HardwareErrorCode.WalletSessionInvalid);
+    }
+    resumed = false;
+    if (options?.onlyMainPin) {
+      await selectStandardWallet();
+      response = await getDeviceSession(device, buildDeviceSessionGetRequest());
+    } else {
+      response = await selectDeviceSession(
+        device,
+        expectedPassphraseState,
+        true,
+        markWalletStatusRefreshed
+      );
+    }
+    message = response.message;
+    try {
+      assertCompleteDeviceSession(message);
+    } catch (error) {
+      if (options?.onlyMainPin) {
+        device.clearStandardInternalState?.();
+      } else {
+        device.clearInternalState();
+      }
+      throw error;
+    }
+  }
+
   const internalStateArgs = [
     true,
     message.btc_test_address,