@onekeyfe/hd-core 0.1.52 → 0.1.53

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

@@ -1,9 +1,9 @@
 import { AptosGetAddress as HardwareAptosGetAddress } from '@onekeyfe/hd-transport';
 import { BaseMethod } from '../BaseMethod';
-import { AptosAddress } from '../../types';
 export default class AptosGetAddress extends BaseMethod<HardwareAptosGetAddress[]> {
     hasBundle: boolean;
     init(): void;
-    run(): Promise<AptosAddress | AptosAddress[]>;
+    publicKeyToAddress(publicKey: string): string;
+    run(): Promise<any>;
 }
 //# sourceMappingURL=AptosGetAddress.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"AptosGetAddress.d.ts","sourceRoot":"","sources":["../../../src/api/aptos/AptosGetAddress.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,IAAI,uBAAuB,EAAE,MAAM,wBAAwB,CAAC;AAGpF,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAE3C,OAAO,EAAE,YAAY,EAAyB,MAAM,aAAa,CAAC;AAElE,MAAM,CAAC,OAAO,OAAO,eAAgB,SAAQ,UAAU,CAAC,uBAAuB,EAAE,CAAC;IAChF,SAAS,UAAS;IAElB,IAAI;IA6BE,GAAG;CAoBV"}
+{"version":3,"file":"AptosGetAddress.d.ts","sourceRoot":"","sources":["../../../src/api/aptos/AptosGetAddress.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,IAAI,uBAAuB,EAAE,MAAM,wBAAwB,CAAC;AAGpF,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAO3C,MAAM,CAAC,OAAO,OAAO,eAAgB,SAAQ,UAAU,CAAC,uBAAuB,EAAE,CAAC;IAChF,SAAS,UAAS;IAElB,IAAI;IA6BJ,kBAAkB,CAAC,SAAS,EAAE,MAAM;IAO9B,GAAG;CAkCV"}

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

@@ -4,4 +4,6 @@ export declare const addHexPrefix: (str: string) => string;
 export declare const isHexString: (value: string, length?: number | undefined) => boolean;
 export declare const stripHexStartZeroes: (str: string) => string;
 export declare const formatAnyHex: (value: any) => any;
+export declare function bytesToHex(uint8a: Uint8Array): string;
+export declare function hexToBytes(hex: string): Uint8Array;
 //# sourceMappingURL=hexUtils.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"hexUtils.d.ts","sourceRoot":"","sources":["../../../src/api/helpers/hexUtils.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,YAAY,QAAS,MAAM,KAAG,OAAiD,CAAC;AAG7F,eAAO,MAAM,cAAc,QAAS,MAAM,KAAG,MAAkD,CAAC;AAGhG,eAAO,MAAM,YAAY,QAAS,MAAM,KAAG,MAAgD,CAAC;AAE5F,eAAO,MAAM,WAAW,UAAW,MAAM,yCAQxC,CAAC;AAEF,eAAO,MAAM,mBAAmB,QAAS,MAAM,WAK9C,CAAC;AAQF,eAAO,MAAM,YAAY,EAAE,CAAC,KAAK,EAAE,GAAG,KAAK,GAiB1C,CAAC"}
+{"version":3,"file":"hexUtils.d.ts","sourceRoot":"","sources":["../../../src/api/helpers/hexUtils.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,YAAY,QAAS,MAAM,KAAG,OAAiD,CAAC;AAG7F,eAAO,MAAM,cAAc,QAAS,MAAM,KAAG,MAAkD,CAAC;AAGhG,eAAO,MAAM,YAAY,QAAS,MAAM,KAAG,MAAgD,CAAC;AAE5F,eAAO,MAAM,WAAW,UAAW,MAAM,yCAQxC,CAAC;AAEF,eAAO,MAAM,mBAAmB,QAAS,MAAM,WAK9C,CAAC;AAQF,eAAO,MAAM,YAAY,EAAE,CAAC,KAAK,EAAE,GAAG,KAAK,GAiB1C,CAAC;AAMF,wBAAgB,UAAU,CAAC,MAAM,EAAE,UAAU,GAAG,MAAM,CAQrD;AAKD,wBAAgB,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,UAAU,CAclD"}

package/dist/index.d.ts

@@ -1030,6 +1030,7 @@ declare function nearSignTransaction(connectId: string, deviceId: string, params
 
 declare type AptosAddress = {
     path: string;
+    publicKey?: string;
 } & AptosAddress$1;
 declare type AptosGetAddressParams = {
     path: string | number[];

package/dist/index.js

@@ -8,6 +8,7 @@ var axios = require('axios');
 var BigNumber = require('bignumber.js');
 var sha256 = require('js-sha256');
 var hdTransport = require('@onekeyfe/hd-transport');
+var sha3 = require('js-sha3');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -15,6 +16,7 @@ var semver__default = /*#__PURE__*/_interopDefaultLegacy(semver);
 var axios__default = /*#__PURE__*/_interopDefaultLegacy(axios);
 var BigNumber__default = /*#__PURE__*/_interopDefaultLegacy(BigNumber);
 var sha256__default = /*#__PURE__*/_interopDefaultLegacy(sha256);
+var sha3__default = /*#__PURE__*/_interopDefaultLegacy(sha3);
 
 const inject = ({ call, cancel, dispose, eventEmitter, init, uiResponse, }) => {
     const api = {
@@ -832,6 +834,12 @@ const getPassphraseState = (features, commands) => __awaiter(void 0, void 0, voi
     });
     return message.address;
 });
+const supportBatchPublicKey = (features) => {
+    if (!features)
+        return false;
+    const currentVersion = getDeviceFirmwareVersion(features).join('.');
+    return semver__default["default"].gte(currentVersion, '2.6.0');
+};
 
 var nested = {
 	AptosGetAddress: {
@@ -11867,6 +11875,24 @@ const formatAnyHex = value => {
     }
     return value;
 };
+Array.from({ length: 256 }, (v, i) => i.toString(16).padStart(2, '0'));
+function hexToBytes(hex) {
+    if (typeof hex !== 'string') {
+        throw new TypeError(`hexToBytes: expected string, got ${typeof hex}`);
+    }
+    if (hex.length % 2)
+        throw new Error('hexToBytes: received invalid unpadded hex');
+    const array = new Uint8Array(hex.length / 2);
+    for (let i = 0; i < array.length; i++) {
+        const j = i * 2;
+        const hexByte = hex.slice(j, j + 2);
+        const byte = Number.parseInt(hexByte, 16);
+        if (Number.isNaN(byte) || byte < 0)
+            throw new Error('Invalid byte sequence');
+        array[i] = byte;
+    }
+    return array;
+}
 
 const invalidParameter = (message) => hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.CallMethodInvalidParameter, message);
 const validateParams = (values, fields) => {
@@ -14863,6 +14889,7 @@ class NearSignTransaction extends BaseMethod {
     }
 }
 
+const { sha3_256: sha3Hash } = sha3__default["default"];
 class AptosGetAddress extends BaseMethod {
     constructor() {
         super(...arguments);
@@ -14890,8 +14917,27 @@ class AptosGetAddress extends BaseMethod {
             });
         });
     }
+    publicKeyToAddress(publicKey) {
+        const hash = sha3Hash.create();
+        hash.update(hexToBytes(publicKey));
+        hash.update("\x00");
+        return hash.hex();
+    }
     run() {
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
+            if (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: 'ed25519',
+                });
+                const result = res.message.public_keys.map((publicKey, index) => ({
+                    path: serializedPath(this.params[index].address_n),
+                    publicKey,
+                    address: this.publicKeyToAddress(publicKey),
+                }));
+                return Promise.resolve(result);
+            }
             const responses = [];
             for (let i = 0; i < this.params.length; i++) {
                 const param = this.params[i];

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

@@ -2,6 +2,7 @@ import { AptosAddress as HardwareAptosAddress } from '@onekeyfe/hd-transport';
 import type { CommonParams, Response } from '../params';
 export declare type AptosAddress = {
     path: string;
+    publicKey?: string;
 } & HardwareAptosAddress;
 export declare type AptosGetAddressParams = {
     path: string | number[];

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

@@ -1 +1 @@
-{"version":3,"file":"aptosGetAddress.d.ts","sourceRoot":"","sources":["../../../src/types/api/aptosGetAddress.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,IAAI,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAC9E,OAAO,KAAK,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAExD,oBAAY,YAAY,GAAG;IACzB,IAAI,EAAE,MAAM,CAAC;CACd,GAAG,oBAAoB,CAAC;AAEzB,oBAAY,qBAAqB,GAAG;IAClC,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IACxB,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB,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":"aptosGetAddress.d.ts","sourceRoot":"","sources":["../../../src/types/api/aptosGetAddress.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,IAAI,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAC9E,OAAO,KAAK,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAExD,oBAAY,YAAY,GAAG;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,GAAG,oBAAoB,CAAC;AAEzB,oBAAY,qBAAqB,GAAG;IAClC,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IACxB,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB,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"}

package/dist/utils/deviceFeaturesUtils.d.ts

@@ -12,4 +12,5 @@ export declare const getDeviceBLEFirmwareVersion: (features: Features) => IVersi
 export declare const supportInputPinOnSoftware: (features: Features) => SupportFeatureType;
 export declare const supportNewPassphrase: (features?: import("packages/hd-transport/dist").Features | undefined) => SupportFeatureType;
 export declare const getPassphraseState: (features: Features, commands: DeviceCommands) => Promise<string | false>;
+export declare const supportBatchPublicKey: (features?: import("packages/hd-transport/dist").Features | undefined) => boolean;
 //# sourceMappingURL=deviceFeaturesUtils.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"deviceFeaturesUtils.d.ts","sourceRoot":"","sources":["../../src/utils/deviceFeaturesUtils.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAC1D,OAAO,KAAK,EACV,QAAQ,EACR,aAAa,EACb,WAAW,EACX,YAAY,EACZ,kBAAkB,EACnB,MAAM,UAAU,CAAC;AAElB,eAAO,MAAM,cAAc,4EAA0B,YAUpD,CAAC;AAEF,eAAO,MAAM,aAAa,4EAA0B,WAUnD,CAAC;AAEF,eAAO,MAAM,yBAAyB,4EAA0B,WACvC,CAAC;AAE1B,eAAO,MAAM,sBAAsB,iCAAoB,WAAW,GAAG,IAKpE,CAAC;AAEF,eAAO,MAAM,uBAAuB,qCAAwB,WAQ3D,CAAC;AAEF,eAAO,MAAM,aAAa,aAAc,QAAQ,WAM/C,CAAC;AAEF,eAAO,MAAM,cAAc,aAAc,QAAQ,WAOhD,CAAC;AAKF,eAAO,MAAM,wBAAwB,aAAc,QAAQ,GAAG,SAAS,kBAOtE,CAAC;AAKF,eAAO,MAAM,2BAA2B,aAAc,QAAQ,KAAG,aAAa,GAAG,IAQhF,CAAC;AAEF,eAAO,MAAM,yBAAyB,aAAc,QAAQ,KAAG,kBAU9D,CAAC;AAEF,eAAO,MAAM,oBAAoB,4EAA0B,kBAW1D,CAAC;AAEF,eAAO,MAAM,kBAAkB,aAAoB,QAAQ,YAAY,cAAc,4BAUpF,CAAC"}
+{"version":3,"file":"deviceFeaturesUtils.d.ts","sourceRoot":"","sources":["../../src/utils/deviceFeaturesUtils.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAC1D,OAAO,KAAK,EACV,QAAQ,EACR,aAAa,EACb,WAAW,EACX,YAAY,EACZ,kBAAkB,EACnB,MAAM,UAAU,CAAC;AAElB,eAAO,MAAM,cAAc,4EAA0B,YAUpD,CAAC;AAEF,eAAO,MAAM,aAAa,4EAA0B,WAUnD,CAAC;AAEF,eAAO,MAAM,yBAAyB,4EAA0B,WACvC,CAAC;AAE1B,eAAO,MAAM,sBAAsB,iCAAoB,WAAW,GAAG,IAKpE,CAAC;AAEF,eAAO,MAAM,uBAAuB,qCAAwB,WAQ3D,CAAC;AAEF,eAAO,MAAM,aAAa,aAAc,QAAQ,WAM/C,CAAC;AAEF,eAAO,MAAM,cAAc,aAAc,QAAQ,WAOhD,CAAC;AAKF,eAAO,MAAM,wBAAwB,aAAc,QAAQ,GAAG,SAAS,kBAOtE,CAAC;AAKF,eAAO,MAAM,2BAA2B,aAAc,QAAQ,KAAG,aAAa,GAAG,IAQhF,CAAC;AAEF,eAAO,MAAM,yBAAyB,aAAc,QAAQ,KAAG,kBAU9D,CAAC;AAEF,eAAO,MAAM,oBAAoB,4EAA0B,kBAW1D,CAAC;AAEF,eAAO,MAAM,kBAAkB,aAAoB,QAAQ,YAAY,cAAc,4BAUpF,CAAC;AAEF,eAAO,MAAM,qBAAqB,4EAA0B,OAY3D,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-core",
-  "version": "0.1.52",
+  "version": "0.1.53",
   "description": "> TODO: description",
   "author": "OneKey",
   "homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
@@ -24,11 +24,12 @@
     "url": "https://github.com/OneKeyHQ/hardware-js-sdk/issues"
   },
   "dependencies": {
-    "@onekeyfe/hd-shared": "^0.1.52",
-    "@onekeyfe/hd-transport": "^0.1.52",
+    "@onekeyfe/hd-shared": "^0.1.53",
+    "@onekeyfe/hd-transport": "^0.1.53",
     "axios": "^0.27.2",
     "bignumber.js": "^9.0.2",
     "js-sha256": "^0.9.0",
+    "js-sha3": "^0.8.0",
     "parse-uri": "^1.0.7",
     "semver": "^7.3.7"
   },
@@ -36,5 +37,5 @@
     "@types/parse-uri": "^1.0.0",
     "@types/semver": "^7.3.9"
   },
-  "gitHead": "7a53d20af1efe25b5f94c1204bb1679cfeb16666"
+  "gitHead": "33a915c10a4f664e60f0eacc6b75bfc913b0e8e3"
 }

package/src/api/aptos/AptosGetAddress.ts

@@ -4,7 +4,10 @@ import { serializedPath, validatePath } from '../helpers/pathUtils';
 import { BaseMethod } from '../BaseMethod';
 import { validateParams } from '../helpers/paramsValidator';
 import { AptosAddress, AptosGetAddressParams } from '../../types';
-
+import { supportBatchPublicKey } from '../../utils/deviceFeaturesUtils';
+import sha3 from "js-sha3";
+import { hexToBytes } from '../helpers/hexUtils';
+const { sha3_256: sha3Hash } = sha3;
 export default class AptosGetAddress extends BaseMethod<HardwareAptosGetAddress[]> {
   hasBundle = false;
 
@@ -37,9 +40,30 @@ export default class AptosGetAddress extends BaseMethod<HardwareAptosGetAddress[
     });
   }
 
+  publicKeyToAddress(publicKey: string) {
+    const hash = sha3Hash.create();
+    hash.update(hexToBytes(publicKey));
+    hash.update("\x00");
+    return hash.hex();
+  }
+
   async run() {
-    const responses: AptosAddress[] = [];
+    if (this.hasBundle && supportBatchPublicKey(this.device?.features)) {
+      // @ts-expect-error
+      const res = await this.device.commands.typedCall('BatchGetPublickeys', 'EcdsaPublicKeys', {
+        paths: this.params,
+        ecdsa_curve_name: 'ed25519',
+      });
+      // @ts-expect-error
+      const result =  res.message.public_keys.map((publicKey: string, index: number) => ({
+        path: serializedPath((this.params as unknown as any[])[index].address_n),
+        publicKey,
+        address: this.publicKeyToAddress(publicKey),
+      }));
+      return Promise.resolve(result);
+    }
 
+    const responses: AptosAddress[] = [];
     for (let i = 0; i < this.params.length; i++) {
       const param = this.params[i];
 

package/src/api/helpers/hexUtils.ts

@@ -47,3 +47,36 @@ export const formatAnyHex: (value: any) => any = value => {
 
   return value;
 };
+
+const hexes = Array.from({ length: 256 }, (v, i) => i.toString(16).padStart(2, '0'));
+/**
+ * @example bytesToHex(Uint8Array.from([0xde, 0xad, 0xbe, 0xef]))
+ */
+export function bytesToHex(uint8a: Uint8Array): string {
+  // pre-caching improves the speed 6x
+  if (!(uint8a instanceof Uint8Array)) throw new Error('Uint8Array expected');
+  let hex = '';
+  for (let i = 0; i < uint8a.length; i++) {
+    hex += hexes[uint8a[i]];
+  }
+  return hex;
+}
+
+/**
+ * @example hexToBytes('deadbeef')
+ */
+export function hexToBytes(hex: string): Uint8Array {
+  if (typeof hex !== 'string') {
+    throw new TypeError(`hexToBytes: expected string, got ${typeof hex}`);
+  }
+  if (hex.length % 2) throw new Error('hexToBytes: received invalid unpadded hex');
+  const array = new Uint8Array(hex.length / 2);
+  for (let i = 0; i < array.length; i++) {
+    const j = i * 2;
+    const hexByte = hex.slice(j, j + 2);
+    const byte = Number.parseInt(hexByte, 16);
+    if (Number.isNaN(byte) || byte < 0) throw new Error('Invalid byte sequence');
+    array[i] = byte;
+  }
+  return array;
+}

package/src/types/api/aptosGetAddress.ts

@@ -3,6 +3,7 @@ import type { CommonParams, Response } from '../params';
 
 export type AptosAddress = {
   path: string;
+  publicKey?: string;
 } & HardwareAptosAddress;
 
 export type AptosGetAddressParams = {

package/src/utils/deviceFeaturesUtils.ts

@@ -131,3 +131,17 @@ export const getPassphraseState = async (features: Features, commands: DeviceCom
 
   return message.address;
 };
+
+export const supportBatchPublicKey = (features?: Features): boolean => {
+  if (!features) return false;
+
+  // TODO: support batch public key for touch
+  // const deviceType = getDeviceType(features);
+  // if (deviceType === 'touch' || deviceType === 'pro') {
+  //   return true;
+  // }
+
+  const currentVersion = getDeviceFirmwareVersion(features).join('.');
+
+  return semver.gte(currentVersion, '2.6.0');
+};