@onekeyfe/hd-core 1.0.30 → 1.0.31

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

@@ -1 +1 @@
-{"version":3,"file":"AptosGetPublicKey.d.ts","sourceRoot":"","sources":["../../../src/api/aptos/AptosGetPublicKey.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAE3C,OAAO,EAAyB,cAAc,EAAE,MAAM,aAAa,CAAC;AAGpE,MAAM,CAAC,OAAO,OAAO,iBAAkB,SAAQ,UAAU,CAAC,GAAG,CAAC;IAC5D,SAAS,UAAS;IAElB,IAAI;IA6BJ,eAAe;;;;;IAQT,GAAG;CAiBV"}
+{"version":3,"file":"AptosGetPublicKey.d.ts","sourceRoot":"","sources":["../../../src/api/aptos/AptosGetPublicKey.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAE3C,OAAO,EAAyB,cAAc,EAAE,MAAM,aAAa,CAAC;AAGpE,MAAM,CAAC,OAAO,OAAO,iBAAkB,SAAQ,UAAU,CAAC,GAAG,CAAC;IAC5D,SAAS,UAAS;IAElB,IAAI;IA6BJ,eAAe;;;;;IAQT,GAAG;CAeV"}

package/dist/api/cosmos/CosmosGetPublicKey.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CosmosGetPublicKey.d.ts","sourceRoot":"","sources":["../../../src/api/cosmos/CosmosGetPublicKey.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAE3C,OAAO,EAAE,aAAa,EAA4B,MAAM,aAAa,CAAC;AAGtE,MAAM,CAAC,OAAO,OAAO,kBAAmB,SAAQ,UAAU,CAAC,GAAG,CAAC;IAC7D,SAAS,UAAS;IAElB,IAAI;IAwCJ,eAAe;;;;;;;;IAWT,GAAG;CAgBV"}
+{"version":3,"file":"CosmosGetPublicKey.d.ts","sourceRoot":"","sources":["../../../src/api/cosmos/CosmosGetPublicKey.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAE3C,OAAO,EAAE,aAAa,EAA4B,MAAM,aAAa,CAAC;AAGtE,MAAM,CAAC,OAAO,OAAO,kBAAmB,SAAQ,UAAU,CAAC,GAAG,CAAC;IAC7D,SAAS,UAAS;IAElB,IAAI;IAwCJ,eAAe;;;;;;;;IAWT,GAAG;CAcV"}

package/dist/api/evm/EVMGetPublicKey.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"EVMGetPublicKey.d.ts","sourceRoot":"","sources":["../../../src/api/evm/EVMGetPublicKey.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,0BAA0B,EAAE,MAAM,wBAAwB,CAAC;AAG1F,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAE3C,OAAO,EAAyB,YAAY,EAAE,MAAM,aAAa,CAAC;AAMlE,MAAM,CAAC,OAAO,OAAO,eAAgB,SAAQ,UAAU,CAAC,0BAA0B,EAAE,CAAC;IACnF,SAAS,UAAS;IAElB,QAAQ,UAAS;IAEjB,IAAI;IAkCJ,eAAe,CAAC,KAAK,EAAE,oBAAoB;IAcrC,GAAG;;;;;CAuCV"}
+{"version":3,"file":"EVMGetPublicKey.d.ts","sourceRoot":"","sources":["../../../src/api/evm/EVMGetPublicKey.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,0BAA0B,EAAE,MAAM,wBAAwB,CAAC;AAG1F,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAE3C,OAAO,EAAyB,YAAY,EAAE,MAAM,aAAa,CAAC;AAOlE,MAAM,CAAC,OAAO,OAAO,eAAgB,SAAQ,UAAU,CAAC,0BAA0B,EAAE,CAAC;IACnF,SAAS,UAAS;IAElB,QAAQ,UAAS;IAEjB,IAAI;IAkCJ,eAAe,CAAC,KAAK,EAAE,oBAAoB;IAcrC,GAAG;;;;;CA2CV"}

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

@@ -1,7 +1,7 @@
-import { Path } from '@onekeyfe/hd-transport';
+import { EcdsaPublicKeys, Path } from '@onekeyfe/hd-transport';
 import { Device } from '../../device/Device';
 export declare function batchGetPublickeys(device: Device, paths: Path[], ecdsaCurveName: string, coinType: number, options?: {
     includeNode?: boolean;
     ignoreCoinType?: boolean;
-}): Promise<import("../../device/DeviceCommands").TypedResponseMessage<"EcdsaPublicKeys">>;
+}): Promise<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,EAChB,OAAO,CAAC,EAAE;IACR,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,cAAc,CAAC,EAAE,OAAO,CAAC;CAC1B,0FAsBF"}
+{"version":3,"file":"batchGetPublickeys.d.ts","sourceRoot":"","sources":["../../../src/api/helpers/batchGetPublickeys.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,IAAI,EAAE,MAAM,wBAAwB,CAAC;AAG/D,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAO7C,wBAAsB,kBAAkB,CACtC,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,4BAyDF"}

package/dist/api/sui/SuiGetPublicKey.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SuiGetPublicKey.d.ts","sourceRoot":"","sources":["../../../src/api/sui/SuiGetPublicKey.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAE3C,OAAO,EAAuB,YAAY,EAAE,MAAM,aAAa,CAAC;AAGhE,MAAM,CAAC,OAAO,OAAO,eAAgB,SAAQ,UAAU,CAAC,GAAG,CAAC;IAC1D,SAAS,UAAS;IAElB,IAAI;IA6BJ,eAAe;;;;;;;;IAWT,GAAG;CAgBV"}
+{"version":3,"file":"SuiGetPublicKey.d.ts","sourceRoot":"","sources":["../../../src/api/sui/SuiGetPublicKey.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAE3C,OAAO,EAAuB,YAAY,EAAE,MAAM,aAAa,CAAC;AAGhE,MAAM,CAAC,OAAO,OAAO,eAAgB,SAAQ,UAAU,CAAC,GAAG,CAAC;IAC1D,SAAS,UAAS;IAElB,IAAI;IA6BJ,eAAe;;;;;;;;IAWT,GAAG;CAcV"}

package/dist/index.js

@@ -30302,24 +30302,64 @@ class BTCGetAddress extends BaseMethod {
     }
 }
 
+function splitArray(array, size) {
+    const result = [];
+    for (let i = 0; i < array.length; i += size) {
+        result.push(array.slice(i, i + size));
+    }
+    return result;
+}
+
 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,
+    return __awaiter(this, void 0, void 0, function* () {
+        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);
+        }
+        let batchSize = 10;
+        const deviceType = getDeviceType(device.features);
+        if (DeviceModelToTypes.model_mini.includes(deviceType)) {
+            batchSize = 10;
+        }
+        else if (DeviceModelToTypes.model_touch.includes(deviceType)) {
+            batchSize = 20;
+        }
+        const result = {
+            public_keys: [],
+            hd_nodes: [],
+        };
+        const splitPaths = splitArray(paths, batchSize);
+        for (const paths of splitPaths) {
+            const res = yield 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,
+            });
+            if (res.type !== 'EcdsaPublicKeys') {
+                throw hdShared.TypedError(hdShared.HardwareErrorCode.DeviceNotSupportMethod, 'BatchGetPublickeys failed');
+            }
+            else {
+                result.root_fingerprint = res.message.root_fingerprint;
+                result.public_keys.push(...res.message.public_keys);
+                result.hd_nodes.push(...res.message.hd_nodes);
+            }
+        }
+        if (result.hd_nodes.length !== paths.length && (options === null || options === void 0 ? void 0 : options.includeNode)) {
+            throw hdShared.TypedError(hdShared.HardwareErrorCode.CallMethodError, 'BatchGetPublickeys failed, hd_nodes length not match');
+        }
+        if (result.public_keys.length !== paths.length && !(options === null || options === void 0 ? void 0 : options.includeNode)) {
+            throw hdShared.TypedError(hdShared.HardwareErrorCode.CallMethodError, 'BatchGetPublickeys failed, public_keys length not match');
+        }
+        return result;
     });
 }
 
@@ -30442,7 +30482,6 @@ class BTCGetPublicKey extends BaseMethod {
         return getBitcoinForkVersionRange(this.params.map(param => param.coin_name));
     }
     run() {
-        var _a;
         return __awaiter(this, void 0, void 0, function* () {
             let responses = [];
             try {
@@ -30454,15 +30493,15 @@ class BTCGetPublicKey extends BaseMethod {
                     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) {
+                if (!(res === null || res === void 0 ? void 0 : res.hd_nodes) || this.params.length !== res.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 node = res.hd_nodes[i];
                     const path = serializedPath(param.address_n);
                     const xpub = createExtendedPublicKey(node, param.coin_name, param.script_type);
-                    const rootFingerprint = res.message.root_fingerprint;
+                    const rootFingerprint = res.root_fingerprint;
                     let xpubSegwit = xpub;
                     if (this.isBtcNetwork(param) && isTaprootPath(param.address_n)) {
                         const fingerprint = Number(rootFingerprint || 0)
@@ -31364,19 +31403,23 @@ class EVMGetPublicKey extends BaseMethod {
         return __awaiter(this, void 0, void 0, function* () {
             const responses = [];
             if (this.useBatch && this.hasBundle && supportBatchPublicKey((_a = this.device) === null || _a === void 0 ? void 0 : _a.features)) {
-                const res = yield this.device.commands.typedCall('BatchGetPublickeys', 'EcdsaPublicKeys', {
-                    paths: this.params,
-                    ecdsa_curve_name: 'secp256k1',
-                });
-                const result = res.message.public_keys.map((publicKey, index) => ({
-                    path: serializedPath(this.params[index].address_n),
-                    pub: publicKey,
-                    publicKey,
-                }));
-                validateResult(result, ['pub'], {
-                    expectedLength: this.params.length,
-                });
-                return Promise.resolve(result);
+                try {
+                    const res = yield batchGetPublickeys(this.device, this.params, 'secp256k1', 60, {
+                        includeNode: false,
+                        ignoreCoinType: true,
+                    });
+                    const result = res.public_keys.map((publicKey, index) => ({
+                        path: serializedPath(this.params[index].address_n),
+                        pub: publicKey,
+                        publicKey,
+                    }));
+                    validateResult(result, ['pub'], {
+                        expectedLength: this.params.length,
+                    });
+                    return yield Promise.resolve(result);
+                }
+                catch (e) {
+                }
             }
             for (let i = 0; i < this.params.length; i++) {
                 const param = this.params[i];
@@ -33416,7 +33459,7 @@ class AptosGetAddress extends BaseMethod {
                 const publicKeyRes = yield batchGetPublickeys(this.device, this.params, 'ed25519', 637);
                 for (let i = 0; i < this.params.length; i++) {
                     const param = this.params[i];
-                    const publicKey = publicKeyRes.message.public_keys[i];
+                    const publicKey = publicKeyRes.public_keys[i];
                     let address;
                     if (this.shouldConfirm) {
                         const addressRes = yield this.device.commands.typedCall('AptosGetAddress', 'AptosAddress', param);
@@ -33496,7 +33539,7 @@ class AptosGetPublicKey extends BaseMethod {
     run() {
         return __awaiter(this, void 0, void 0, function* () {
             const res = yield batchGetPublickeys(this.device, this.params, 'ed25519', 637);
-            const responses = res.message.public_keys.map((publicKey, index) => ({
+            const responses = res.public_keys.map((publicKey, index) => ({
                 path: serializedPath(this.params[index].address_n),
                 pub: publicKey,
                 publicKey,
@@ -33825,7 +33868,7 @@ class CosmosGetPublicKey extends BaseMethod {
     run() {
         return __awaiter(this, void 0, void 0, function* () {
             const res = yield batchGetPublickeys(this.device, this.params, this.params[0].curve, 118);
-            const responses = res.message.public_keys.map((publicKey, index) => ({
+            const responses = res.public_keys.map((publicKey, index) => ({
                 path: serializedPath(this.params[index].address_n),
                 pub: publicKey,
                 publicKey,
@@ -33922,7 +33965,7 @@ class XrpGetAddress$1 extends BaseMethod {
         return __awaiter(this, void 0, void 0, function* () {
             if (this.hasBundle && supportBatchPublicKey((_a = this.device) === null || _a === void 0 ? void 0 : _a.features) && !this.shouldConfirm) {
                 const res = yield batchGetPublickeys(this.device, this.params, 'secp256k1', 144);
-                const result = res.message.public_keys.map((publicKey, index) => ({
+                const result = res.public_keys.map((publicKey, index) => ({
                     path: serializedPath(this.params[index].address_n),
                     address: rippleKeypairs.deriveAddress(publicKey),
                     publicKey,
@@ -34090,7 +34133,7 @@ class SuiGetAddress extends BaseMethod {
                 const publicKeyRes = yield batchGetPublickeys(this.device, this.params, 'ed25519', 784);
                 for (let i = 0; i < this.params.length; i++) {
                     const param = this.params[i];
-                    const publicKey = publicKeyRes.message.public_keys[i];
+                    const publicKey = publicKeyRes.public_keys[i];
                     let address;
                     if (this.shouldConfirm) {
                         const addressRes = yield this.device.commands.typedCall('SuiGetAddress', 'SuiAddress', param);
@@ -34173,7 +34216,7 @@ class SuiGetPublicKey extends BaseMethod {
     run() {
         return __awaiter(this, void 0, void 0, function* () {
             const res = yield batchGetPublickeys(this.device, this.params, 'ed25519', 784);
-            const responses = res.message.public_keys.map((publicKey, index) => ({
+            const responses = res.public_keys.map((publicKey, index) => ({
                 path: serializedPath(this.params[index].address_n),
                 publicKey,
                 pub: publicKey,
@@ -37455,7 +37498,7 @@ class BenfenGetAddress extends BaseMethod {
                 const publicKeyRes = yield batchGetPublickeys(this.device, this.params, 'ed25519', 728);
                 for (let i = 0; i < this.params.length; i++) {
                     const param = this.params[i];
-                    const publicKey = publicKeyRes.message.public_keys[i];
+                    const publicKey = publicKeyRes.public_keys[i];
                     let address;
                     if (this.shouldConfirm) {
                         const addressRes = yield this.device.commands.typedCall('BenfenGetAddress', 'BenfenAddress', param);
@@ -37537,7 +37580,7 @@ class BenfenGetPublicKey extends BaseMethod {
     run() {
         return __awaiter(this, void 0, void 0, function* () {
             const res = yield batchGetPublickeys(this.device, this.params, 'ed25519', 728);
-            const responses = res.message.public_keys.map((publicKey, index) => ({
+            const responses = res.public_keys.map((publicKey, index) => ({
                 path: serializedPath(this.params[index].address_n),
                 pub: publicKey,
             }));

package/dist/utils/arrayUtils.d.ts

@@ -0,0 +1,2 @@
+export declare function splitArray<T>(array: T[], size: number): T[][];
+//# sourceMappingURL=arrayUtils.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"arrayUtils.d.ts","sourceRoot":"","sources":["../../src/utils/arrayUtils.ts"],"names":[],"mappings":"AAAA,wBAAgB,UAAU,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE,IAAI,EAAE,MAAM,GAAG,CAAC,EAAE,EAAE,CAM7D"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-core",
-  "version": "1.0.30",
+  "version": "1.0.31",
   "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.30",
-    "@onekeyfe/hd-transport": "^1.0.30",
+    "@onekeyfe/hd-shared": "^1.0.31",
+    "@onekeyfe/hd-transport": "^1.0.31",
     "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": "e7d0b547c42856f3bf4801ede2cadb593e1cbf8e"
+  "gitHead": "3e31186a4c2969d666a6ea124209075ab7a8e7aa"
 }

package/src/api/aptos/AptosGetAddress.ts

@@ -72,7 +72,7 @@ export default class AptosGetAddress extends BaseMethod<HardwareAptosGetAddress[
 
       for (let i = 0; i < this.params.length; i++) {
         const param = this.params[i];
-        const publicKey = publicKeyRes.message.public_keys[i];
+        const publicKey = publicKeyRes.public_keys[i];
         let address: string;
 
         if (this.shouldConfirm) {

package/src/api/aptos/AptosGetPublicKey.ts

@@ -48,13 +48,11 @@ export default class AptosGetPublicKey extends BaseMethod<any> {
   async run() {
     const res = await batchGetPublickeys(this.device, this.params, 'ed25519', 637);
 
-    const responses: AptosPublicKey[] = res.message.public_keys.map(
-      (publicKey: string, index: number) => ({
-        path: serializedPath((this.params as unknown as any[])[index].address_n),
-        pub: publicKey,
-        publicKey,
-      })
-    );
+    const responses: AptosPublicKey[] = res.public_keys.map((publicKey: string, index: number) => ({
+      path: serializedPath((this.params as unknown as any[])[index].address_n),
+      pub: publicKey,
+      publicKey,
+    }));
 
     validateResult(responses, ['pub'], {
       expectedLength: this.params.length,

package/src/api/benfen/BenfenGetAddress.ts

@@ -66,7 +66,7 @@ export default class BenfenGetAddress extends BaseMethod<HardwareBenfenGetAddres
       const publicKeyRes = await batchGetPublickeys(this.device, this.params, 'ed25519', 728);
       for (let i = 0; i < this.params.length; i++) {
         const param = this.params[i];
-        const publicKey = publicKeyRes.message.public_keys[i];
+        const publicKey = publicKeyRes.public_keys[i];
         let address: string;
 
         if (this.shouldConfirm) {

package/src/api/benfen/BenfenGetPublicKey.ts

@@ -51,7 +51,7 @@ export default class BenfenGetPublicKey extends BaseMethod<any> {
   async run() {
     const res = await batchGetPublickeys(this.device, this.params, 'ed25519', 728);
 
-    const responses: BenfenPublicKey[] = res.message.public_keys.map(
+    const responses: BenfenPublicKey[] = res.public_keys.map(
       (publicKey: string, index: number) => ({
         path: serializedPath((this.params as any[])[index].address_n),
         pub: publicKey,

package/src/api/btc/BTCGetPublicKey.ts

@@ -79,19 +79,19 @@ export default class BTCGetPublicKey extends BaseMethod<GetPublicKey[]> {
         ignoreCoinType: true,
       });
 
-      if (!res.message?.hd_nodes || this.params.length !== res.message.hd_nodes.length) {
+      if (!res?.hd_nodes || this.params.length !== res.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 node = res.hd_nodes[i];
 
         const path = serializedPath(param.address_n);
 
         const xpub = createExtendedPublicKey(node, param.coin_name, param.script_type);
 
-        const rootFingerprint = res.message.root_fingerprint;
+        const rootFingerprint = res.root_fingerprint;
 
         let xpubSegwit = xpub;
         if (this.isBtcNetwork(param) && isTaprootPath(param.address_n)) {

package/src/api/cosmos/CosmosGetPublicKey.ts

@@ -61,13 +61,11 @@ export default class CosmosGetPublicKey extends BaseMethod<any> {
 
   async run() {
     const res = await batchGetPublickeys(this.device, this.params, this.params[0].curve, 118);
-    const responses: CosmosAddress[] = res.message.public_keys.map(
-      (publicKey: string, index: number) => ({
-        path: serializedPath((this.params as unknown as any[])[index].address_n),
-        pub: publicKey,
-        publicKey,
-      })
-    );
+    const responses: CosmosAddress[] = res.public_keys.map((publicKey: string, index: number) => ({
+      path: serializedPath((this.params as unknown as any[])[index].address_n),
+      pub: publicKey,
+      publicKey,
+    }));
 
     validateResult(responses, ['pub'], {
       expectedLength: this.params.length,

package/src/api/evm/EVMGetPublicKey.ts

@@ -8,6 +8,7 @@ import { supportBatchPublicKey } from '../../utils/deviceFeaturesUtils';
 import TransportManager from '../../data-manager/TransportManager';
 import getPublicKey from './latest/getPublicKey';
 import getPublicKeyLegacyV1 from './legacyV1/getPublicKey';
+import { batchGetPublickeys } from '../helpers/batchGetPublickeys';
 
 export default class EVMGetPublicKey extends BaseMethod<EthereumGetPublicKeyOneKey[]> {
   hasBundle = false;
@@ -66,20 +67,24 @@ export default class EVMGetPublicKey extends BaseMethod<EthereumGetPublicKeyOneK
     const responses: EVMPublicKey[] = [];
 
     if (this.useBatch && this.hasBundle && supportBatchPublicKey(this.device?.features)) {
-      const res = await this.device.commands.typedCall('BatchGetPublickeys', 'EcdsaPublicKeys', {
-        paths: this.params,
-        ecdsa_curve_name: 'secp256k1',
-      });
-      const result = res.message.public_keys.map((publicKey: string, index: number) => ({
-        path: serializedPath((this.params as unknown as any[])[index].address_n),
-        pub: publicKey,
-        publicKey,
-      }));
-
-      validateResult(result, ['pub'], {
-        expectedLength: this.params.length,
-      });
-      return Promise.resolve(result);
+      try {
+        const res = await batchGetPublickeys(this.device, this.params, 'secp256k1', 60, {
+          includeNode: false,
+          ignoreCoinType: true,
+        });
+        const result = res.public_keys.map((publicKey: string, index: number) => ({
+          path: serializedPath((this.params as unknown as any[])[index].address_n),
+          pub: publicKey,
+          publicKey,
+        }));
+
+        validateResult(result, ['pub'], {
+          expectedLength: this.params.length,
+        });
+        return await Promise.resolve(result);
+      } catch (e) {
+        // ignore error, fallback to single get public key
+      }
     }
 
     for (let i = 0; i < this.params.length; i++) {

package/src/api/helpers/batchGetPublickeys.ts

@@ -1,11 +1,14 @@
-import { Path } from '@onekeyfe/hd-transport';
+import { EcdsaPublicKeys, Path } from '@onekeyfe/hd-transport';
 
 import { TypedError, HardwareErrorCode } from '@onekeyfe/hd-shared';
 import { Device } from '../../device/Device';
 import { supportBatchPublicKey } from '../../utils/deviceFeaturesUtils';
 import { isEqualBip44CoinType } from './pathUtils';
+import { splitArray } from '../../utils/arrayUtils';
+import { getDeviceType } from '../../utils';
+import { DeviceModelToTypes } from '../../types';
 
-export function batchGetPublickeys(
+export async function batchGetPublickeys(
   device: Device,
   paths: Path[],
   ecdsaCurveName: string,
@@ -30,9 +33,44 @@ export function batchGetPublickeys(
     throw TypedError(HardwareErrorCode.ForbiddenKeyPath);
   }
 
-  return device.commands.typedCall('BatchGetPublickeys', 'EcdsaPublicKeys', {
-    paths,
-    ecdsa_curve_name: ecdsaCurveName,
-    include_node: options?.includeNode ?? false,
-  });
+  let batchSize = 10;
+  const deviceType = getDeviceType(device.features);
+  if (DeviceModelToTypes.model_mini.includes(deviceType)) {
+    batchSize = 10;
+  } else if (DeviceModelToTypes.model_touch.includes(deviceType)) {
+    batchSize = 20;
+  }
+
+  const result: EcdsaPublicKeys = {
+    public_keys: [],
+    hd_nodes: [],
+  };
+  const splitPaths = splitArray(paths, batchSize);
+  for (const paths of splitPaths) {
+    const res = await device.commands.typedCall('BatchGetPublickeys', 'EcdsaPublicKeys', {
+      paths,
+      ecdsa_curve_name: ecdsaCurveName,
+      include_node: options?.includeNode ?? false,
+    });
+    if (res.type !== 'EcdsaPublicKeys') {
+      throw TypedError(HardwareErrorCode.DeviceNotSupportMethod, 'BatchGetPublickeys failed');
+    } else {
+      result.root_fingerprint = res.message.root_fingerprint;
+      result.public_keys.push(...res.message.public_keys);
+      result.hd_nodes.push(...res.message.hd_nodes);
+    }
+  }
+  if (result.hd_nodes.length !== paths.length && options?.includeNode) {
+    throw TypedError(
+      HardwareErrorCode.CallMethodError,
+      'BatchGetPublickeys failed, hd_nodes length not match'
+    );
+  }
+  if (result.public_keys.length !== paths.length && !options?.includeNode) {
+    throw TypedError(
+      HardwareErrorCode.CallMethodError,
+      'BatchGetPublickeys failed, public_keys length not match'
+    );
+  }
+  return result;
 }

package/src/api/sui/SuiGetAddress.ts

@@ -65,7 +65,7 @@ export default class SuiGetAddress extends BaseMethod<HardwareSuiGetAddress[]> {
       const publicKeyRes = await batchGetPublickeys(this.device, this.params, 'ed25519', 784);
       for (let i = 0; i < this.params.length; i++) {
         const param = this.params[i];
-        const publicKey = publicKeyRes.message.public_keys[i];
+        const publicKey = publicKeyRes.public_keys[i];
         let address: string | undefined;
 
         if (this.shouldConfirm) {

package/src/api/sui/SuiGetPublicKey.ts

@@ -50,13 +50,11 @@ export default class SuiGetPublicKey extends BaseMethod<any> {
 
   async run() {
     const res = await batchGetPublickeys(this.device, this.params, 'ed25519', 784);
-    const responses: SuiPublicKey[] = res.message.public_keys.map(
-      (publicKey: string, index: number) => ({
-        path: serializedPath((this.params as unknown as any[])[index].address_n),
-        publicKey,
-        pub: publicKey,
-      })
-    );
+    const responses: SuiPublicKey[] = res.public_keys.map((publicKey: string, index: number) => ({
+      path: serializedPath((this.params as unknown as any[])[index].address_n),
+      publicKey,
+      pub: publicKey,
+    }));
 
     validateResult(responses, ['pub'], {
       expectedLength: this.params.length,

package/src/api/xrp/XrpGetAddress.ts

@@ -59,7 +59,7 @@ export default class XrpGetAddress extends BaseMethod<
   async run() {
     if (this.hasBundle && supportBatchPublicKey(this.device?.features) && !this.shouldConfirm) {
       const res = await batchGetPublickeys(this.device, this.params, 'secp256k1', 144);
-      const result = res.message.public_keys.map((publicKey: string, index: number) => ({
+      const result = res.public_keys.map((publicKey: string, index: number) => ({
         path: serializedPath((this.params as unknown as any[])[index].address_n),
         address: deriveAddress(publicKey),
         publicKey,

package/src/utils/arrayUtils.ts

@@ -0,0 +1,7 @@
+export function splitArray<T>(array: T[], size: number): T[][] {
+  const result = [];
+  for (let i = 0; i < array.length; i += size) {
+    result.push(array.slice(i, i + size));
+  }
+  return result;
+}