@onekeyfe/hd-core 0.2.26 → 0.2.28

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

@@ -3,7 +3,11 @@ import { BaseMethod } from '../BaseMethod';
 import { EVMPublicKey } from '../../types/api/evmGetPublicKey';
 export default class EVMGetPublicKey extends BaseMethod<EthereumGetPublicKey[]> {
     hasBundle: boolean;
+    useBatch: boolean;
     init(): void;
-    run(): Promise<EVMPublicKey | EVMPublicKey[]>;
+    run(): Promise<EVMPublicKey | {
+        path: string;
+        publicKey: string;
+    }[]>;
 }
 //# sourceMappingURL=EVMGetPublicKey.d.ts.map

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,MAAM,wBAAwB,CAAC;AAG9D,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAE3C,OAAO,EAAyB,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAEtF,MAAM,CAAC,OAAO,OAAO,eAAgB,SAAQ,UAAU,CAAC,oBAAoB,EAAE,CAAC;IAC7E,SAAS,UAAS;IAElB,IAAI;IA+BE,GAAG;CAsBV"}
+{"version":3,"file":"EVMGetPublicKey.d.ts","sourceRoot":"","sources":["../../../src/api/evm/EVMGetPublicKey.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAG9D,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAE3C,OAAO,EAAyB,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAGtF,MAAM,CAAC,OAAO,OAAO,eAAgB,SAAQ,UAAU,CAAC,oBAAoB,EAAE,CAAC;IAC7E,SAAS,UAAS;IAElB,QAAQ,UAAS;IAEjB,IAAI;IAgCE,GAAG;;;;CAmCV"}

package/dist/index.d.ts

@@ -404,6 +404,7 @@ declare function evmGetAddress(connectId: string, deviceId: string, params: Comm
 
 declare type EVMPublicKey = {
     path: string;
+    publicKey: string;
 } & EthereumPublicKey;
 declare type EVMGetPublicKeyParams = {
     path: string | number[];
@@ -414,6 +415,10 @@ declare function evmGetPublicKey(connectId: string, deviceId: string, params: Co
 declare function evmGetPublicKey(connectId: string, deviceId: string, params: CommonParams & {
     bundle?: EVMGetPublicKeyParams[];
 }): Response<Array<EVMPublicKey>>;
+declare function evmGetPublicKey(connectId: string, deviceId: string, params: CommonParams & {
+    bundle?: EVMGetPublicKeyParams[];
+    useBatch?: boolean;
+}): Response<Omit<EVMPublicKey, 'node' | 'xpub'>>;
 
 declare type EVMSignMessageParams = {
     path: string | number[];

package/dist/index.js

@@ -14738,12 +14738,14 @@ class EVMGetPublicKey extends BaseMethod {
     constructor() {
         super(...arguments);
         this.hasBundle = false;
+        this.useBatch = false;
     }
     init() {
-        var _a;
+        var _a, _b;
         this.checkDeviceId = true;
         this.allowDeviceMode = [...this.allowDeviceMode, UI_REQUEST.INITIALIZE];
         this.hasBundle = !!((_a = this.payload) === null || _a === void 0 ? void 0 : _a.bundle);
+        this.useBatch = !!((_b = this.payload) === null || _b === void 0 ? void 0 : _b.useBatch);
         const payload = this.hasBundle ? this.payload : { bundle: [this.payload] };
         validateParams(payload, [{ name: 'bundle', type: 'array' }]);
         this.params = [];
@@ -14764,12 +14766,24 @@ class EVMGetPublicKey extends BaseMethod {
         });
     }
     run() {
+        var _a;
         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),
+                    publicKey,
+                }));
+                return Promise.resolve(result);
+            }
             for (let i = 0; i < this.params.length; i++) {
                 const param = this.params[i];
                 const res = yield this.device.commands.typedCall('EthereumGetPublicKey', 'EthereumPublicKey', Object.assign({}, param));
-                responses.push(Object.assign({ path: serializedPath(param.address_n) }, res.message));
+                responses.push(Object.assign({ path: serializedPath(param.address_n), publicKey: res.message.node.public_key }, res.message));
             }
             return Promise.resolve(this.hasBundle ? responses : responses[0]);
         });
@@ -17955,7 +17969,7 @@ class PolkadotGetAddress extends BaseMethod {
                 min: '2.11.0',
             },
             model_touch: {
-                min: '4.1.0',
+                min: '4.2.0',
             },
         };
     }
@@ -18004,7 +18018,7 @@ class PolkadotSignTransaction extends BaseMethod {
                 min: '2.11.0',
             },
             model_touch: {
-                min: '4.1.0',
+                min: '4.2.0',
             },
         };
     }

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

@@ -2,6 +2,7 @@ import { EthereumPublicKey } from '@onekeyfe/hd-transport';
 import type { CommonParams, Response } from '../params';
 export declare type EVMPublicKey = {
     path: string;
+    publicKey: string;
 } & EthereumPublicKey;
 export declare type EVMGetPublicKeyParams = {
     path: string | number[];
@@ -12,4 +13,8 @@ export declare function evmGetPublicKey(connectId: string, deviceId: string, par
 export declare function evmGetPublicKey(connectId: string, deviceId: string, params: CommonParams & {
     bundle?: EVMGetPublicKeyParams[];
 }): Response<Array<EVMPublicKey>>;
+export declare function evmGetPublicKey(connectId: string, deviceId: string, params: CommonParams & {
+    bundle?: EVMGetPublicKeyParams[];
+    useBatch?: boolean;
+}): Response<Omit<EVMPublicKey, 'node' | 'xpub'>>;
 //# sourceMappingURL=evmGetPublicKey.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"evmGetPublicKey.d.ts","sourceRoot":"","sources":["../../../src/types/api/evmGetPublicKey.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAC3D,OAAO,KAAK,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAExD,oBAAY,YAAY,GAAG;IACzB,IAAI,EAAE,MAAM,CAAC;CACd,GAAG,iBAAiB,CAAC;AAEtB,oBAAY,qBAAqB,GAAG;IAClC,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IACxB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF,MAAM,CAAC,OAAO,UAAU,eAAe,CACrC,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,YAAY,GAAG,qBAAqB,GAC3C,QAAQ,CAAC,YAAY,CAAC,CAAC;AAE1B,MAAM,CAAC,OAAO,UAAU,eAAe,CACrC,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,YAAY,GAAG;IAAE,MAAM,CAAC,EAAE,qBAAqB,EAAE,CAAA;CAAE,GAC1D,QAAQ,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC"}
+{"version":3,"file":"evmGetPublicKey.d.ts","sourceRoot":"","sources":["../../../src/types/api/evmGetPublicKey.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAC3D,OAAO,KAAK,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAExD,oBAAY,YAAY,GAAG;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;CACnB,GAAG,iBAAiB,CAAC;AAEtB,oBAAY,qBAAqB,GAAG;IAClC,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IACxB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF,MAAM,CAAC,OAAO,UAAU,eAAe,CACrC,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,YAAY,GAAG,qBAAqB,GAC3C,QAAQ,CAAC,YAAY,CAAC,CAAC;AAE1B,MAAM,CAAC,OAAO,UAAU,eAAe,CACrC,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,YAAY,GAAG;IAAE,MAAM,CAAC,EAAE,qBAAqB,EAAE,CAAA;CAAE,GAC1D,QAAQ,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC;AAEjC,MAAM,CAAC,OAAO,UAAU,eAAe,CACrC,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,YAAY,GAAG;IAAE,MAAM,CAAC,EAAE,qBAAqB,EAAE,CAAC;IAAC,QAAQ,CAAC,EAAE,OAAO,CAAA;CAAE,GAC9E,QAAQ,CAAC,IAAI,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM,CAAC,CAAC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-core",
-  "version": "0.2.26",
+  "version": "0.2.28",
   "description": "> TODO: description",
   "author": "OneKey",
   "homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
@@ -24,8 +24,8 @@
     "url": "https://github.com/OneKeyHQ/hardware-js-sdk/issues"
   },
   "dependencies": {
-    "@onekeyfe/hd-shared": "^0.2.26",
-    "@onekeyfe/hd-transport": "^0.2.26",
+    "@onekeyfe/hd-shared": "^0.2.28",
+    "@onekeyfe/hd-transport": "^0.2.28",
     "axios": "^0.27.2",
     "bignumber.js": "^9.0.2",
     "jszip": "^3.10.1",
@@ -42,5 +42,5 @@
     "@types/semver": "^7.3.9",
     "ripple-keypairs": "^1.1.4"
   },
-  "gitHead": "0ba470ac6126a583bfcfd09e06cbcbb484be3c61"
+  "gitHead": "a6cf73ada3cfd4fbb5f77ca82856e3e3767c8c4c"
 }

package/src/api/evm/EVMGetPublicKey.ts

@@ -4,15 +4,19 @@ import { serializedPath, validatePath } from '../helpers/pathUtils';
 import { BaseMethod } from '../BaseMethod';
 import { validateParams } from '../helpers/paramsValidator';
 import { EVMGetPublicKeyParams, EVMPublicKey } from '../../types/api/evmGetPublicKey';
+import { supportBatchPublicKey } from '../../utils/deviceFeaturesUtils';
 
 export default class EVMGetPublicKey extends BaseMethod<EthereumGetPublicKey[]> {
   hasBundle = false;
 
+  useBatch = false;
+
   init() {
     this.checkDeviceId = true;
     this.allowDeviceMode = [...this.allowDeviceMode, UI_REQUEST.INITIALIZE];
 
     this.hasBundle = !!this.payload?.bundle;
+    this.useBatch = !!this.payload?.useBatch;
     const payload = this.hasBundle ? this.payload : { bundle: [this.payload] };
 
     // check payload
@@ -42,6 +46,18 @@ export default class EVMGetPublicKey extends BaseMethod<EthereumGetPublicKey[]>
   async run() {
     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),
+        publicKey,
+      }));
+      return Promise.resolve(result);
+    }
+
     for (let i = 0; i < this.params.length; i++) {
       const param = this.params[i];
 
@@ -55,6 +71,7 @@ export default class EVMGetPublicKey extends BaseMethod<EthereumGetPublicKey[]>
 
       responses.push({
         path: serializedPath(param.address_n),
+        publicKey: res.message.node.public_key,
         ...res.message,
       });
     }

package/src/api/polkadot/PolkadotGetAddress.ts

@@ -48,7 +48,7 @@ export default class PolkadotGetAddress extends BaseMethod<HardwarePolkadotGetAd
         min: '2.11.0',
       },
       model_touch: {
-        min: '4.1.0',
+        min: '4.2.0',
       },
     };
   }

package/src/api/polkadot/PolkadotSignTransaction.ts

@@ -36,7 +36,7 @@ export default class PolkadotSignTransaction extends BaseMethod<HardwarePolkadot
         min: '2.11.0',
       },
       model_touch: {
-        min: '4.1.0',
+        min: '4.2.0',
       },
     };
   }

package/src/types/api/evmGetPublicKey.ts

@@ -3,6 +3,7 @@ import type { CommonParams, Response } from '../params';
 
 export type EVMPublicKey = {
   path: string;
+  publicKey: string;
 } & EthereumPublicKey;
 
 export type EVMGetPublicKeyParams = {
@@ -22,3 +23,9 @@ export declare function evmGetPublicKey(
   deviceId: string,
   params: CommonParams & { bundle?: EVMGetPublicKeyParams[] }
 ): Response<Array<EVMPublicKey>>;
+
+export declare function evmGetPublicKey(
+  connectId: string,
+  deviceId: string,
+  params: CommonParams & { bundle?: EVMGetPublicKeyParams[]; useBatch?: boolean }
+): Response<Omit<EVMPublicKey, 'node' | 'xpub'>>;