@onekeyfe/hd-core 1.0.26-alpha.0 → 1.0.26-alpha.1

package/dist/api/aptos/AptosSignTransaction.d.ts

@@ -7,6 +7,18 @@ export default class AptosSignTransaction extends BaseMethod<HardwareAptosSignTx
             min: string;
         };
     };
+    getWithDataVersionRange(): {
+        pro: {
+            min: string;
+        };
+        model_classic1s: {
+            min: string;
+        };
+        classic: {
+            min: string;
+        };
+    };
+    checkWithDataError(): void;
     run(): Promise<import("@onekeyfe/hd-transport").AptosSignedTx>;
 }
 //# sourceMappingURL=AptosSignTransaction.d.ts.map

package/dist/api/aptos/AptosSignTransaction.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AptosSignTransaction.d.ts","sourceRoot":"","sources":["../../../src/api/aptos/AptosSignTransaction.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,IAAI,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAG5E,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAI3C,MAAM,CAAC,OAAO,OAAO,oBAAqB,SAAQ,UAAU,CAAC,mBAAmB,CAAC;IAC/E,IAAI;IAqBJ,eAAe;;;;;IAQT,GAAG;CAOV"}
+{"version":3,"file":"AptosSignTransaction.d.ts","sourceRoot":"","sources":["../../../src/api/aptos/AptosSignTransaction.ts"],"names":[],"mappings":"AAAA,OAAO,EAAwB,WAAW,IAAI,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAGlG,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAI3C,MAAM,CAAC,OAAO,OAAO,oBAAqB,SAAQ,UAAU,CAAC,mBAAmB,CAAC;IAC/E,IAAI;IAuBJ,eAAe;;;;;IAQf,uBAAuB;;;;;;;;;;;IAcvB,kBAAkB;IAQZ,GAAG;CASV"}

package/dist/api/btc/BTCGetPublicKey.d.ts

@@ -1,4 +1,4 @@
-import { GetPublicKey } from '@onekeyfe/hd-transport';
+import type { GetPublicKey } from '@onekeyfe/hd-transport';
 import { BaseMethod } from '../BaseMethod';
 import { BTCPublicKey } from '../../types/api/btcGetPublicKey';
 export default class BTCGetPublicKey extends BaseMethod<GetPublicKey[]> {

package/dist/api/btc/BTCGetPublicKey.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"BTCGetPublicKey.d.ts","sourceRoot":"","sources":["../../../src/api/btc/BTCGetPublicKey.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAGtD,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAI3C,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAG/D,MAAM,CAAC,OAAO,OAAO,eAAgB,SAAQ,UAAU,CAAC,YAAY,EAAE,CAAC;IACrE,SAAS,UAAS;IAElB,IAAI;IA4CJ,OAAO,CAAC,YAAY;IAIpB,eAAe;;;;;;;;;;;IAIT,GAAG;CAkCV"}
+{"version":3,"file":"BTCGetPublicKey.d.ts","sourceRoot":"","sources":["../../../src/api/btc/BTCGetPublicKey.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAG3D,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAI3C,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAK/D,MAAM,CAAC,OAAO,OAAO,eAAgB,SAAQ,UAAU,CAAC,YAAY,EAAE,CAAC;IACrE,SAAS,UAAS;IAElB,IAAI;IA4CJ,OAAO,CAAC,YAAY;IAIpB,eAAe;;;;;;;;;;;IAIT,GAAG;CAkFV"}

package/dist/api/btc/helpers/xpubUtils.d.ts

@@ -0,0 +1,3 @@
+import type { HDNodeType, InputScriptType } from '@onekeyfe/hd-transport';
+export declare function createExtendedPublicKey(node: HDNodeType, scriptType?: InputScriptType): string;
+//# sourceMappingURL=xpubUtils.d.ts.map

package/dist/api/btc/helpers/xpubUtils.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"xpubUtils.d.ts","sourceRoot":"","sources":["../../../../src/api/btc/helpers/xpubUtils.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AA0E1E,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,UAAU,EAAE,UAAU,CAAC,EAAE,eAAe,GAAG,MAAM,CAS9F"}

package/dist/api/cardano/CardanoSignTransaction.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CardanoSignTransaction.d.ts","sourceRoot":"","sources":["../../../src/api/cardano/CardanoSignTransaction.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAoB3C,OAAO,KAAK,EAGV,mBAAmB,EAIpB,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAGlD,MAAM,CAAC,OAAO,OAAO,sBAAuB,SAAQ,UAAU,CAAC,GAAG,CAAC;IACjE,SAAS,CAAC,EAAE,OAAO,CAAC;IAEpB,eAAe;;;;;;;;IAWf,IAAI;IAqJJ,SAAS,gBAyBP;IAEF,yBAAyB,QAAO,mBAAmB,CAOhD;IAEH,kBAAkB,aAuBhB;IAEI,MAAM,IAAI,OAAO,CAAC,mBAAmB,CAAC;IAyI5C,GAAG;CAKJ"}
+{"version":3,"file":"CardanoSignTransaction.d.ts","sourceRoot":"","sources":["../../../src/api/cardano/CardanoSignTransaction.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAoB3C,OAAO,KAAK,EAGV,mBAAmB,EAIpB,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAGlD,MAAM,CAAC,OAAO,OAAO,sBAAuB,SAAQ,UAAU,CAAC,GAAG,CAAC;IACjE,SAAS,CAAC,EAAE,OAAO,CAAC;IAEpB,eAAe;;;;;;;;IAWf,IAAI;IAqJJ,SAAS,gBAyBP;IAEF,yBAAyB,QAAO,mBAAmB,CAUhD;IAEH,kBAAkB,aAuBhB;IAEI,MAAM,IAAI,OAAO,CAAC,mBAAmB,CAAC;IAyI5C,GAAG;CAKJ"}

package/dist/api/helpers/batchGetPublickeys.d.ts

@@ -1,4 +1,7 @@
 import { Path } from '@onekeyfe/hd-transport';
 import { Device } from '../../device/Device';
-export declare function batchGetPublickeys(device: Device, paths: Path[], ecdsaCurveName: string, coinType: number): Promise<import("../../device/DeviceCommands").TypedResponseMessage<"EcdsaPublicKeys">>;
+export declare function batchGetPublickeys(device: Device, paths: Path[], ecdsaCurveName: string, coinType: number, options?: {
+    includeNode?: boolean;
+    ignoreCoinType?: boolean;
+}): Promise<import("../../device/DeviceCommands").TypedResponseMessage<"EcdsaPublicKeys">>;
 //# sourceMappingURL=batchGetPublickeys.d.ts.map

package/dist/api/helpers/batchGetPublickeys.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"batchGetPublickeys.d.ts","sourceRoot":"","sources":["../../../src/api/helpers/batchGetPublickeys.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,wBAAwB,CAAC;AAG9C,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAI7C,wBAAgB,kBAAkB,CAChC,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,IAAI,EAAE,EACb,cAAc,EAAE,MAAM,EACtB,QAAQ,EAAE,MAAM,0FAqBjB"}
+{"version":3,"file":"batchGetPublickeys.d.ts","sourceRoot":"","sources":["../../../src/api/helpers/batchGetPublickeys.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,wBAAwB,CAAC;AAG9C,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAI7C,wBAAgB,kBAAkB,CAChC,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,IAAI,EAAE,EACb,cAAc,EAAE,MAAM,EACtB,QAAQ,EAAE,MAAM,EAChB,OAAO,CAAC,EAAE;IACR,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,cAAc,CAAC,EAAE,OAAO,CAAC;CAC1B,0FAsBF"}

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 import EventEmitter$1, { EventEmitter } from 'events';
-import { Messages, LowlevelTransportSharedPlugin, Success as Success$1, RecoveryDeviceType, SafetyCheckLevel, ResourceType, NextU2FCounter, SetU2FCounter, CipheredKeyValue as CipheredKeyValue$1, UintType, EthereumPublicKey, EthereumMessageSignature, Address, MultisigRedeemScriptType, InputScriptType, PublicKey, MessageSignature, SignedPsbt, PrevInput, TxOutputBinType, TxInput, TxOutputType, TxInputType, StarcoinAddress as StarcoinAddress$1, StarcoinPublicKey as StarcoinPublicKey$1, StarcoinMessageSignature, StarcoinSignedTx, NEMAddress as NEMAddress$1, NEMSignedTx, SolanaAddress as SolanaAddress$1, SolanaSignedTx as SolanaSignedTx$1, SolanaOffChainMessageVersion, SolanaOffChainMessageFormat, StellarAddress as StellarAddress$1, StellarSignedTx, TronAddress as TronAddress$1, TronResourceCode, TronSignedTx, TronMessageSignature, ConfluxAddress as ConfluxAddress$1, ConfluxMessageSignature, NearAddress as NearAddress$1, NearSignedTx, AptosAddress as AptosAddress$1, AptosMessageSignature as AptosMessageSignature$1, AptosSignedTx as AptosSignedTx$1, AlgorandAddress, AlgorandSignedTx, CosmosAddress as CosmosAddress$1, CosmosSignedTx as CosmosSignedTx$1, SuiAddress as SuiAddress$1, SuiMessageSignature, CardanoAddressParametersType, CardanoMessageSignature, FilecoinAddress as FilecoinAddress$1, FilecoinSignedTx as FilecoinSignedTx$1, PolkadotAddress as PolkadotAddress$1, PolkadotSignedTx as PolkadotSignedTx$1, KaspaAddress as KaspaAddress$1, NervosAddress as NervosAddress$1, NervosSignedTx as NervosSignedTx$1, DnxAddress as DnxAddress$1, TonWalletVersion, TonWorkChain, TonSignedMessage, TonSignedProof, ScdoAddress as ScdoAddress$1, ScdoSignedMessage, ScdoSignedTx as ScdoSignedTx$1, AlephiumMessageSignature, AlephiumSignedTx as AlephiumSignedTx$1, BenfenAddress as BenfenAddress$1, BenfenMessageSignature, OneKeyDeviceInfo, Transport, ChangeOutputScriptType } from '@onekeyfe/hd-transport';
+import { Messages, LowlevelTransportSharedPlugin, Success as Success$1, RecoveryDeviceType, SafetyCheckLevel, ResourceType, NextU2FCounter, SetU2FCounter, CipheredKeyValue as CipheredKeyValue$1, UintType, EthereumPublicKey, EthereumMessageSignature, Address, MultisigRedeemScriptType, InputScriptType, PublicKey, MessageSignature, SignedPsbt, PrevInput, TxOutputBinType, TxInput, TxOutputType, TxInputType, StarcoinAddress as StarcoinAddress$1, StarcoinPublicKey as StarcoinPublicKey$1, StarcoinMessageSignature, StarcoinSignedTx, NEMAddress as NEMAddress$1, NEMSignedTx, SolanaAddress as SolanaAddress$1, SolanaSignedTx as SolanaSignedTx$1, SolanaOffChainMessageVersion, SolanaOffChainMessageFormat, StellarAddress as StellarAddress$1, StellarSignedTx, TronAddress as TronAddress$1, TronResourceCode, TronSignedTx, TronMessageSignature, ConfluxAddress as ConfluxAddress$1, ConfluxMessageSignature, NearAddress as NearAddress$1, NearSignedTx, AptosAddress as AptosAddress$1, AptosMessageSignature as AptosMessageSignature$1, AptosSignedTx as AptosSignedTx$1, AptosTransactionType, AlgorandAddress, AlgorandSignedTx, CosmosAddress as CosmosAddress$1, CosmosSignedTx as CosmosSignedTx$1, SuiAddress as SuiAddress$1, SuiMessageSignature, CardanoAddressParametersType, CardanoMessageSignature, FilecoinAddress as FilecoinAddress$1, FilecoinSignedTx as FilecoinSignedTx$1, PolkadotAddress as PolkadotAddress$1, PolkadotSignedTx as PolkadotSignedTx$1, KaspaAddress as KaspaAddress$1, NervosAddress as NervosAddress$1, NervosSignedTx as NervosSignedTx$1, DnxAddress as DnxAddress$1, TonWalletVersion, TonWorkChain, TonSignedMessage, TonSignedProof, ScdoAddress as ScdoAddress$1, ScdoSignedMessage, ScdoSignedTx as ScdoSignedTx$1, AlephiumMessageSignature, AlephiumSignedTx as AlephiumSignedTx$1, BenfenAddress as BenfenAddress$1, BenfenMessageSignature, OneKeyDeviceInfo, Transport, ChangeOutputScriptType } from '@onekeyfe/hd-transport';
 export { Messages as PROTO } from '@onekeyfe/hd-transport';
 import { EDeviceType, Deferred } from '@onekeyfe/hd-shared';
 
@@ -1491,6 +1491,7 @@ type AptosSignedTx = {
 type AptosSignTransactionParams = {
     path: string | number[];
     rawTx?: string;
+    transactionType?: AptosTransactionType;
 };
 declare function aptosSignTransaction(connectId: string, deviceId: string, params: CommonParams & AptosSignTransactionParams): Response<AptosSignedTx>;
 

package/dist/index.js

@@ -1554,6 +1554,21 @@ var nested$1 = {
 				rule: "required",
 				type: "bytes",
 				id: 2
+			},
+			tx_type: {
+				type: "AptosTransactionType",
+				id: 3,
+				options: {
+					"default": "STANDARD"
+				}
+			}
+		},
+		nested: {
+			AptosTransactionType: {
+				values: {
+					STANDARD: 0,
+					WITH_DATA: 1
+				}
 			}
 		}
 	},
@@ -4880,6 +4895,13 @@ var nested$1 = {
 				rule: "repeated",
 				type: "Path",
 				id: 2
+			},
+			include_node: {
+				type: "bool",
+				id: 3,
+				options: {
+					"default": false
+				}
 			}
 		},
 		nested: {
@@ -4903,6 +4925,15 @@ var nested$1 = {
 				rule: "repeated",
 				type: "bytes",
 				id: 1
+			},
+			hd_nodes: {
+				rule: "repeated",
+				type: "HDNodeType",
+				id: 2
+			},
+			root_fingerprint: {
+				type: "uint32",
+				id: 3
 			}
 		}
 	},
@@ -24936,11 +24967,20 @@ const getPassphraseState = (features, commands) => __awaiter(void 0, void 0, voi
     }
     return message.address;
 });
-const supportBatchPublicKey = (features) => {
+const supportBatchPublicKey = (features, options) => {
     if (!features)
         return false;
     const currentVersion = getDeviceFirmwareVersion(features).join('.');
     const deviceType = getDeviceType(features);
+    if (!!(options === null || options === void 0 ? void 0 : options.includeNode) && deviceType === hdShared.EDeviceType.Pro) {
+        return semver__default["default"].gte(currentVersion, '4.14.0');
+    }
+    if (!!(options === null || options === void 0 ? void 0 : options.includeNode) && DeviceModelToTypes.model_classic1s.includes(deviceType)) {
+        return semver__default["default"].gte(currentVersion, '3.12.0');
+    }
+    if (!!(options === null || options === void 0 ? void 0 : options.includeNode) && deviceType === hdShared.EDeviceType.Classic) {
+        return semver__default["default"].gte(currentVersion, '3.10.0');
+    }
     if (deviceType === hdShared.EDeviceType.Touch || deviceType === hdShared.EDeviceType.Pro) {
         return semver__default["default"].gte(currentVersion, '3.1.0');
     }
@@ -30235,6 +30275,82 @@ class BTCGetAddress extends BaseMethod {
     }
 }
 
+function batchGetPublickeys(device, paths, ecdsaCurveName, coinType, options) {
+    var _a;
+    const existsPathNotValid = paths.find(p => p.address_n.length < 3);
+    if (existsPathNotValid) {
+        throw hdShared.TypedError(hdShared.HardwareErrorCode.ForbiddenKeyPath, 'Path length must be greater than 3');
+    }
+    const supportsBatchPublicKey = supportBatchPublicKey(device.features, options);
+    if (!supportsBatchPublicKey) {
+        throw hdShared.TypedError(hdShared.HardwareErrorCode.DeviceNotSupportMethod);
+    }
+    const existsPathNotEqualCoinType = paths.find(p => !isEqualBip44CoinType(p.address_n, coinType));
+    if ((options === null || options === void 0 ? void 0 : options.ignoreCoinType) === false && existsPathNotEqualCoinType) {
+        throw hdShared.TypedError(hdShared.HardwareErrorCode.ForbiddenKeyPath);
+    }
+    return device.commands.typedCall('BatchGetPublickeys', 'EcdsaPublicKeys', {
+        paths,
+        ecdsa_curve_name: ecdsaCurveName,
+        include_node: (_a = options === null || options === void 0 ? void 0 : options.includeNode) !== null && _a !== void 0 ? _a : false,
+    });
+}
+
+const VERSION_BYTES = {
+    XPUB: 0x0488b21e,
+    YPUB: 0x049d7cb2,
+    ZPUB: 0x04b24746,
+};
+function getVersionBytes(scriptType) {
+    switch (scriptType) {
+        case 'SPENDADDRESS':
+        case 'SPENDMULTISIG':
+            return VERSION_BYTES.XPUB;
+        case 'SPENDP2SHWITNESS':
+            return VERSION_BYTES.YPUB;
+        case 'SPENDWITNESS':
+            return VERSION_BYTES.ZPUB;
+        default:
+            return VERSION_BYTES.XPUB;
+    }
+}
+function base58Check(data) {
+    const checksum = sha256.sha256(sha256.sha256(new Uint8Array(data))).slice(0, 4);
+    const withChecksum = Buffer.concat([new Uint8Array(data), new Uint8Array(checksum)]);
+    const ALPHABET = '123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz';
+    let result = '';
+    let num = BigInt(`0x${withChecksum.toString('hex')}`);
+    const base = BigInt(58);
+    while (num > 0) {
+        const mod = Number(num % base);
+        num /= base;
+        result = ALPHABET[mod] + result;
+    }
+    for (let i = 0; i < withChecksum.length; i++) {
+        if (withChecksum[i] === 0) {
+            result = `1${result}`;
+        }
+        else {
+            break;
+        }
+    }
+    return result;
+}
+function generateExtendedPublicKey(depth, fingerprint, childNum, chainCode, publicKey, scriptType) {
+    const versionBytes = getVersionBytes(scriptType);
+    const buffer = Buffer.alloc(78);
+    buffer.writeUInt32BE(versionBytes, 0);
+    buffer.writeUInt8(depth, 4);
+    buffer.writeUInt32BE(fingerprint, 5);
+    buffer.writeUInt32BE(childNum, 9);
+    buffer.write(chainCode, 13, 'hex');
+    buffer.write(publicKey, 45, 'hex');
+    return base58Check(buffer);
+}
+function createExtendedPublicKey(node, scriptType) {
+    return generateExtendedPublicKey(node.depth, node.fingerprint, node.child_num, node.chain_code, node.public_key, scriptType);
+}
+
 class BTCGetPublicKey extends BaseMethod {
     constructor() {
         super(...arguments);
@@ -30281,20 +30397,59 @@ class BTCGetPublicKey extends BaseMethod {
         return getBitcoinForkVersionRange(this.params.map(param => param.coin_name));
     }
     run() {
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            const responses = [];
-            for (let i = 0; i < this.params.length; i++) {
-                const param = this.params[i];
-                const res = yield this.device.commands.typedCall('GetPublicKey', 'PublicKey', Object.assign({}, param));
-                const response = Object.assign(Object.assign({ path: serializedPath(param.address_n) }, res.message), { xpubSegwit: res.message.xpub });
-                if (this.isBtcNetwork(param) && isTaprootPath(param.address_n)) {
-                    const fingerprint = Number(response.root_fingerprint || 0)
-                        .toString(16)
-                        .padStart(8, '0');
-                    const descriptorPath = `${fingerprint}${response.path.substring(1)}`;
-                    response.xpubSegwit = `tr([${descriptorPath}]${response.xpub}/<0;1>/*)`;
+            let responses = [];
+            try {
+                const existsShowDisplay = this.params.some(param => param.show_display);
+                if (existsShowDisplay || !this.hasBundle) {
+                    throw new Error('Goto getPublickey');
+                }
+                const res = yield batchGetPublickeys(this.device, this.params, 'secp256k1', 0, {
+                    includeNode: true,
+                    ignoreCoinType: true,
+                });
+                if (!((_a = res.message) === null || _a === void 0 ? void 0 : _a.hd_nodes) || this.params.length !== res.message.hd_nodes.length) {
+                    throw new Error('Invalid response from Publickeys');
+                }
+                for (let i = 0; i < this.params.length; i++) {
+                    const param = this.params[i];
+                    const node = res.message.hd_nodes[i];
+                    const path = serializedPath(param.address_n);
+                    const xpub = createExtendedPublicKey(node, param.script_type);
+                    const rootFingerprint = res.message.root_fingerprint;
+                    let xpubSegwit = xpub;
+                    if (this.isBtcNetwork(param) && isTaprootPath(param.address_n)) {
+                        const fingerprint = Number(rootFingerprint || 0)
+                            .toString(16)
+                            .padStart(8, '0');
+                        const descriptorPath = `${fingerprint}${path.substring(1)}`;
+                        xpubSegwit = `tr([${descriptorPath}]${xpub}/<0;1>/*)`;
+                    }
+                    responses.push({
+                        path,
+                        node,
+                        xpub,
+                        root_fingerprint: rootFingerprint,
+                        xpubSegwit,
+                    });
+                }
+            }
+            catch (error) {
+                responses = [];
+                for (let i = 0; i < this.params.length; i++) {
+                    const param = this.params[i];
+                    const res = yield this.device.commands.typedCall('GetPublicKey', 'PublicKey', Object.assign({}, param));
+                    const response = Object.assign(Object.assign({ path: serializedPath(param.address_n) }, res.message), { xpubSegwit: res.message.xpub });
+                    if (this.isBtcNetwork(param) && isTaprootPath(param.address_n)) {
+                        const fingerprint = Number(response.root_fingerprint || 0)
+                            .toString(16)
+                            .padStart(8, '0');
+                        const descriptorPath = `${fingerprint}${response.path.substring(1)}`;
+                        response.xpubSegwit = `tr([${descriptorPath}]${response.xpub}/<0;1>/*)`;
+                    }
+                    responses.push(response);
                 }
-                responses.push(response);
             }
             validateResult(responses, ['xpub'], {
                 expectedLength: this.params.length,
@@ -33163,25 +33318,6 @@ class NearSignTransaction extends BaseMethod {
     }
 }
 
-function batchGetPublickeys(device, paths, ecdsaCurveName, coinType) {
-    const existsPathNotValid = paths.find(p => p.address_n.length < 3);
-    if (existsPathNotValid) {
-        throw hdShared.TypedError(hdShared.HardwareErrorCode.ForbiddenKeyPath, 'Path length must be greater than 3');
-    }
-    const supportsBatchPublicKey = supportBatchPublicKey(device.features);
-    if (!supportsBatchPublicKey) {
-        throw hdShared.TypedError(hdShared.HardwareErrorCode.DeviceNotSupportMethod);
-    }
-    const existsPathNotEqualCoinType = paths.find(p => !isEqualBip44CoinType(p.address_n, coinType));
-    if (existsPathNotEqualCoinType) {
-        throw hdShared.TypedError(hdShared.HardwareErrorCode.ForbiddenKeyPath);
-    }
-    return device.commands.typedCall('BatchGetPublickeys', 'EcdsaPublicKeys', {
-        paths,
-        ecdsa_curve_name: ecdsaCurveName,
-    });
-}
-
 class AptosGetAddress extends BaseMethod {
     constructor() {
         super(...arguments);
@@ -33335,12 +33471,14 @@ class AptosSignTransaction extends BaseMethod {
         validateParams(this.payload, [
             { name: 'path', required: true },
             { name: 'rawTx', type: 'hexString', required: true },
+            { name: 'transactionType', type: 'number', required: false },
         ]);
-        const { path, rawTx } = this.payload;
+        const { path, rawTx, transactionType } = this.payload;
         const addressN = validatePath(path, 3);
         this.params = {
             address_n: addressN,
             raw_tx: formatAnyHex(rawTx),
+            tx_type: transactionType,
         };
     }
     getVersionRange() {
@@ -33350,8 +33488,26 @@ class AptosSignTransaction extends BaseMethod {
             },
         };
     }
+    getWithDataVersionRange() {
+        return {
+            pro: {
+                min: '4.14.0',
+            },
+            model_classic1s: {
+                min: '3.12.0',
+            },
+            classic: {
+                min: '3.10.0',
+            },
+        };
+    }
+    checkWithDataError() {
+        const { transactionType } = this.payload;
+        this.checkFeatureVersionLimit(() => transactionType === 1, () => this.getWithDataVersionRange());
+    }
     run() {
         return __awaiter(this, void 0, void 0, function* () {
+            this.checkWithDataError();
             const res = yield this.device.commands.typedCall('AptosSignTx', 'AptosSignedTx', Object.assign({}, this.params));
             return Promise.resolve(res.message);
         });
@@ -34806,6 +34962,9 @@ class CardanoSignTransaction extends BaseMethod {
             touch: {
                 min: '4.10.0',
             },
+            classic: {
+                min: '3.10.0',
+            },
         });
         this.checkSupportConway = () => {
             var _a;

package/dist/types/api/aptosSignTransaction.d.ts

@@ -1,4 +1,4 @@
-import { AptosSignedTx as HardwareAptosSignedTx } from '@onekeyfe/hd-transport';
+import { AptosSignedTx as HardwareAptosSignedTx, AptosTransactionType } from '@onekeyfe/hd-transport';
 import type { CommonParams, Response } from '../params';
 export type AptosSignedTx = {
     path: string;
@@ -6,6 +6,7 @@ export type AptosSignedTx = {
 export type AptosSignTransactionParams = {
     path: string | number[];
     rawTx?: string;
+    transactionType?: AptosTransactionType;
 };
 export declare function aptosSignTransaction(connectId: string, deviceId: string, params: CommonParams & AptosSignTransactionParams): Response<AptosSignedTx>;
 //# sourceMappingURL=aptosSignTransaction.d.ts.map

package/dist/types/api/aptosSignTransaction.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"aptosSignTransaction.d.ts","sourceRoot":"","sources":["../../../src/types/api/aptosSignTransaction.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,IAAI,qBAAqB,EAAE,MAAM,wBAAwB,CAAC;AAChF,OAAO,KAAK,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAExD,MAAM,MAAM,aAAa,GAAG;IAC1B,IAAI,EAAE,MAAM,CAAC;CACd,GAAG,qBAAqB,CAAC;AAE1B,MAAM,MAAM,0BAA0B,GAAG;IACvC,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IACxB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,MAAM,CAAC,OAAO,UAAU,oBAAoB,CAC1C,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,YAAY,GAAG,0BAA0B,GAChD,QAAQ,CAAC,aAAa,CAAC,CAAC"}
+{"version":3,"file":"aptosSignTransaction.d.ts","sourceRoot":"","sources":["../../../src/types/api/aptosSignTransaction.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,IAAI,qBAAqB,EACtC,oBAAoB,EACrB,MAAM,wBAAwB,CAAC;AAChC,OAAO,KAAK,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAExD,MAAM,MAAM,aAAa,GAAG;IAC1B,IAAI,EAAE,MAAM,CAAC;CACd,GAAG,qBAAqB,CAAC;AAE1B,MAAM,MAAM,0BAA0B,GAAG;IACvC,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IACxB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,eAAe,CAAC,EAAE,oBAAoB,CAAC;CACxC,CAAC;AAEF,MAAM,CAAC,OAAO,UAAU,oBAAoB,CAC1C,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,YAAY,GAAG,0BAA0B,GAChD,QAAQ,CAAC,aAAa,CAAC,CAAC"}

package/dist/utils/deviceFeaturesUtils.d.ts

@@ -10,7 +10,9 @@ export declare const supportInputPinOnSoftware: (features: Features) => SupportF
 export declare const supportNewPassphrase: (features?: Features) => SupportFeatureType;
 export declare const getPassphraseStateWithRefreshDeviceInfo: (device: Device) => Promise<string | false>;
 export declare const getPassphraseState: (features: Features | undefined, commands: DeviceCommands) => Promise<string | false>;
-export declare const supportBatchPublicKey: (features?: Features) => boolean;
+export declare const supportBatchPublicKey: (features?: Features, options?: {
+    includeNode?: boolean;
+}) => boolean;
 export declare const supportModifyHomescreen: (features?: Features) => SupportFeatureType;
 export declare const getFirmwareUpdateField: ({ features, updateType, targetVersion, }: {
     features: Features;

package/dist/utils/deviceFeaturesUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"deviceFeaturesUtils.d.ts","sourceRoot":"","sources":["../../src/utils/deviceFeaturesUtils.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAC1D,OAAO,KAAK,EAAE,QAAQ,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAE7D,OAAoB,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAE1F,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAI1C,eAAO,MAAM,wBAAwB,aACzB,QAAQ,GAAG,SAAS,KAC7B;IAAE,QAAQ,EAAE,IAAI,CAAC;IAAC,cAAc,EAAE,cAAc,CAAA;CAiClD,CAAC;AAEF,eAAO,MAAM,yBAAyB,aAAc,QAAQ,KAAG,kBAU9D,CAAC;AAEF,eAAO,MAAM,oBAAoB,cAAe,QAAQ,KAAG,kBAW1D,CAAC;AAEF,eAAO,MAAM,uCAAuC,WAAkB,MAAM,4BAqB3E,CAAC;AAEF,eAAO,MAAM,kBAAkB,aACnB,QAAQ,GAAG,SAAS,YACpB,cAAc,4BAgBzB,CAAC;AAEF,eAAO,MAAM,qBAAqB,cAAe,QAAQ,KAAG,OAU3D,CAAC;AAEF,eAAO,MAAM,uBAAuB,cAAe,QAAQ,KAAG,kBAU7D,CAAC;AAKF,eAAO,MAAM,sBAAsB;cAKvB,QAAQ;gBACN,UAAU,GAAG,KAAK;;MAE5B,KAAK,GAAG,cAyBX,CAAC;AAMF,eAAO,MAAM,2BAA2B,aAC5B,QAAQ,cACN,UAAU,GAAG,KAAK,GAAG,YAAY,KAC5C,CAAC,UAAU,GAAG,KAAK,GAAG,aAAa,GAAG,aAAa,CAAC,EAkCtD,CAAC;AAEF,wBAAgB,UAAU,CAAC,OAAO,EAAE,MAAM,UASzC;AAED,eAAO,MAAM,0BAA0B,aAAc,QAAQ,KAAG,QAc/D,CAAC"}
+{"version":3,"file":"deviceFeaturesUtils.d.ts","sourceRoot":"","sources":["../../src/utils/deviceFeaturesUtils.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAC1D,OAAO,KAAK,EAAE,QAAQ,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAE7D,OAAoB,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAE1F,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAI1C,eAAO,MAAM,wBAAwB,aACzB,QAAQ,GAAG,SAAS,KAC7B;IAAE,QAAQ,EAAE,IAAI,CAAC;IAAC,cAAc,EAAE,cAAc,CAAA;CAiClD,CAAC;AAEF,eAAO,MAAM,yBAAyB,aAAc,QAAQ,KAAG,kBAU9D,CAAC;AAEF,eAAO,MAAM,oBAAoB,cAAe,QAAQ,KAAG,kBAW1D,CAAC;AAEF,eAAO,MAAM,uCAAuC,WAAkB,MAAM,4BAqB3E,CAAC;AAEF,eAAO,MAAM,kBAAkB,aACnB,QAAQ,GAAG,SAAS,YACpB,cAAc,4BAgBzB,CAAC;AAEF,eAAO,MAAM,qBAAqB,cACrB,QAAQ,YACT;IACR,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB,KACA,OAsBF,CAAC;AAEF,eAAO,MAAM,uBAAuB,cAAe,QAAQ,KAAG,kBAU7D,CAAC;AAKF,eAAO,MAAM,sBAAsB;cAKvB,QAAQ;gBACN,UAAU,GAAG,KAAK;;MAE5B,KAAK,GAAG,cAyBX,CAAC;AAMF,eAAO,MAAM,2BAA2B,aAC5B,QAAQ,cACN,UAAU,GAAG,KAAK,GAAG,YAAY,KAC5C,CAAC,UAAU,GAAG,KAAK,GAAG,aAAa,GAAG,aAAa,CAAC,EAkCtD,CAAC;AAEF,wBAAgB,UAAU,CAAC,OAAO,EAAE,MAAM,UASzC;AAED,eAAO,MAAM,0BAA0B,aAAc,QAAQ,KAAG,QAc/D,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-core",
-  "version": "1.0.26-alpha.0",
+  "version": "1.0.26-alpha.1",
   "description": "> TODO: description",
   "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.0.26-alpha.0",
-    "@onekeyfe/hd-transport": "^1.0.26-alpha.0",
+    "@onekeyfe/hd-shared": "^1.0.26-alpha.1",
+    "@onekeyfe/hd-transport": "^1.0.26-alpha.1",
     "axios": "^0.27.2",
     "bignumber.js": "^9.0.2",
     "bytebuffer": "^5.0.1",
@@ -46,5 +46,5 @@
     "@types/web-bluetooth": "^0.0.21",
     "ripple-keypairs": "^1.1.4"
   },
-  "gitHead": "05cde6f4b6ca9ac3ead441f3956a37b419b50396"
+  "gitHead": "941f5592107bb81370bf18c2c8bebe0f88d094bf"
 }

package/src/api/aptos/AptosSignTransaction.ts

@@ -1,4 +1,4 @@
-import { AptosSignTx as HardwareAptosSignTx } from '@onekeyfe/hd-transport';
+import { AptosTransactionType, AptosSignTx as HardwareAptosSignTx } from '@onekeyfe/hd-transport';
 import { UI_REQUEST } from '../../constants/ui-request';
 import { validatePath } from '../helpers/pathUtils';
 import { BaseMethod } from '../BaseMethod';
@@ -14,9 +14,10 @@ export default class AptosSignTransaction extends BaseMethod<HardwareAptosSignTx
     validateParams(this.payload, [
       { name: 'path', required: true },
       { name: 'rawTx', type: 'hexString', required: true },
+      { name: 'transactionType', type: 'number', required: false },
     ]);
 
-    const { path, rawTx } = this.payload;
+    const { path, rawTx, transactionType } = this.payload;
 
     const addressN = validatePath(path, 3);
 
@@ -24,6 +25,7 @@ export default class AptosSignTransaction extends BaseMethod<HardwareAptosSignTx
     this.params = {
       address_n: addressN,
       raw_tx: formatAnyHex(rawTx),
+      tx_type: transactionType,
     };
   }
 
@@ -35,7 +37,31 @@ export default class AptosSignTransaction extends BaseMethod<HardwareAptosSignTx
     };
   }
 
+  getWithDataVersionRange() {
+    return {
+      pro: {
+        min: '4.14.0',
+      },
+      model_classic1s: {
+        min: '3.12.0',
+      },
+      classic: {
+        min: '3.10.0',
+      },
+    };
+  }
+
+  checkWithDataError() {
+    const { transactionType } = this.payload;
+    this.checkFeatureVersionLimit(
+      () => transactionType === 1,
+      () => this.getWithDataVersionRange()
+    );
+  }
+
   async run() {
+    this.checkWithDataError();
+
     const res = await this.device.commands.typedCall('AptosSignTx', 'AptosSignedTx', {
       ...this.params,
     });

package/src/api/btc/BTCGetPublicKey.ts

@@ -1,4 +1,4 @@
-import { GetPublicKey } from '@onekeyfe/hd-transport';
+import type { GetPublicKey } from '@onekeyfe/hd-transport';
 import { UI_REQUEST } from '../../constants/ui-request';
 import { getScriptType, isTaprootPath, serializedPath, validatePath } from '../helpers/pathUtils';
 import { BaseMethod } from '../BaseMethod';
@@ -7,6 +7,8 @@ import { BTCGetAddressParams } from '../../types/api/btcGetAddress';
 import { getCoinInfo } from './helpers/btcParamsUtils';
 import { BTCPublicKey } from '../../types/api/btcGetPublicKey';
 import { getBitcoinForkVersionRange } from './helpers/versionLimit';
+import { batchGetPublickeys } from '../helpers/batchGetPublickeys';
+import { createExtendedPublicKey } from './helpers/xpubUtils';
 
 export default class BTCGetPublicKey extends BaseMethod<GetPublicKey[]> {
   hasBundle = false;
@@ -64,31 +66,79 @@ export default class BTCGetPublicKey extends BaseMethod<GetPublicKey[]> {
   }
 
   async run() {
-    const responses: BTCPublicKey[] = [];
+    let responses: BTCPublicKey[] = [];
 
-    for (let i = 0; i < this.params.length; i++) {
-      const param = this.params[i];
+    try {
+      const existsShowDisplay = this.params.some(param => param.show_display);
+      if (existsShowDisplay || !this.hasBundle) {
+        throw new Error('Goto getPublickey');
+      }
 
-      const res = await this.device.commands.typedCall('GetPublicKey', 'PublicKey', {
-        ...param,
+      const res = await batchGetPublickeys(this.device, this.params, 'secp256k1', 0, {
+        includeNode: true,
+        ignoreCoinType: true,
       });
 
-      const response = {
-        path: serializedPath(param.address_n),
-        ...res.message,
-        xpubSegwit: res.message.xpub,
-      };
-
-      if (this.isBtcNetwork(param) && isTaprootPath(param.address_n)) {
-        // wrap regular xpub into bitcoind native descriptor
-        const fingerprint = Number(response.root_fingerprint || 0)
-          .toString(16)
-          .padStart(8, '0');
-        const descriptorPath = `${fingerprint}${response.path.substring(1)}`;
-        response.xpubSegwit = `tr([${descriptorPath}]${response.xpub}/<0;1>/*)`;
+      if (!res.message?.hd_nodes || this.params.length !== res.message.hd_nodes.length) {
+        throw new Error('Invalid response from Publickeys');
       }
 
-      responses.push(response);
+      for (let i = 0; i < this.params.length; i++) {
+        const param = this.params[i];
+        const node = res.message.hd_nodes[i];
+
+        const path = serializedPath(param.address_n);
+
+        const xpub = createExtendedPublicKey(node, param.script_type);
+
+        const rootFingerprint = res.message.root_fingerprint;
+
+        let xpubSegwit = xpub;
+        if (this.isBtcNetwork(param) && isTaprootPath(param.address_n)) {
+          // wrap regular xpub into bitcoind native descriptor
+          const fingerprint = Number(rootFingerprint || 0)
+            .toString(16)
+            .padStart(8, '0');
+          const descriptorPath = `${fingerprint}${path.substring(1)}`;
+          xpubSegwit = `tr([${descriptorPath}]${xpub}/<0;1>/*)`;
+        }
+
+        responses.push({
+          path,
+          node,
+          xpub,
+          root_fingerprint: rootFingerprint,
+          xpubSegwit,
+        });
+      }
+    } catch (error) {
+      // clear responses
+      responses = [];
+
+      for (let i = 0; i < this.params.length; i++) {
+        const param = this.params[i];
+
+        const res = await this.device.commands.typedCall('GetPublicKey', 'PublicKey', {
+          ...param,
+        });
+
+        const response = {
+          path: serializedPath(param.address_n),
+          ...res.message,
+          xpubSegwit: res.message.xpub,
+        };
+
+        if (this.isBtcNetwork(param) && isTaprootPath(param.address_n)) {
+          // wrap regular xpub into bitcoind native descriptor
+          const fingerprint = Number(response.root_fingerprint || 0)
+            .toString(16)
+            .padStart(8, '0');
+          const descriptorPath = `${fingerprint}${response.path.substring(1)}`;
+          response.xpubSegwit = `tr([${descriptorPath}]${response.xpub}/<0;1>/*)`;
+        }
+
+        responses.push(response);
+      }
     }
 
     validateResult(responses, ['xpub'], {

package/src/api/btc/helpers/xpubUtils.ts

@@ -0,0 +1,85 @@
+import { sha256 } from '@noble/hashes/sha256';
+import type { HDNodeType, InputScriptType } from '@onekeyfe/hd-transport';
+
+// 定义版本字节常量
+const VERSION_BYTES = {
+  // xpub - (SPENDADDRESS, SPENDMULTISIG)
+  XPUB: 0x0488b21e,
+  // ypub - (SPENDP2SHWITNESS)
+  YPUB: 0x049d7cb2,
+  // zpub - (SPENDWITNESS)
+  ZPUB: 0x04b24746,
+};
+
+function getVersionBytes(scriptType?: InputScriptType): number {
+  switch (scriptType) {
+    case 'SPENDADDRESS':
+    case 'SPENDMULTISIG':
+      return VERSION_BYTES.XPUB;
+    case 'SPENDP2SHWITNESS':
+      return VERSION_BYTES.YPUB;
+    case 'SPENDWITNESS':
+      return VERSION_BYTES.ZPUB;
+    default:
+      return VERSION_BYTES.XPUB;
+  }
+}
+
+function base58Check(data: Buffer): string {
+  const checksum = sha256(sha256(new Uint8Array(data))).slice(0, 4);
+  const withChecksum = Buffer.concat([new Uint8Array(data), new Uint8Array(checksum)]);
+  const ALPHABET = '123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz';
+
+  let result = '';
+  let num = BigInt(`0x${withChecksum.toString('hex')}`);
+  const base = BigInt(58);
+
+  while (num > 0) {
+    const mod = Number(num % base);
+    num /= base;
+    result = ALPHABET[mod] + result;
+  }
+
+  // 处理前导零字节
+  for (let i = 0; i < withChecksum.length; i++) {
+    if (withChecksum[i] === 0) {
+      result = `1${result}`;
+    } else {
+      break;
+    }
+  }
+
+  return result;
+}
+
+function generateExtendedPublicKey(
+  depth: number,
+  fingerprint: number,
+  childNum: number,
+  chainCode: string,
+  publicKey: string,
+  scriptType?: InputScriptType
+): string {
+  const versionBytes = getVersionBytes(scriptType);
+
+  const buffer = Buffer.alloc(78);
+  buffer.writeUInt32BE(versionBytes, 0);
+  buffer.writeUInt8(depth, 4);
+  buffer.writeUInt32BE(fingerprint, 5);
+  buffer.writeUInt32BE(childNum, 9);
+  buffer.write(chainCode, 13, 'hex');
+  buffer.write(publicKey, 45, 'hex');
+
+  return base58Check(buffer);
+}
+
+export function createExtendedPublicKey(node: HDNodeType, scriptType?: InputScriptType): string {
+  return generateExtendedPublicKey(
+    node.depth,
+    node.fingerprint,
+    node.child_num,
+    node.chain_code,
+    node.public_key,
+    scriptType
+  );
+}

package/src/api/cardano/CardanoSignTransaction.ts

@@ -228,6 +228,9 @@ export default class CardanoSignTransaction extends BaseMethod<any> {
     touch: {
       min: '4.10.0',
     },
+    classic: {
+      min: '3.10.0',
+    },
   });
 
   checkSupportConway = () => {

package/src/api/helpers/batchGetPublickeys.ts

@@ -9,25 +9,30 @@ export function batchGetPublickeys(
   device: Device,
   paths: Path[],
   ecdsaCurveName: string,
-  coinType: number
+  coinType: number,
+  options?: {
+    includeNode?: boolean;
+    ignoreCoinType?: boolean;
+  }
 ) {
   const existsPathNotValid = paths.find(p => p.address_n.length < 3);
   if (existsPathNotValid) {
     throw TypedError(HardwareErrorCode.ForbiddenKeyPath, 'Path length must be greater than 3');
   }
 
-  const supportsBatchPublicKey = supportBatchPublicKey(device.features);
+  const supportsBatchPublicKey = supportBatchPublicKey(device.features, options);
   if (!supportsBatchPublicKey) {
     throw TypedError(HardwareErrorCode.DeviceNotSupportMethod);
   }
 
   const existsPathNotEqualCoinType = paths.find(p => !isEqualBip44CoinType(p.address_n, coinType));
-  if (existsPathNotEqualCoinType) {
+  if (options?.ignoreCoinType === false && existsPathNotEqualCoinType) {
     throw TypedError(HardwareErrorCode.ForbiddenKeyPath);
   }
 
   return device.commands.typedCall('BatchGetPublickeys', 'EcdsaPublicKeys', {
     paths,
     ecdsa_curve_name: ecdsaCurveName,
+    include_node: options?.includeNode ?? false,
   });
 }

package/src/data/messages/messages.json

@@ -250,6 +250,21 @@
           "rule": "required",
           "type": "bytes",
           "id": 2
+        },
+        "tx_type": {
+          "type": "AptosTransactionType",
+          "id": 3,
+          "options": {
+            "default": "STANDARD"
+          }
+        }
+      },
+      "nested": {
+        "AptosTransactionType": {
+          "values": {
+            "STANDARD": 0,
+            "WITH_DATA": 1
+          }
         }
       }
     },
@@ -3569,6 +3584,13 @@
           "rule": "repeated",
           "type": "Path",
           "id": 2
+        },
+        "include_node": {
+          "type": "bool",
+          "id": 3,
+          "options": {
+            "default": false
+          }
         }
       },
       "nested": {
@@ -3592,6 +3614,15 @@
           "rule": "repeated",
           "type": "bytes",
           "id": 1
+        },
+        "hd_nodes": {
+          "rule": "repeated",
+          "type": "HDNodeType",
+          "id": 2
+        },
+        "root_fingerprint": {
+          "type": "uint32",
+          "id": 3
         }
       }
     },

package/src/types/api/aptosSignTransaction.ts

@@ -1,4 +1,7 @@
-import { AptosSignedTx as HardwareAptosSignedTx } from '@onekeyfe/hd-transport';
+import {
+  AptosSignedTx as HardwareAptosSignedTx,
+  AptosTransactionType,
+} from '@onekeyfe/hd-transport';
 import type { CommonParams, Response } from '../params';
 
 export type AptosSignedTx = {
@@ -8,6 +11,7 @@ export type AptosSignedTx = {
 export type AptosSignTransactionParams = {
   path: string | number[];
   rawTx?: string;
+  transactionType?: AptosTransactionType;
 };
 
 export declare function aptosSignTransaction(

package/src/utils/deviceFeaturesUtils.ts

@@ -116,11 +116,28 @@ export const getPassphraseState = async (
   return message.address;
 };
 
-export const supportBatchPublicKey = (features?: Features): boolean => {
+export const supportBatchPublicKey = (
+  features?: Features,
+  options?: {
+    includeNode?: boolean;
+  }
+): boolean => {
   if (!features) return false;
   const currentVersion = getDeviceFirmwareVersion(features).join('.');
 
   const deviceType = getDeviceType(features);
+  // btc batch get public key
+  if (!!options?.includeNode && deviceType === EDeviceType.Pro) {
+    return semver.gte(currentVersion, '4.14.0');
+  }
+  if (!!options?.includeNode && DeviceModelToTypes.model_classic1s.includes(deviceType)) {
+    return semver.gte(currentVersion, '3.12.0');
+  }
+  if (!!options?.includeNode && deviceType === EDeviceType.Classic) {
+    return semver.gte(currentVersion, '3.10.0');
+  }
+
+  // support batch get public key
   if (deviceType === EDeviceType.Touch || deviceType === EDeviceType.Pro) {
     return semver.gte(currentVersion, '3.1.0');
   }