@onekeyfe/hardware-cli 1.1.26-alpha.105 → 1.1.26-alpha.2

package/.eslintignore

@@ -0,0 +1,4 @@
+dist/
+node_modules/
+*.js
+!src/**/*.ts

package/dist/chains.d.ts

@@ -12,12 +12,18 @@ import type { CoreApi } from '@onekeyfe/hd-core';
 /**
  * Common params passed to all SDK methods.
  * Reference: packages/core/src/types/api/export.ts (CommonParams)
+ *
+ * `skipPassphraseCheck` is CLI-internal plumbing — runCommand sets it to
+ * true so the interactive REQUEST_PASSPHRASE handler can own the prompt
+ * flow without the SDK rejecting with error 114 first. Exposed on the
+ * interface so inner helpers (batch flows, etc.) can forward it safely.
  */
 export interface CommonCLIParams {
     connectId?: string;
     deviceId?: string;
     passphraseState?: string;
     useEmptyPassphrase?: boolean;
+    skipPassphraseCheck?: boolean;
 }
 export interface GetAddressParams extends CommonCLIParams {
     chain: string;

package/dist/chains.js

@@ -1,5 +1,4 @@
-'use strict';
-
+"use strict";
 /**
  * Chain Resolver — maps chain identifiers to the correct SDK API calls.
  * Handles derivation path defaults and chain-specific parameter transformations.
@@ -12,6 +11,26 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.resolveBatchGetAddress = exports.resolveSignMessage = exports.resolveSignTransaction = exports.resolveGetPublicKey = exports.resolveGetAddress = void 0;
+/**
+ * Extract params shared by every SDK method. Forwarded unconditionally:
+ *
+ * - `passphraseState` / `useEmptyPassphrase` — wallet selection.
+ * - `skipPassphraseCheck` — tells the SDK to skip its own
+ *   `checkPassphraseStateSafety` + error-114 gate so our interactive
+ *   `REQUEST_PASSPHRASE` handler can own the passphrase prompt flow.
+ *   `runCommand` always sets this to `true` via `getCommonParams`.
+ *
+ * All three are forwarded even when falsy/undefined — SDK treats missing
+ * and undefined identically. This avoids silent losses when inner calls
+ * (e.g. `resolveBatchGetAddress`) reconstruct a params object manually.
+ */
+function extractCommonParams(params) {
+    return {
+        passphraseState: params.passphraseState,
+        useEmptyPassphrase: params.useEmptyPassphrase,
+        skipPassphraseCheck: params.skipPassphraseCheck,
+    };
+}
 // Default BIP44 derivation paths per chain
 // Sources: developer-portal core-api-guide.mdx + chain-specific docs
 const DEFAULT_PATHS = {
@@ -31,7 +50,7 @@ const DEFAULT_PATHS = {
     nostr: "m/44'/1237'/0'/0/0",
     filecoin: "m/44'/461'/0'/0/0",
     kaspa: "m/44'/111111'/0'/0/0",
-    algo: "m/44'/283'/0'/0/0",
+    algo: "m/44'/283'/0'/0'/0'",
     conflux: "m/44'/503'/0'/0/0",
     nervos: "m/44'/309'/0'/0/0",
     alephium: "m/44'/1234'/0'/0/0",
@@ -81,13 +100,14 @@ async function resolveGetAddress(sdk, params) {
     const showOnOneKey = params.showOnDevice ?? true;
     const connectId = params.connectId || '';
     const deviceId = params.deviceId || '';
+    const commonParams = extractCommonParams(params);
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     const chainMethodMap = {
-        evm: () => sdk.evmGetAddress(connectId, deviceId, { path, showOnOneKey }),
-        btc: () => sdk.btcGetAddress(connectId, deviceId, { path, showOnOneKey, coin: 'btc' }),
-        sol: () => sdk.solGetAddress(connectId, deviceId, { path, showOnOneKey }),
-        tron: () => sdk.tronGetAddress(connectId, deviceId, { path, showOnOneKey }),
-        cosmos: () => sdk.cosmosGetAddress(connectId, deviceId, { path, showOnOneKey }),
+        evm: () => sdk.evmGetAddress(connectId, deviceId, { path, showOnOneKey, ...commonParams }),
+        btc: () => sdk.btcGetAddress(connectId, deviceId, { path, showOnOneKey, coin: 'btc', ...commonParams }),
+        sol: () => sdk.solGetAddress(connectId, deviceId, { path, showOnOneKey, ...commonParams }),
+        tron: () => sdk.tronGetAddress(connectId, deviceId, { path, showOnOneKey, ...commonParams }),
+        cosmos: () => sdk.cosmosGetAddress(connectId, deviceId, { path, showOnOneKey, ...commonParams }),
         // Cardano requires networkId, protocolMagic, derivationType
         cardano: () => sdk.cardanoGetAddress(connectId, deviceId, {
             addressParameters: { path, addressType: 0 },
@@ -95,6 +115,7 @@ async function resolveGetAddress(sdk, params) {
             protocolMagic: 764824073,
             derivationType: 1,
             showOnOneKey,
+            ...commonParams,
         }),
         // Polkadot requires network param
         polkadot: () => sdk.polkadotGetAddress(connectId, deviceId, {
@@ -102,26 +123,47 @@ async function resolveGetAddress(sdk, params) {
             prefix: 0,
             network: 'polkadot',
             showOnOneKey,
+            ...commonParams,
+        }),
+        aptos: () => sdk.aptosGetAddress(connectId, deviceId, { path, showOnOneKey, ...commonParams }),
+        sui: () => sdk.suiGetAddress(connectId, deviceId, { path, showOnOneKey, ...commonParams }),
+        near: () => sdk.nearGetAddress(connectId, deviceId, { path, showOnOneKey, ...commonParams }),
+        xrp: () => sdk.xrpGetAddress(connectId, deviceId, { path, showOnOneKey, ...commonParams }),
+        stellar: () => sdk.stellarGetAddress(connectId, deviceId, { path, showOnOneKey, ...commonParams }),
+        ton: () => sdk.tonGetAddress(connectId, deviceId, { path, showOnOneKey, ...commonParams }),
+        filecoin: () => sdk.filecoinGetAddress(connectId, deviceId, { path, showOnOneKey, ...commonParams }),
+        kaspa: () => sdk.kaspaGetAddress(connectId, deviceId, {
+            path,
+            showOnOneKey,
+            prefix: 'kaspa',
+            ...commonParams,
+        }),
+        algo: () => sdk.algoGetAddress(connectId, deviceId, { path, showOnOneKey, ...commonParams }),
+        conflux: () => sdk.confluxGetAddress(connectId, deviceId, { path, showOnOneKey, ...commonParams }),
+        nervos: () => sdk.nervosGetAddress(connectId, deviceId, {
+            path,
+            showOnOneKey,
+            network: 'ckb',
+            ...commonParams,
+        }),
+        alephium: () => sdk.alephiumGetAddress(connectId, deviceId, {
+            path,
+            showOnOneKey,
+            group: 0,
+            ...commonParams,
+        }),
+        neo: () => sdk.neoGetAddress(connectId, deviceId, { path, showOnOneKey, ...commonParams }),
+        starcoin: () => sdk.starcoinGetAddress(connectId, deviceId, { path, showOnOneKey, ...commonParams }),
+        nem: () => sdk.nemGetAddress(connectId, deviceId, { path, showOnOneKey, network: 104, ...commonParams }),
+        dnx: () => sdk.dnxGetAddress(connectId, deviceId, { path, showOnOneKey, ...commonParams }),
+        scdo: () => sdk.scdoGetAddress(connectId, deviceId, { path, showOnOneKey, ...commonParams }),
+        benfen: () => sdk.benfenGetAddress(connectId, deviceId, { path, showOnOneKey, ...commonParams }),
+        nexa: () => sdk.nexaGetAddress(connectId, deviceId, {
+            path,
+            showOnOneKey,
+            prefix: 'nexa',
+            ...commonParams,
         }),
-        aptos: () => sdk.aptosGetAddress(connectId, deviceId, { path, showOnOneKey }),
-        sui: () => sdk.suiGetAddress(connectId, deviceId, { path, showOnOneKey }),
-        near: () => sdk.nearGetAddress(connectId, deviceId, { path, showOnOneKey }),
-        xrp: () => sdk.xrpGetAddress(connectId, deviceId, { path, showOnOneKey }),
-        stellar: () => sdk.stellarGetAddress(connectId, deviceId, { path, showOnOneKey }),
-        ton: () => sdk.tonGetAddress(connectId, deviceId, { path, showOnOneKey }),
-        filecoin: () => sdk.filecoinGetAddress(connectId, deviceId, { path, showOnOneKey }),
-        kaspa: () => sdk.kaspaGetAddress(connectId, deviceId, { path, showOnOneKey, prefix: 'kaspa' }),
-        algo: () => sdk.algoGetAddress(connectId, deviceId, { path, showOnOneKey }),
-        conflux: () => sdk.confluxGetAddress(connectId, deviceId, { path, showOnOneKey }),
-        nervos: () => sdk.nervosGetAddress(connectId, deviceId, { path, showOnOneKey, network: 'ckb' }),
-        alephium: () => sdk.alephiumGetAddress(connectId, deviceId, { path, showOnOneKey, group: 0 }),
-        neo: () => sdk.neoGetAddress(connectId, deviceId, { path, showOnOneKey }),
-        starcoin: () => sdk.starcoinGetAddress(connectId, deviceId, { path, showOnOneKey }),
-        nem: () => sdk.nemGetAddress(connectId, deviceId, { path, showOnOneKey, network: 104 }),
-        dnx: () => sdk.dnxGetAddress(connectId, deviceId, { path, showOnOneKey }),
-        scdo: () => sdk.scdoGetAddress(connectId, deviceId, { path, showOnOneKey }),
-        benfen: () => sdk.benfenGetAddress(connectId, deviceId, { path, showOnOneKey }),
-        nexa: () => sdk.nexaGetAddress(connectId, deviceId, { path, showOnOneKey, prefix: 'nexa' }),
     };
     const method = chainMethodMap[chain];
     if (!method) {
@@ -139,17 +181,18 @@ async function resolveGetPublicKey(sdk, params) {
     const path = params.path || getDefaultPath(chain);
     const connectId = params.connectId || '';
     const deviceId = params.deviceId || '';
+    const commonParams = extractCommonParams(params);
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     const chainMethodMap = {
-        evm: () => sdk.evmGetPublicKey(connectId, deviceId, { path }),
-        btc: () => sdk.btcGetPublicKey(connectId, deviceId, { path, coin: 'btc' }),
-        aptos: () => sdk.aptosGetPublicKey(connectId, deviceId, { path }),
-        cosmos: () => sdk.cosmosGetPublicKey(connectId, deviceId, { path }),
-        sui: () => sdk.suiGetPublicKey(connectId, deviceId, { path }),
-        starcoin: () => sdk.starcoinGetPublicKey(connectId, deviceId, { path }),
-        nostr: () => sdk.nostrGetPublicKey(connectId, deviceId, { path }),
-        benfen: () => sdk.benfenGetPublicKey(connectId, deviceId, { path }),
-        cardano: () => sdk.cardanoGetPublicKey(connectId, deviceId, { path, derivationType: 1 }),
+        evm: () => sdk.evmGetPublicKey(connectId, deviceId, { path, ...commonParams }),
+        btc: () => sdk.btcGetPublicKey(connectId, deviceId, { path, coin: 'btc', ...commonParams }),
+        aptos: () => sdk.aptosGetPublicKey(connectId, deviceId, { path, ...commonParams }),
+        cosmos: () => sdk.cosmosGetPublicKey(connectId, deviceId, { path, ...commonParams }),
+        sui: () => sdk.suiGetPublicKey(connectId, deviceId, { path, ...commonParams }),
+        starcoin: () => sdk.starcoinGetPublicKey(connectId, deviceId, { path, ...commonParams }),
+        nostr: () => sdk.nostrGetPublicKey(connectId, deviceId, { path, ...commonParams }),
+        benfen: () => sdk.benfenGetPublicKey(connectId, deviceId, { path, ...commonParams }),
+        cardano: () => sdk.cardanoGetPublicKey(connectId, deviceId, { path, derivationType: 1, ...commonParams }),
     };
     const method = chainMethodMap[chain];
     if (!method) {
@@ -165,50 +208,102 @@ async function resolveSignTransaction(sdk, params) {
     const connectId = params.connectId || '';
     const deviceId = params.deviceId || '';
     const tx = params.transaction;
+    const commonParams = extractCommonParams(params);
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     const chainMethodMap = {
         // EVM: chainId is inside the transaction object, not top-level
-        evm: () => sdk.evmSignTransaction(connectId, deviceId, { path, transaction: tx }),
-        // BTC: requires inputs/outputs/refTxs/coin format
-        btc: () => sdk.btcSignTransaction(connectId, deviceId, { coin: 'btc', ...tx }),
-        sol: () => sdk.solSignTransaction(connectId, deviceId, { path, rawTx: tx.rawTx }),
-        tron: () => sdk.tronSignTransaction(connectId, deviceId, { path, transaction: tx }),
-        cosmos: () => sdk.cosmosSignTransaction(connectId, deviceId, { path, rawTx: tx.rawTx }),
-        aptos: () => sdk.aptosSignTransaction(connectId, deviceId, { path, rawTx: tx.rawTx }),
-        sui: () => sdk.suiSignTransaction(connectId, deviceId, { path, rawTx: tx.rawTx }),
-        near: () => sdk.nearSignTransaction(connectId, deviceId, { path, rawTx: tx.rawTx }),
-        // XRP: implementation reads path + transaction from payload despite type declaration
+        evm: () => sdk.evmSignTransaction(connectId, deviceId, {
+            path,
+            transaction: tx,
+            ...commonParams,
+        }),
+        btc: () => sdk.btcSignTransaction(connectId, deviceId, { coin: 'btc', ...tx, ...commonParams }),
+        sol: () => sdk.solSignTransaction(connectId, deviceId, {
+            path,
+            rawTx: tx.rawTx,
+            ...commonParams,
+        }),
+        tron: () => sdk.tronSignTransaction(connectId, deviceId, {
+            path,
+            transaction: tx,
+            ...commonParams,
+        }),
+        cosmos: () => sdk.cosmosSignTransaction(connectId, deviceId, {
+            path,
+            rawTx: tx.rawTx,
+            ...commonParams,
+        }),
+        aptos: () => sdk.aptosSignTransaction(connectId, deviceId, {
+            path,
+            rawTx: tx.rawTx,
+            ...commonParams,
+        }),
+        sui: () => sdk.suiSignTransaction(connectId, deviceId, {
+            path,
+            rawTx: tx.rawTx,
+            ...commonParams,
+        }),
+        near: () => sdk.nearSignTransaction(connectId, deviceId, {
+            path,
+            rawTx: tx.rawTx,
+            ...commonParams,
+        }),
         // eslint-disable-next-line @typescript-eslint/ban-types
         xrp: () => sdk.xrpSignTransaction(connectId, deviceId, {
             path,
             transaction: tx,
+            ...commonParams,
         }),
         stellar: () => sdk.stellarSignTransaction(connectId, deviceId, {
             path,
             networkPassphrase: tx.networkPassphrase,
             transaction: tx.transaction,
+            ...commonParams,
         }),
-        // Polkadot: requires prefix param
         polkadot: () => sdk.polkadotSignTransaction(connectId, deviceId, {
             path,
             rawTx: tx.rawTx,
             network: tx.network || 'polkadot',
             prefix: tx.prefix ?? 0,
+            ...commonParams,
+        }),
+        filecoin: () => sdk.filecoinSignTransaction(connectId, deviceId, {
+            path,
+            rawTx: tx.rawTx,
+            ...commonParams,
+        }),
+        kaspa: () => sdk.kaspaSignTransaction(connectId, deviceId, { ...tx, ...commonParams }),
+        algo: () => sdk.algoSignTransaction(connectId, deviceId, {
+            path,
+            rawTx: tx.rawTx,
+            ...commonParams,
+        }),
+        conflux: () => sdk.confluxSignTransaction(connectId, deviceId, {
+            path,
+            transaction: tx,
+            ...commonParams,
+        }),
+        nervos: () => sdk.nervosSignTransaction(connectId, deviceId, { ...tx, ...commonParams }),
+        alephium: () => sdk.alephiumSignTransaction(connectId, deviceId, {
+            path,
+            rawTx: tx.rawTx,
+            ...commonParams,
+        }),
+        neo: () => sdk.neoSignTransaction(connectId, deviceId, { path, ...tx, ...commonParams }),
+        dnx: () => sdk.dnxSignTransaction(connectId, deviceId, { path, ...tx, ...commonParams }),
+        scdo: () => sdk.scdoSignTransaction(connectId, deviceId, { path, ...tx, ...commonParams }),
+        benfen: () => sdk.benfenSignTransaction(connectId, deviceId, {
+            path,
+            rawTx: tx.rawTx,
+            ...commonParams,
+        }),
+        nexa: () => sdk.nexaSignTransaction(connectId, deviceId, { ...tx, ...commonParams }),
+        cardano: () => sdk.cardanoSignTransaction(connectId, deviceId, { ...tx, ...commonParams }),
+        starcoin: () => sdk.starcoinSignTransaction(connectId, deviceId, {
+            path,
+            rawTx: tx.rawTx,
+            ...commonParams,
         }),
-        filecoin: () => sdk.filecoinSignTransaction(connectId, deviceId, { path, rawTx: tx.rawTx }),
-        kaspa: () => sdk.kaspaSignTransaction(connectId, deviceId, { ...tx }),
-        algo: () => sdk.algoSignTransaction(connectId, deviceId, { path, rawTx: tx.rawTx }),
-        conflux: () => sdk.confluxSignTransaction(connectId, deviceId, { path, transaction: tx }),
-        nervos: () => sdk.nervosSignTransaction(connectId, deviceId, { ...tx }),
-        alephium: () => sdk.alephiumSignTransaction(connectId, deviceId, { path, rawTx: tx.rawTx }),
-        neo: () => sdk.neoSignTransaction(connectId, deviceId, { path, ...tx }),
-        dnx: () => sdk.dnxSignTransaction(connectId, deviceId, { path, ...tx }),
-        // SCDO: flat params (nonce, gasPrice, gasLimit, to, value, data), not wrapped
-        scdo: () => sdk.scdoSignTransaction(connectId, deviceId, { path, ...tx }),
-        benfen: () => sdk.benfenSignTransaction(connectId, deviceId, { path, rawTx: tx.rawTx }),
-        nexa: () => sdk.nexaSignTransaction(connectId, deviceId, { ...tx }),
-        cardano: () => sdk.cardanoSignTransaction(connectId, deviceId, { ...tx }),
-        starcoin: () => sdk.starcoinSignTransaction(connectId, deviceId, { path, rawTx: tx.rawTx }),
     };
     const method = chainMethodMap[chain];
     if (!method) {
@@ -223,6 +318,7 @@ async function resolveSignMessage(sdk, params) {
     const path = params.path || getDefaultPath(chain);
     const connectId = params.connectId || '';
     const deviceId = params.deviceId || '';
+    const commonParams = extractCommonParams(params);
     // Most chains use `messageHex` (hex-encoded). CLI accepts either:
     // - Already hex-encoded string (starts with "0x" or matches /^[0-9a-fA-F]+$/)
     // - Plain text string (auto-converted to hex)
@@ -231,43 +327,48 @@ async function resolveSignMessage(sdk, params) {
     const msg = isHex ? raw.replace(/^0x/, '') : Buffer.from(raw, 'utf8').toString('hex');
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     const chainMethodMap = {
-        evm: () => sdk.evmSignMessage(connectId, deviceId, { path, messageHex: msg }),
-        // BTC: uses messageHex, not message
-        btc: () => sdk.btcSignMessage(connectId, deviceId, { path, messageHex: msg, coin: 'btc' }),
-        sol: () => sdk.solSignMessage(connectId, deviceId, { path, messageHex: msg }),
-        // Tron: uses messageHex
-        tron: () => sdk.tronSignMessage(connectId, deviceId, { path, messageHex: msg }),
-        aptos: () => sdk.aptosSignMessage(connectId, deviceId, { path, payload: { message: msg } }),
-        sui: () => sdk.suiSignMessage(connectId, deviceId, { path, messageHex: msg }),
-        // Conflux: uses messageHex
-        conflux: () => sdk.confluxSignMessage(connectId, deviceId, { path, messageHex: msg }),
-        // Starcoin: uses messageHex
-        starcoin: () => sdk.starcoinSignMessage(connectId, deviceId, { path, messageHex: msg }),
-        // TON: tonSignMessage is transfer-signing, pass JSON params
+        evm: () => sdk.evmSignMessage(connectId, deviceId, { path, messageHex: msg, ...commonParams }),
+        btc: () => sdk.btcSignMessage(connectId, deviceId, {
+            path,
+            messageHex: msg,
+            coin: 'btc',
+            ...commonParams,
+        }),
+        sol: () => sdk.solSignMessage(connectId, deviceId, { path, messageHex: msg, ...commonParams }),
+        tron: () => sdk.tronSignMessage(connectId, deviceId, { path, messageHex: msg, ...commonParams }),
+        aptos: () => sdk.aptosSignMessage(connectId, deviceId, {
+            path,
+            payload: { message: msg },
+            ...commonParams,
+        }),
+        sui: () => sdk.suiSignMessage(connectId, deviceId, { path, messageHex: msg, ...commonParams }),
+        conflux: () => sdk.confluxSignMessage(connectId, deviceId, { path, messageHex: msg, ...commonParams }),
+        starcoin: () => sdk.starcoinSignMessage(connectId, deviceId, { path, messageHex: msg, ...commonParams }),
         ton: () => {
-            const tonParams = JSON.parse(msg);
-            return sdk.tonSignMessage(connectId, deviceId, { path, ...tonParams });
+            // TON expects structured params, parse from original raw input (not hex-encoded)
+            const tonParams = JSON.parse(raw);
+            return sdk.tonSignMessage(connectId, deviceId, { path, ...tonParams, ...commonParams });
         },
-        // Nostr: event must be a NostrEvent object (kind, content, tags, created_at)
         nostr: () => {
-            const event = JSON.parse(msg);
-            return sdk.nostrSignEvent(connectId, deviceId, { path, event });
+            // Nostr expects a JSON event object, parse from original raw input (not hex-encoded)
+            const event = JSON.parse(raw);
+            return sdk.nostrSignEvent(connectId, deviceId, { path, event, ...commonParams });
         },
-        // SCDO: uses messageHex
-        scdo: () => sdk.scdoSignMessage(connectId, deviceId, { path, messageHex: msg }),
-        // Alephium: requires messageType
+        scdo: () => sdk.scdoSignMessage(connectId, deviceId, { path, messageHex: msg, ...commonParams }),
         alephium: () => sdk.alephiumSignMessage(connectId, deviceId, {
             path,
             messageHex: msg,
             messageType: 'alephium',
+            ...commonParams,
         }),
-        benfen: () => sdk.benfenSignMessage(connectId, deviceId, { path, messageHex: msg }),
+        benfen: () => sdk.benfenSignMessage(connectId, deviceId, { path, messageHex: msg, ...commonParams }),
         // Cardano: uses `message` field, requires networkId
         cardano: () => sdk.cardanoSignMessage(connectId, deviceId, {
             path,
             message: msg,
             derivationType: 1,
             networkId: 1,
+            ...commonParams,
         }),
     };
     const method = chainMethodMap[chain];
@@ -279,16 +380,19 @@ async function resolveSignMessage(sdk, params) {
 }
 exports.resolveSignMessage = resolveSignMessage;
 async function resolveBatchGetAddress(sdk, params) {
-    // #13 FIX: Collect per-item results with error handling for partial failures
+    // Spread `common` so every CommonCLIParams field (including
+    // skipPassphraseCheck) propagates to each inner resolveGetAddress
+    // call. Enumerating fields manually used to drop skipPassphraseCheck
+    // and cause error 114 on hidden-wallet batch calls.
+    const { bundle, ...common } = params;
     const results = [];
-    for (const item of params.bundle) {
+    for (const item of bundle) {
         try {
             const result = await resolveGetAddress(sdk, {
+                ...common,
                 chain: item.chain,
                 path: item.path,
                 showOnDevice: item.showOnDevice ?? false,
-                connectId: params.connectId,
-                deviceId: params.deviceId,
             });
             results.push(result);
         }