@onekeyfe/hd-core 0.2.45 → 0.2.48

package/dist/api/firmware/uploadFirmware.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"uploadFirmware.d.ts","sourceRoot":"","sources":["../../../src/api/firmware/uploadFirmware.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAEjD,OAAO,EAAU,WAAW,EAA+B,MAAM,cAAc,CAAC;AAChF,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AACxC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,KAAK,EAAE,SAAS,EAAwB,MAAM,6BAA6B,CAAC;AAuCnF,eAAO,MAAM,cAAc,eAAsB,MAAM,kBAKtD,CAAC;AAEF,eAAO,MAAM,cAAc,eACb,UAAU,GAAG,KAAK,aACnB,SAAS,yBACG,WAAW,KAAK,IAAI,UACnC,MAAM,eACD,MAAM,cAAc,qBAgDlC,CAAC;AAmCF,eAAO,MAAM,cAAc,cAAqB,SAAS,YAAY,MAAM,QAAQ,WAAW,qBAY7F,CAAC;AAEF,eAAO,MAAM,eAAe,cACf,SAAS,yBACG,WAAW,KAAK,IAAI,UACnC,MAAM,UACN,WAAW,qBAwBpB,CAAC;AAEF,eAAO,MAAM,gBAAgB,cAChB,SAAS,yBACG,WAAW,KAAK,IAAI,UACnC,MAAM,UACN,WAAW,qBAQpB,CAAC"}
+{"version":3,"file":"uploadFirmware.d.ts","sourceRoot":"","sources":["../../../src/api/firmware/uploadFirmware.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAEjD,OAAO,EAAU,WAAW,EAA+B,MAAM,cAAc,CAAC;AAChF,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AACxC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,KAAK,EAAE,SAAS,EAAwB,MAAM,6BAA6B,CAAC;AAwCnF,eAAO,MAAM,cAAc,eAAsB,MAAM,kBAKtD,CAAC;AAEF,eAAO,MAAM,cAAc,eACb,UAAU,GAAG,KAAK,aACnB,SAAS,yBACG,WAAW,KAAK,IAAI,UACnC,MAAM,eACD,MAAM,cAAc,qBAiDlC,CAAC;AAmCF,eAAO,MAAM,cAAc,cAAqB,SAAS,YAAY,MAAM,QAAQ,WAAW,qBAY7F,CAAC;AAEF,eAAO,MAAM,eAAe,cACf,SAAS,yBACG,WAAW,KAAK,IAAI,UACnC,MAAM,UACN,WAAW,qBAwBpB,CAAC;AAEF,eAAO,MAAM,gBAAgB,cAChB,SAAS,yBACG,WAAW,KAAK,IAAI,UACnC,MAAM,UACN,WAAW,qBAQpB,CAAC"}

package/dist/api/sui/SuiGetAddress.d.ts

@@ -5,7 +5,6 @@ export default class SuiGetAddress extends BaseMethod<HardwareSuiGetAddress[]> {
     hasBundle: boolean;
     shouldConfirm: boolean;
     init(): void;
-    publicKeyToAddress(publicKey: string): string;
     getVersionRange(): {
         model_mini: {
             min: string;

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

@@ -1 +1 @@
-{"version":3,"file":"SuiGetAddress.d.ts","sourceRoot":"","sources":["../../../src/api/sui/SuiGetAddress.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,IAAI,qBAAqB,EAAE,MAAM,wBAAwB,CAAC;AAMhF,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAE3C,OAAO,EAAE,UAAU,EAAuB,MAAM,aAAa,CAAC;AAI9D,MAAM,CAAC,OAAO,OAAO,aAAc,SAAQ,UAAU,CAAC,qBAAqB,EAAE,CAAC;IAC5E,SAAS,UAAS;IAElB,aAAa,UAAS;IAEtB,IAAI;IAiCJ,kBAAkB,CAAC,SAAS,EAAE,MAAM;IASpC,eAAe;;;;;;;;IAWT,GAAG;CAkCV"}
+{"version":3,"file":"SuiGetAddress.d.ts","sourceRoot":"","sources":["../../../src/api/sui/SuiGetAddress.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,IAAI,qBAAqB,EAAE,MAAM,wBAAwB,CAAC;AAIhF,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAE3C,OAAO,EAAE,UAAU,EAAuB,MAAM,aAAa,CAAC;AAI9D,MAAM,CAAC,OAAO,OAAO,aAAc,SAAQ,UAAU,CAAC,qBAAqB,EAAE,CAAC;IAC5E,SAAS,UAAS;IAElB,aAAa,UAAS;IAEtB,IAAI;IAiCJ,eAAe;;;;;;;;IAWT,GAAG;CAkCV"}

package/dist/api/sui/normalize.d.ts

@@ -0,0 +1,9 @@
+export declare const SUI_ADDRESS_LENGTH = 32;
+export declare const PUBLIC_KEY_SIZE = 32;
+export declare const SIGNATURE_SCHEME_TO_FLAG: {
+    ED25519: number;
+    Secp256k1: number;
+};
+export declare function normalizeSuiAddress(value: string, forceAdd0x?: boolean): string;
+export declare function publicKeyToAddress(publicKey: string): string;
+//# sourceMappingURL=normalize.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"normalize.d.ts","sourceRoot":"","sources":["../../../src/api/sui/normalize.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,kBAAkB,KAAK,CAAC;AACrC,eAAO,MAAM,eAAe,KAAK,CAAC;AAElC,eAAO,MAAM,wBAAwB;;;CAGpC,CAAC;AAEF,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,MAAM,EAAE,UAAU,UAAQ,GAAG,MAAM,CAM7E;AAED,wBAAgB,kBAAkB,CAAC,SAAS,EAAE,MAAM,UAQnD"}

package/dist/index.js

@@ -14,6 +14,7 @@ var sha256 = require('@noble/hashes/sha256');
 var JSZip = require('jszip');
 var sha3 = require('@noble/hashes/sha3');
 var rippleKeypairs = require('ripple-keypairs');
+var blake2b = require('@noble/hashes/blake2b');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -13409,8 +13410,8 @@ const waitBleInstall = (updateType) => __awaiter(void 0, void 0, void 0, functio
     }
 });
 const uploadFirmware = (updateType, typedCall, postMessage, device, { payload }) => __awaiter(void 0, void 0, void 0, function* () {
-    var _a, _b;
-    if (((_a = device.features) === null || _a === void 0 ? void 0 : _a.major_version) === 1) {
+    const deviceModel = getDeviceModel(device.features);
+    if (deviceModel === 'model_mini') {
         postConfirmationMessage(device);
         postProgressTip(device, 'ConfirmOnDevice', postMessage);
         const eraseCommand = updateType === 'firmware' ? 'FirmwareErase' : 'FirmwareErase_ex';
@@ -13424,7 +13425,7 @@ const uploadFirmware = (updateType, typedCall, postMessage, device, { payload })
         yield waitBleInstall(updateType);
         return message;
     }
-    if (((_b = device.features) === null || _b === void 0 ? void 0 : _b.major_version) === 2) {
+    if (deviceModel === 'model_touch') {
         postConfirmationMessage(device);
         postProgressTip(device, 'ConfirmOnDevice', postMessage);
         const length = payload.byteLength;
@@ -13445,7 +13446,7 @@ const uploadFirmware = (updateType, typedCall, postMessage, device, { payload })
         yield waitBleInstall(updateType);
         return response.message;
     }
-    throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, 'uploadFirmware: unknown major_version');
+    throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, 'uploadFirmware: unknown device model');
 });
 const processResourceRequest = (typedCall, res, data) => __awaiter(void 0, void 0, void 0, function* () {
     if (res.type === 'Success') {
@@ -17100,6 +17101,26 @@ class XrpGetAddress extends BaseMethod {
     }
 }
 
+const SUI_ADDRESS_LENGTH = 32;
+const PUBLIC_KEY_SIZE = 32;
+const SIGNATURE_SCHEME_TO_FLAG = {
+    ED25519: 0x00,
+    Secp256k1: 0x01,
+};
+function normalizeSuiAddress(value, forceAdd0x = false) {
+    let address = value.toLowerCase();
+    if (!forceAdd0x && address.startsWith('0x')) {
+        address = address.slice(2);
+    }
+    return `0x${address.padStart(SUI_ADDRESS_LENGTH * 2, '0')}`.toLowerCase();
+}
+function publicKeyToAddress(publicKey) {
+    const tmp = new Uint8Array(PUBLIC_KEY_SIZE + 1);
+    tmp.set([SIGNATURE_SCHEME_TO_FLAG.ED25519]);
+    tmp.set(utils.hexToBytes(publicKey), 1);
+    return normalizeSuiAddress(utils.bytesToHex(blake2b.blake2b(tmp, { dkLen: 32 })).slice(0, SUI_ADDRESS_LENGTH * 2));
+}
+
 class SuiGetAddress extends BaseMethod {
     constructor() {
         super(...arguments);
@@ -17131,19 +17152,13 @@ class SuiGetAddress extends BaseMethod {
             });
         });
     }
-    publicKeyToAddress(publicKey) {
-        const hash = sha3.sha3_256.create();
-        hash.update('\x00');
-        hash.update(hexToBytes(publicKey));
-        return `0x${utils.bytesToHex(hash.digest().slice(0, 20))}`;
-    }
     getVersionRange() {
         return {
             model_mini: {
-                min: '2.9.0',
+                min: '3.0.0',
             },
             model_touch: {
-                min: '3.5.0',
+                min: '4.3.0',
             },
         };
     }
@@ -17158,7 +17173,7 @@ class SuiGetAddress extends BaseMethod {
                 const result = res.message.public_keys.map((publicKey, index) => ({
                     path: serializedPath(this.params[index].address_n),
                     publicKey,
-                    address: this.publicKeyToAddress(publicKey),
+                    address: publicKeyToAddress(publicKey),
                 }));
                 return Promise.resolve(result);
             }
@@ -17209,10 +17224,10 @@ class SuiGetPublicKey extends BaseMethod {
     getVersionRange() {
         return {
             model_mini: {
-                min: '2.9.0',
+                min: '3.0.0',
             },
             model_touch: {
-                min: '3.5.0',
+                min: '4.3.0',
             },
         };
     }
@@ -17249,10 +17264,10 @@ class SuiSignTransaction extends BaseMethod {
     getVersionRange() {
         return {
             model_mini: {
-                min: '2.9.0',
+                min: '3.0.0',
             },
             model_touch: {
-                min: '3.5.0',
+                min: '4.3.0',
             },
         };
     }
@@ -18290,10 +18305,10 @@ class PolkadotGetAddress extends BaseMethod {
     getVersionRange() {
         return {
             model_mini: {
-                min: '2.11.0',
+                min: '3.0.0',
             },
             model_touch: {
-                min: '4.2.0',
+                min: '4.3.0',
             },
         };
     }
@@ -18344,10 +18359,10 @@ class PolkadotSignTransaction extends BaseMethod {
     getVersionRange() {
         return {
             model_mini: {
-                min: '2.11.0',
+                min: '3.0.0',
             },
             model_touch: {
-                min: '4.2.0',
+                min: '4.3.0',
             },
         };
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-core",
-  "version": "0.2.45",
+  "version": "0.2.48",
   "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.45",
-    "@onekeyfe/hd-transport": "^0.2.45",
+    "@onekeyfe/hd-shared": "^0.2.48",
+    "@onekeyfe/hd-transport": "^0.2.48",
     "axios": "^0.27.2",
     "bignumber.js": "^9.0.2",
     "bytebuffer": "^5.0.1",
@@ -43,5 +43,5 @@
     "@types/semver": "^7.3.9",
     "ripple-keypairs": "^1.1.4"
   },
-  "gitHead": "d37564501697fb03f6388ec699ad884c8d5dd96a"
+  "gitHead": "dd25a5d278b46fd4da7f0833fdd8a1f5b18dedff"
 }

package/src/api/firmware/uploadFirmware.ts

@@ -9,6 +9,7 @@ import type { Device } from '../../device/Device';
 import type { TypedCall, TypedResponseMessage } from '../../device/DeviceCommands';
 import { KnownDevice } from '../../types';
 import { bytesToHex } from '../helpers/hexUtils';
+import { getDeviceModel } from '../../utils/deviceFeaturesUtils';
 
 const postConfirmationMessage = (device: Device) => {
   // only if firmware is already installed. fresh device does not require button confirmation
@@ -59,7 +60,8 @@ export const uploadFirmware = async (
   device: Device,
   { payload }: PROTO.FirmwareUpload
 ) => {
-  if (device.features?.major_version === 1) {
+  const deviceModel = getDeviceModel(device.features);
+  if (deviceModel === 'model_mini') {
     postConfirmationMessage(device);
     postProgressTip(device, 'ConfirmOnDevice', postMessage);
     const eraseCommand = updateType === 'firmware' ? 'FirmwareErase' : 'FirmwareErase_ex';
@@ -75,7 +77,7 @@ export const uploadFirmware = async (
     return message;
   }
 
-  if (device.features?.major_version === 2) {
+  if (deviceModel === 'model_touch') {
     postConfirmationMessage(device);
     postProgressTip(device, 'ConfirmOnDevice', postMessage);
     const length = payload.byteLength;
@@ -104,7 +106,7 @@ export const uploadFirmware = async (
     return response.message;
   }
 
-  throw ERRORS.TypedError(HardwareErrorCode.RuntimeError, 'uploadFirmware: unknown major_version');
+  throw ERRORS.TypedError(HardwareErrorCode.RuntimeError, 'uploadFirmware: unknown device model');
 };
 
 const processResourceRequest = async (

package/src/api/polkadot/PolkadotGetAddress.ts

@@ -45,10 +45,10 @@ export default class PolkadotGetAddress extends BaseMethod<HardwarePolkadotGetAd
   getVersionRange() {
     return {
       model_mini: {
-        min: '2.11.0',
+        min: '3.0.0',
       },
       model_touch: {
-        min: '4.2.0',
+        min: '4.3.0',
       },
     };
   }

package/src/api/polkadot/PolkadotSignTransaction.ts

@@ -33,10 +33,10 @@ export default class PolkadotSignTransaction extends BaseMethod<HardwarePolkadot
   getVersionRange() {
     return {
       model_mini: {
-        min: '2.11.0',
+        min: '3.0.0',
       },
       model_touch: {
-        min: '4.2.0',
+        min: '4.3.0',
       },
     };
   }

package/src/api/sui/SuiGetAddress.ts

@@ -1,14 +1,12 @@
 import { SuiGetAddress as HardwareSuiGetAddress } from '@onekeyfe/hd-transport';
 
-import { sha3_256 } from '@noble/hashes/sha3';
-import { bytesToHex } from '@noble/hashes/utils';
 import { UI_REQUEST } from '../../constants/ui-request';
 import { serializedPath, validatePath } from '../helpers/pathUtils';
 import { BaseMethod } from '../BaseMethod';
 import { validateParams } from '../helpers/paramsValidator';
 import { SuiAddress, SuiGetAddressParams } from '../../types';
 import { supportBatchPublicKey } from '../../utils/deviceFeaturesUtils';
-import { hexToBytes } from '../helpers/hexUtils';
+import { publicKeyToAddress } from './normalize';
 
 export default class SuiGetAddress extends BaseMethod<HardwareSuiGetAddress[]> {
   hasBundle = false;
@@ -48,22 +46,13 @@ export default class SuiGetAddress extends BaseMethod<HardwareSuiGetAddress[]> {
     });
   }
 
-  publicKeyToAddress(publicKey: string) {
-    const hash = sha3_256.create();
-    // Ed25519
-    hash.update('\x00');
-    // hash.update('\x01'); Secp256k1
-    hash.update(hexToBytes(publicKey));
-    return `0x${bytesToHex(hash.digest().slice(0, 20))}`;
-  }
-
   getVersionRange() {
     return {
       model_mini: {
-        min: '2.9.0',
+        min: '3.0.0',
       },
       model_touch: {
-        min: '3.5.0',
+        min: '4.3.0',
       },
     };
   }
@@ -77,7 +66,7 @@ export default class SuiGetAddress extends BaseMethod<HardwareSuiGetAddress[]> {
       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),
+        address: publicKeyToAddress(publicKey),
       }));
       return Promise.resolve(result);
     }

package/src/api/sui/SuiGetPublicKey.ts

@@ -39,10 +39,10 @@ export default class SuiGetPublicKey extends BaseMethod<any> {
   getVersionRange() {
     return {
       model_mini: {
-        min: '2.9.0',
+        min: '3.0.0',
       },
       model_touch: {
-        min: '3.5.0',
+        min: '4.3.0',
       },
     };
   }

package/src/api/sui/SuiSignTransaction.ts

@@ -30,10 +30,10 @@ export default class SuiSignTransaction extends BaseMethod<HardwareSuiSignTx> {
   getVersionRange() {
     return {
       model_mini: {
-        min: '2.9.0',
+        min: '3.0.0',
       },
       model_touch: {
-        min: '3.5.0',
+        min: '4.3.0',
       },
     };
   }

package/src/api/sui/normalize.ts

@@ -0,0 +1,28 @@
+import { bytesToHex, hexToBytes } from '@noble/hashes/utils';
+import { blake2b } from '@noble/hashes/blake2b';
+
+export const SUI_ADDRESS_LENGTH = 32;
+export const PUBLIC_KEY_SIZE = 32;
+
+export const SIGNATURE_SCHEME_TO_FLAG = {
+  ED25519: 0x00,
+  Secp256k1: 0x01,
+};
+
+export function normalizeSuiAddress(value: string, forceAdd0x = false): string {
+  let address = value.toLowerCase();
+  if (!forceAdd0x && address.startsWith('0x')) {
+    address = address.slice(2);
+  }
+  return `0x${address.padStart(SUI_ADDRESS_LENGTH * 2, '0')}`.toLowerCase();
+}
+
+export function publicKeyToAddress(publicKey: string) {
+  const tmp = new Uint8Array(PUBLIC_KEY_SIZE + 1);
+  tmp.set([SIGNATURE_SCHEME_TO_FLAG.ED25519]);
+  tmp.set(hexToBytes(publicKey), 1);
+
+  return normalizeSuiAddress(
+    bytesToHex(blake2b(tmp, { dkLen: 32 })).slice(0, SUI_ADDRESS_LENGTH * 2)
+  );
+}