@onekeyfe/hd-core 1.1.19-alpha.1 → 1.1.19-alpha.3

package/dist/index.js

@@ -14,7 +14,6 @@ var blake2s = require('@noble/hashes/blake2s');
 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');
 var buffer = require('buffer');
 
@@ -11099,6 +11098,10 @@ var nested$1 = {
 				rule: "required",
 				type: "string",
 				id: 3
+			},
+			prefix: {
+				type: "uint32",
+				id: 4
 			}
 		}
 	},
@@ -26749,7 +26752,12 @@ class DeviceCommands {
                 const promise = this.transport.call(this.mainId, type, msg);
                 this.callPromise = promise;
                 const res = yield promise;
-                LogCore.debug('[DeviceCommands] [call] Received', res.type);
+                if (res.type === 'Failure') {
+                    LogCore.debug('[DeviceCommands] [call] Received', res.type, res.message);
+                }
+                else {
+                    LogCore.debug('[DeviceCommands] [call] Received', res.type);
+                }
                 return res;
             }
             catch (error) {
@@ -26885,12 +26893,15 @@ class DeviceCommands {
                     (message === null || message === void 0 ? void 0 : message.includes('verify failed'))) {
                     error = hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.FirmwareVerificationFailed, message);
                 }
+                else if (message === null || message === void 0 ? void 0 : message.includes('Firmware downgrade not allowed')) {
+                    error = hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.FirmwareDowngradeNotAllowed, message);
+                }
             }
             if (code === 'Failure_UnexpectedMessage') {
                 if (callType === 'PassphraseAck') {
                     error = hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.UnexpectPassphrase);
                 }
-                if (message === 'Not in Signing mode') {
+                else if (message === 'Not in Signing mode') {
                     error = hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.NotInSigningMode);
                 }
             }
@@ -28905,33 +28916,48 @@ const waitBleInstall = (updateType) => __awaiter(void 0, void 0, void 0, functio
         yield wait(10 * 1000);
     }
 });
-const uploadFirmware = (updateType, typedCall, postMessage, device, { payload, rebootOnSuccess, }) => __awaiter(void 0, void 0, void 0, function* () {
+const uploadFirmware = (updateType, typedCall, postMessage, device, { payload, rebootOnSuccess, }, isUpdateBootloader) => __awaiter(void 0, void 0, void 0, function* () {
     var _a, _b;
     const deviceType = getDeviceType(device.features);
     if (DeviceModelToTypes.model_mini.includes(deviceType)) {
         postConfirmationMessage(device);
         postProgressTip(device, 'ConfirmOnDevice', postMessage);
         const isFirmware = updateType === 'firmware';
-        const deviceBootloaderVersion = getDeviceBootloaderVersion(device.features).join('.');
-        const supportUpgradeFileHeader = semver__default["default"].gt(deviceBootloaderVersion, '2.1.0');
-        Log$8.debug('supportUpgradeFileHeader:', supportUpgradeFileHeader, 'deviceBootloaderVersion:', deviceBootloaderVersion);
-        if (isFirmware && supportUpgradeFileHeader) {
-            const HEADER_SIZE = 1024;
-            if (payload.byteLength < HEADER_SIZE) {
-                throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, `firmware payload too small: ${payload.byteLength} bytes, expected at least ${HEADER_SIZE} bytes`);
-            }
-            Log$8.debug('Uploading firmware header:', { size: HEADER_SIZE, totalSize: payload.byteLength });
-            postProgressTip(device, 'UploadingFirmwareHeader', postMessage);
-            const header = new Uint8Array(payload.slice(0, HEADER_SIZE));
-            const headerRes = (yield typedCall('UpgradeFileHeader', 'Success', {
-                data: bytesToHex(header),
-            }));
-            const isUnexpectedMessage = (_b = (_a = headerRes.message) === null || _a === void 0 ? void 0 : _a.message) === null || _b === void 0 ? void 0 : _b.includes('Failure_UnexpectedMessage');
-            if (headerRes.type !== 'Success' && !isUnexpectedMessage) {
-                Log$8.error('Firmware header upload failed:', headerRes);
-                throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, 'failed to upload firmware header');
+        if (isFirmware && !isUpdateBootloader) {
+            const newFeatures = yield typedCall('GetFeatures', 'Features', {});
+            const deviceBootloaderVersion = getDeviceBootloaderVersion(newFeatures.message).join('.');
+            const supportUpgradeFileHeader = semver__default["default"].gte(deviceBootloaderVersion, '2.1.0');
+            Log$8.debug('supportUpgradeFileHeader:', supportUpgradeFileHeader);
+            if (supportUpgradeFileHeader) {
+                const HEADER_SIZE = 1024;
+                if (payload.byteLength < HEADER_SIZE) {
+                    throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, `firmware payload too small: ${payload.byteLength} bytes, expected at least ${HEADER_SIZE} bytes`);
+                }
+                Log$8.debug('Uploading firmware header:', {
+                    size: HEADER_SIZE,
+                    totalSize: payload.byteLength,
+                });
+                postProgressTip(device, 'UploadingFirmwareHeader', postMessage);
+                const header = new Uint8Array(payload.slice(0, HEADER_SIZE));
+                try {
+                    const headerRes = yield typedCall('UpgradeFileHeader', 'Success', {
+                        data: bytesToHex(header),
+                    });
+                    const isUnknownMessage = (_b = (_a = headerRes.message) === null || _a === void 0 ? void 0 : _a.message) === null || _b === void 0 ? void 0 : _b.includes('Failure_UnknownMessage');
+                    if (headerRes.type !== 'Success' && !isUnknownMessage) {
+                        Log$8.error('Firmware header upload failed:', headerRes);
+                        throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, 'failed to upload firmware header');
+                    }
+                }
+                catch (error) {
+                    Log$8.error('Firmware header upload failed:', error);
+                    const message = error instanceof Error ? error.message : String(error !== null && error !== void 0 ? error : '');
+                    if (!message.includes('Failure_UnknownMessage')) {
+                        throw error;
+                    }
+                }
+                Log$8.debug('Firmware header uploaded successfully');
             }
-            Log$8.debug('Firmware header uploaded successfully, isUnexpectedMessage:', isUnexpectedMessage);
         }
         const eraseCommand = isFirmware ? 'FirmwareErase' : 'FirmwareErase_ex';
         const eraseRes = yield typedCall(eraseCommand, 'Success', {});
@@ -28940,15 +28966,30 @@ const uploadFirmware = (updateType, typedCall, postMessage, device, { payload, r
         }
         postProgressTip(device, 'FirmwareEraseSuccess', postMessage);
         postProgressMessage(device, 0, 'installingFirmware', postMessage);
-        const { message, type } = yield typedCall('FirmwareUpload', 'Success', {
-            payload,
-        });
+        let updateResponse;
+        try {
+            updateResponse = yield typedCall('FirmwareUpload', 'Success', {
+                payload,
+            });
+        }
+        catch (error) {
+            if (isDeviceDisconnectedError$1(error)) {
+                Log$8.log('Rebooting device');
+                updateResponse = {
+                    type: 'Success',
+                    message: { message: FIRMWARE_UPDATE_CONFIRM$1 },
+                };
+            }
+            else {
+                throw error;
+            }
+        }
         postProgressMessage(device, 100, 'installingFirmware', postMessage);
         yield waitBleInstall(updateType);
-        if (type !== 'Success') {
+        if (updateResponse.type !== 'Success') {
             throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, 'install firmware error');
         }
-        return message;
+        return updateResponse.message;
     }
     if (DeviceModelToTypes.model_touch.includes(deviceType)) {
         if (device.features) {
@@ -29431,9 +29472,9 @@ class FirmwareUpdateBaseMethod extends BaseMethod {
     startEmmcFirmwareUpdate({ path }) {
         return __awaiter(this, void 0, void 0, function* () {
             const typedCall = this.device.getCommands().typedCall.bind(this.device.getCommands());
-            let updaeteResponse;
+            let updateResponse;
             try {
-                updaeteResponse = yield typedCall('FirmwareUpdateEmmc', 'Success', {
+                updateResponse = yield typedCall('FirmwareUpdateEmmc', 'Success', {
                     path,
                     reboot_on_success: true,
                 });
@@ -29441,7 +29482,7 @@ class FirmwareUpdateBaseMethod extends BaseMethod {
             catch (error) {
                 if (isDeviceDisconnectedError(error)) {
                     Log$7.log('Rebooting device');
-                    updaeteResponse = {
+                    updateResponse = {
                         type: 'Success',
                         message: { message: FIRMWARE_UPDATE_CONFIRM },
                     };
@@ -29450,7 +29491,7 @@ class FirmwareUpdateBaseMethod extends BaseMethod {
                     throw error;
                 }
             }
-            if (updaeteResponse.type !== 'Success') {
+            if (updateResponse.type !== 'Success') {
                 throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.FirmwareError, 'firmware update error');
             }
             this.postTipMessage(exports.FirmwareUpdateTipMessage.FirmwareUpdating);
@@ -29842,7 +29883,7 @@ class FirmwareUpdate extends BaseMethod {
                 throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.FirmwareUpdateDownloadFailed, (_b = err.message) !== null && _b !== void 0 ? _b : err);
             }
             yield this.device.acquire();
-            const response = yield uploadFirmware(params.updateType, this.device.getCommands().typedCall.bind(this.device.getCommands()), this.postMessage, device, { payload: binary, rebootOnSuccess: this.payload.rebootOnSuccess });
+            const response = yield uploadFirmware(params.updateType, this.device.getCommands().typedCall.bind(this.device.getCommands()), this.postMessage, device, { payload: binary, rebootOnSuccess: this.payload.rebootOnSuccess }, false);
             if (this.connectId) {
                 DevicePool.clearDeviceCache(this.connectId);
             }
@@ -30114,7 +30155,7 @@ class FirmwareUpdateV2 extends BaseMethod {
             }
             (_j = (_h = this.device) === null || _h === void 0 ? void 0 : _h.commands) === null || _j === void 0 ? void 0 : _j.checkDisposed();
             yield this.device.acquire();
-            const response = yield uploadFirmware(params.updateType, this.device.getCommands().typedCall.bind(this.device.getCommands()), this.postMessage, device, { payload: binary, rebootOnSuccess: true });
+            const response = yield uploadFirmware(params.updateType, this.device.getCommands().typedCall.bind(this.device.getCommands()), this.postMessage, device, { payload: binary, rebootOnSuccess: true }, params.isUpdateBootloader);
             if (this.connectId) {
                 DevicePool.clearDeviceCache(this.connectId);
             }
@@ -34447,6 +34488,9 @@ class TronSignMessage extends BaseMethod {
             pro: {
                 min: '4.16.0',
             },
+            touch: {
+                min: '4.12.0',
+            },
             classic1s: {
                 min: '3.13.0',
             },
@@ -34593,6 +34637,9 @@ class TronSignTransaction extends BaseMethod {
             pro: {
                 min: '4.13.0',
             },
+            touch: {
+                min: '4.12.0',
+            },
             model_classic1s: {
                 min: '3.12.0',
             },
@@ -34608,6 +34655,12 @@ class TronSignTransaction extends BaseMethod {
             pro: {
                 min: '4.15.0',
             },
+            touch: {
+                min: '4.12.0',
+            },
+            model_classic1s: {
+                min: '3.13.0',
+            },
         };
     }
     checkSupportDelegateContractLockPeriod() {
@@ -35302,21 +35355,8 @@ class XrpGetAddress$1 extends BaseMethod {
         };
     }
     run() {
-        var _a, _b, _c, _d, _e;
+        var _a, _b, _c, _d;
         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.public_keys.map((publicKey, index) => ({
-                    path: serializedPath(this.params[index].address_n),
-                    address: rippleKeypairs.deriveAddress(publicKey),
-                    publicKey,
-                    pub: publicKey,
-                }));
-                validateResult(result, ['address', 'publicKey'], {
-                    expectedLength: this.params.length,
-                });
-                return Promise.resolve(result);
-            }
             const responses = [];
             for (let i = 0; i < this.params.length; i++) {
                 const param = this.params[i];
@@ -35330,8 +35370,8 @@ class XrpGetAddress$1 extends BaseMethod {
                 responses.push({
                     path,
                     address,
-                    publicKey: (_c = (_b = publicKey.message) === null || _b === void 0 ? void 0 : _b.public_keys) === null || _c === void 0 ? void 0 : _c[0],
-                    pub: (_e = (_d = publicKey.message) === null || _d === void 0 ? void 0 : _d.public_keys) === null || _e === void 0 ? void 0 : _e[0],
+                    publicKey: (_b = (_a = publicKey.message) === null || _a === void 0 ? void 0 : _a.public_keys) === null || _b === void 0 ? void 0 : _b[0],
+                    pub: (_d = (_c = publicKey.message) === null || _c === void 0 ? void 0 : _c.public_keys) === null || _d === void 0 ? void 0 : _d[0],
                 });
                 this.postPreviousAddressMessage({
                     path,
@@ -36814,6 +36854,11 @@ var Networks;
     Networks["Astar"] = "astar";
     Networks["JoyStream"] = "joystream";
     Networks["Manta"] = "manta";
+    Networks["Hydration"] = "hydration";
+    Networks["Bifrost"] = "bifrost";
+    Networks["BifrostKusama"] = "bifrost-ksm";
+    Networks["PolkadotAssetHub"] = "polkadot-assethub";
+    Networks["KusamaAssetHub"] = "kusama-assethub";
 })(Networks || (Networks = {}));
 const baseVersionRange = {
     model_mini: {
@@ -36854,6 +36899,16 @@ function getPolkadotVersionRangeWithBundle(networks) {
     }
     return baseVersionRange;
 }
+function parseNetwork(network) {
+    switch (network) {
+        case Networks.PolkadotAssetHub:
+            return Networks.Polkadot;
+        case Networks.KusamaAssetHub:
+            return Networks.Kusama;
+        default:
+            return network;
+    }
+}
 
 class PolkadotGetAddress extends BaseMethod {
     constructor() {
@@ -36882,7 +36937,7 @@ class PolkadotGetAddress extends BaseMethod {
             this.params.push({
                 address_n: addressN,
                 prefix,
-                network,
+                network: parseNetwork(network),
                 show_display: showOnOneKey,
             });
         });
@@ -36929,13 +36984,15 @@ class PolkadotSignTransaction extends BaseMethod {
         validateParams(this.payload, [
             { name: 'path', required: true },
             { name: 'network', required: true },
+            { name: 'prefix' },
             { name: 'rawTx', type: 'hexString', required: true },
         ]);
-        const { path, rawTx, network } = this.payload;
+        const { path, rawTx, network, prefix } = this.payload;
         const addressN = validatePath(path, 3);
         this.params = {
             address_n: addressN,
-            network,
+            network: parseNetwork(network),
+            prefix,
             raw_tx: formatAnyHex(rawTx),
         };
     }
@@ -39854,7 +39911,9 @@ const onCallDevice = (context, message, method) => __awaiter(void 0, void 0, voi
                     pinListeners: device.listenerCount(DEVICE.PIN),
                 });
             }
-            removeDeviceListener(device);
+            else {
+                removeDeviceListener(device);
+            }
         }
     }
 });
@@ -40238,6 +40297,9 @@ const onSelectDeviceInBootloaderForWebDeviceHandler = (...[device, callback]) =>
     callback(null, uiResp.payload.deviceId);
 });
 const postMessage = (message) => {
+    if (!_core) {
+        return;
+    }
     _core.emit(CORE_EVENT, message);
 };
 const createUiPromise = (promiseEvent, device) => {

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

@@ -1,4 +1,4 @@
-import { PolkadotSignedTx as HardwarePolkadotSignedTx } from '@onekeyfe/hd-transport';
+import type { PolkadotSignedTx as HardwarePolkadotSignedTx } from '@onekeyfe/hd-transport';
 import type { CommonParams, Response } from '../params';
 export type PolkadotSignedTx = {
     path: string;
@@ -6,6 +6,7 @@ export type PolkadotSignedTx = {
 export type PolkadotSignTransactionParams = {
     path: string | number[];
     network: string;
+    prefix: number;
     rawTx?: string;
 };
 export declare function polkadotSignTransaction(connectId: string, deviceId: string, params: CommonParams & PolkadotSignTransactionParams): Response<PolkadotSignedTx>;

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

@@ -1 +1 @@
-{"version":3,"file":"polkadotSignTransaction.d.ts","sourceRoot":"","sources":["../../../src/types/api/polkadotSignTransaction.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,IAAI,wBAAwB,EAAE,MAAM,wBAAwB,CAAC;AACtF,OAAO,KAAK,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAExD,MAAM,MAAM,gBAAgB,GAAG;IAC7B,IAAI,EAAE,MAAM,CAAC;CACd,GAAG,wBAAwB,CAAC;AAE7B,MAAM,MAAM,6BAA6B,GAAG;IAC1C,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IACxB,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,MAAM,CAAC,OAAO,UAAU,uBAAuB,CAC7C,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,YAAY,GAAG,6BAA6B,GACnD,QAAQ,CAAC,gBAAgB,CAAC,CAAC"}
+{"version":3,"file":"polkadotSignTransaction.d.ts","sourceRoot":"","sources":["../../../src/types/api/polkadotSignTransaction.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,IAAI,wBAAwB,EAAE,MAAM,wBAAwB,CAAC;AAC3F,OAAO,KAAK,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAExD,MAAM,MAAM,gBAAgB,GAAG;IAC7B,IAAI,EAAE,MAAM,CAAC;CACd,GAAG,wBAAwB,CAAC;AAE7B,MAAM,MAAM,6BAA6B,GAAG;IAC1C,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IACxB,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,MAAM,CAAC,OAAO,UAAU,uBAAuB,CAC7C,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,YAAY,GAAG,6BAA6B,GACnD,QAAQ,CAAC,gBAAgB,CAAC,CAAC"}

package/dist/utils/logger.d.ts

@@ -1,4 +1,4 @@
-import { CoreMessage } from '../events';
+import type { CoreMessage } from '../events';
 type LogMessage = {
     level: string;
     prefix: string;

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

@@ -1 +1 @@
-{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../../src/utils/logger.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AAGxC,KAAK,UAAU,GAAG;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,GAAG,EAAE,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAMF,cAAM,GAAG;IACP,MAAM,EAAE,MAAM,CAAC;IAEf,OAAO,EAAE,OAAO,CAAC;IAEjB,QAAQ,EAAE,UAAU,EAAE,CAAC;gBAEX,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO;IAM5C,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE;IAYxD,GAAG,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE;IASlB,KAAK,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE;IASpB,IAAI,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE;IASnB,KAAK,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE;CAQrB;AAID,eAAO,MAAM,OAAO,WAAY,MAAM,YAAY,OAAO,QAIxD,CAAC;AAEF,eAAO,MAAM,SAAS,aAAc,OAAO,SAI1C,CAAC;AAEF,eAAO,MAAM,iBAAiB,WAAY,MAAM,WAAW,OAAO,SAIjE,CAAC;AAEF,eAAO,MAAM,MAAM,oBAOlB,CAAC;AAEF,eAAO,MAAM,oBAAoB,4BAA6B,WAAW,KAAK,IAAI,SAEjF,CAAC;AAuCF,oBAAY,WAAW;IACrB,IAAI,oBAAoB;IACxB,SAAS,cAAc;IACvB,MAAM,WAAW;IACjB,cAAc,mBAAmB;IACjC,eAAe,oBAAoB;IACnC,UAAU,eAAe;IACzB,UAAU,eAAe;IACzB,kBAAkB,+BAA+B;IACjD,QAAQ,uBAAuB;IAC/B,eAAe,8BAA8B;IAC7C,mBAAmB,kCAAkC;IACrD,cAAc,6BAA6B;IAC3C,iBAAiB,iCAAiC;IAClD,iBAAiB,gCAAgC;IACjD,OAAO,oBAAoB;IAC3B,MAAM,WAAW;IACjB,WAAW,kBAAkB;IAC7B,MAAM,aAAa;CACpB;AAED,eAAO,MAAM,SAAS;;;;;;;;;;;;;;;;;;;CAmBrB,CAAC;AAEF,eAAO,MAAM,SAAS,QAAS,WAAW,QAAmB,CAAC"}
+{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../../src/utils/logger.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AAE7C,KAAK,UAAU,GAAG;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,GAAG,EAAE,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAMF,cAAM,GAAG;IACP,MAAM,EAAE,MAAM,CAAC;IAEf,OAAO,EAAE,OAAO,CAAC;IAEjB,QAAQ,EAAE,UAAU,EAAE,CAAC;gBAEX,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO;IAM5C,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE;IAYxD,GAAG,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE;IASlB,KAAK,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE;IASpB,IAAI,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE;IASnB,KAAK,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE;CAQrB;AAID,eAAO,MAAM,OAAO,WAAY,MAAM,YAAY,OAAO,QAIxD,CAAC;AAEF,eAAO,MAAM,SAAS,aAAc,OAAO,SAI1C,CAAC;AAEF,eAAO,MAAM,iBAAiB,WAAY,MAAM,WAAW,OAAO,SAIjE,CAAC;AAEF,eAAO,MAAM,MAAM,oBAOlB,CAAC;AAEF,eAAO,MAAM,oBAAoB,4BAA6B,WAAW,KAAK,IAAI,SAEjF,CAAC;AAuCF,oBAAY,WAAW;IACrB,IAAI,oBAAoB;IACxB,SAAS,cAAc;IACvB,MAAM,WAAW;IACjB,cAAc,mBAAmB;IACjC,eAAe,oBAAoB;IACnC,UAAU,eAAe;IACzB,UAAU,eAAe;IACzB,kBAAkB,+BAA+B;IACjD,QAAQ,uBAAuB;IAC/B,eAAe,8BAA8B;IAC7C,mBAAmB,kCAAkC;IACrD,cAAc,6BAA6B;IAC3C,iBAAiB,iCAAiC;IAClD,iBAAiB,gCAAgC;IACjD,OAAO,oBAAoB;IAC3B,MAAM,WAAW;IACjB,WAAW,kBAAkB;IAC7B,MAAM,aAAa;CACpB;AAED,eAAO,MAAM,SAAS;;;;;;;;;;;;;;;;;;;CAmBrB,CAAC;AAEF,eAAO,MAAM,SAAS,QAAS,WAAW,QAAmB,CAAC"}

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

@@ -1 +1 @@
-{"version":3,"file":"tracing.d.ts","sourceRoot":"","sources":["../../src/utils/tracing.ts"],"names":[],"mappings":"AAuBA,wBAAgB,qBAAqB,IAAI,MAAM,CAI9C;AASD,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,EAAE,aAAa,CAAC,EAAE,MAAM,GAAG,MAAM,CAK/E;AASD,MAAM,WAAW,cAAc;IAE7B,UAAU,EAAE,MAAM,CAAC;IAEnB,aAAa,CAAC,EAAE,MAAM,CAAC;IAEvB,UAAU,EAAE,MAAM,CAAC;IAEnB,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAE1B,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAE5B,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAE1B,SAAS,EAAE,MAAM,CAAC;IAElB,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB,MAAM,CAAC,EAAE,SAAS,GAAG,SAAS,GAAG,SAAS,GAAG,OAAO,GAAG,WAAW,CAAC;IAEnE,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAKD,MAAM,WAAW,iBAAiB;IAEhC,aAAa,EAAE,MAAM,CAAC;IAEtB,SAAS,EAAE,MAAM,CAAC;IAElB,cAAc,EAAE,GAAG,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC;CAC7C;AAWD,wBAAgB,uBAAuB,IAAI,iBAAiB,CAW3D;AAQD,wBAAgB,oBAAoB,CAClC,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,EAClB,OAAO,CAAC,EAAE;IACR,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC3B,GACA,cAAc,CAyBhB;AAKD,wBAAgB,oBAAoB,CAAC,UAAU,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,CAAC,cAAc,CAAC,GAAG,IAAI,CAK/F;AAKD,wBAAgB,sBAAsB,CAAC,UAAU,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,KAAK,GAAG,IAAI,CAwB9E;AASD,wBAAgB,iCAAiC,CAAC,gBAAgB,EAAE,MAAM,GAAG,cAAc,EAAE,CAI5F;AASD,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,cAAc,GAAG,MAAM,CAmBpE;AASD,wBAAgB,kBAAkB,CAAC,aAAa,EAAE,MAAM,GAAG,IAAI,CAW9D"}
+{"version":3,"file":"tracing.d.ts","sourceRoot":"","sources":["../../src/utils/tracing.ts"],"names":[],"mappings":"AAmBA,wBAAgB,qBAAqB,IAAI,MAAM,CAI9C;AASD,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,EAAE,aAAa,CAAC,EAAE,MAAM,GAAG,MAAM,CAK/E;AAOD,MAAM,WAAW,cAAc;IAE7B,UAAU,EAAE,MAAM,CAAC;IAEnB,aAAa,CAAC,EAAE,MAAM,CAAC;IAEvB,UAAU,EAAE,MAAM,CAAC;IAEnB,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAE1B,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAE5B,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAE1B,SAAS,EAAE,MAAM,CAAC;IAElB,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB,MAAM,CAAC,EAAE,SAAS,GAAG,SAAS,GAAG,SAAS,GAAG,OAAO,GAAG,WAAW,CAAC;IAEnE,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAKD,MAAM,WAAW,iBAAiB;IAEhC,aAAa,EAAE,MAAM,CAAC;IAEtB,SAAS,EAAE,MAAM,CAAC;IAElB,cAAc,EAAE,GAAG,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC;CAC7C;AAWD,wBAAgB,uBAAuB,IAAI,iBAAiB,CAW3D;AAQD,wBAAgB,oBAAoB,CAClC,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,EAClB,OAAO,CAAC,EAAE;IACR,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC3B,GACA,cAAc,CAyBhB;AAKD,wBAAgB,oBAAoB,CAAC,UAAU,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,CAAC,cAAc,CAAC,GAAG,IAAI,CAK/F;AAKD,wBAAgB,sBAAsB,CAAC,UAAU,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,KAAK,GAAG,IAAI,CAuB9E;AAOD,wBAAgB,iCAAiC,CAAC,gBAAgB,EAAE,MAAM,GAAG,cAAc,EAAE,CAI5F;AAOD,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,cAAc,GAAG,MAAM,CAmBpE;AAOD,wBAAgB,kBAAkB,CAAC,aAAa,EAAE,MAAM,GAAG,IAAI,CAW9D"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-core",
-  "version": "1.1.19-alpha.1",
+  "version": "1.1.19-alpha.3",
   "description": "Core processes and APIs for communicating with OneKey hardware devices.",
   "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.1.19-alpha.1",
-    "@onekeyfe/hd-transport": "1.1.19-alpha.1",
+    "@onekeyfe/hd-shared": "1.1.19-alpha.3",
+    "@onekeyfe/hd-transport": "1.1.19-alpha.3",
     "axios": "1.12.2",
     "bignumber.js": "^9.0.2",
     "bytebuffer": "^5.0.1",
@@ -35,16 +35,14 @@
     "semver": "^7.3.7"
   },
   "peerDependencies": {
-    "@noble/hashes": "^1.1.3",
-    "ripple-keypairs": "^1.3.1"
+    "@noble/hashes": "^1.1.3"
   },
   "devDependencies": {
     "@noble/hashes": "^1.1.3",
     "@types/parse-uri": "^1.0.0",
     "@types/semver": "^7.3.9",
     "@types/w3c-web-usb": "^1.0.10",
-    "@types/web-bluetooth": "^0.0.21",
-    "ripple-keypairs": "^1.3.1"
+    "@types/web-bluetooth": "^0.0.21"
   },
-  "gitHead": "cc93ea24ebfc9b4c3c0d71fd53bcfa3c2c304153"
+  "gitHead": "9039715c7d1ec7ebaf71ec8e22737f3f2b013ca5"
 }

package/src/api/FirmwareUpdate.ts

@@ -206,7 +206,8 @@ export default class FirmwareUpdate extends BaseMethod<Params> {
       this.device.getCommands().typedCall.bind(this.device.getCommands()),
       this.postMessage,
       device,
-      { payload: binary, rebootOnSuccess: this.payload.rebootOnSuccess }
+      { payload: binary, rebootOnSuccess: this.payload.rebootOnSuccess },
+      false
     );
 
     if (this.connectId) {

package/src/api/FirmwareUpdateV2.ts

@@ -395,7 +395,8 @@ export default class FirmwareUpdateV2 extends BaseMethod<Params> {
       this.device.getCommands().typedCall.bind(this.device.getCommands()),
       this.postMessage,
       device,
-      { payload: binary, rebootOnSuccess: true }
+      { payload: binary, rebootOnSuccess: true },
+      params.isUpdateBootloader
     );
 
     if (this.connectId) {

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

@@ -1,4 +1,5 @@
 import { ERRORS, HardwareErrorCode } from '@onekeyfe/hd-shared';
+
 import { getScriptType, isMultisigPath, fromHardened } from '../../helpers/pathUtils';
 import bitcoin from '../../../data/coins/bitcoin.json';
 

package/src/api/firmware/FirmwareUpdateBaseMethod.ts

@@ -1,29 +1,27 @@
 import {
-  createDeferred,
-  Deferred,
   EDeviceType,
   ERRORS,
   HardwareError,
   HardwareErrorCode,
+  createDeferred,
 } from '@onekeyfe/hd-shared';
-import { RebootType } from '@onekeyfe/hd-transport';
-import type { KnownDevice } from '../../types';
 
-import {
-  UI_REQUEST,
-  createUiMessage,
-  FirmwareUpdateTipMessage,
-  IFirmwareUpdateTipMessage,
-  IFirmwareUpdateProgressType,
-} from '../../events/ui-request';
+import { FirmwareUpdateTipMessage, UI_REQUEST, createUiMessage } from '../../events/ui-request';
 import { DevicePool } from '../../device/DevicePool';
-import { getDeviceType, wait, getLogger, LoggerNames, getDeviceUUID } from '../../utils';
+import { LoggerNames, getDeviceType, getDeviceUUID, getLogger, wait } from '../../utils';
 import { DeviceModelToTypes } from '../../types';
 import { DataManager } from '../../data-manager';
-
 import { BaseMethod } from '../BaseMethod';
 import { DEVICE } from '../../events';
-import { PROTO } from '../../constants';
+
+import type {
+  IFirmwareUpdateProgressType,
+  IFirmwareUpdateTipMessage,
+} from '../../events/ui-request';
+import type { PROTO } from '../../constants';
+import type { RebootType } from '@onekeyfe/hd-transport';
+import type { Deferred } from '@onekeyfe/hd-shared';
+import type { KnownDevice } from '../../types';
 import type { TypedResponseMessage } from '../../device/DeviceCommands';
 
 const Log = getLogger(LoggerNames.Method);
@@ -266,16 +264,16 @@ export class FirmwareUpdateBaseMethod<Params> extends BaseMethod<Params> {
    */
   async startEmmcFirmwareUpdate({ path }: { path: string }) {
     const typedCall = this.device.getCommands().typedCall.bind(this.device.getCommands());
-    let updaeteResponse: TypedResponseMessage<'Success'>;
+    let updateResponse: TypedResponseMessage<'Success'>;
     try {
-      updaeteResponse = await typedCall('FirmwareUpdateEmmc', 'Success', {
+      updateResponse = await typedCall('FirmwareUpdateEmmc', 'Success', {
         path,
         reboot_on_success: true,
       });
     } catch (error) {
       if (isDeviceDisconnectedError(error)) {
         Log.log('Rebooting device');
-        updaeteResponse = {
+        updateResponse = {
           type: 'Success',
           message: { message: FIRMWARE_UPDATE_CONFIRM },
         };
@@ -283,7 +281,7 @@ export class FirmwareUpdateBaseMethod<Params> extends BaseMethod<Params> {
         throw error;
       }
     }
-    if (updaeteResponse.type !== 'Success') {
+    if (updateResponse.type !== 'Success') {
       throw ERRORS.TypedError(HardwareErrorCode.FirmwareError, 'firmware update error');
     }
     this.postTipMessage(FirmwareUpdateTipMessage.FirmwareUpdating);

package/src/api/firmware/bootloaderHelper.ts

@@ -1,8 +1,10 @@
 import semver from 'semver';
 import { EDeviceType } from '@onekeyfe/hd-shared';
-import { Features, IVersionArray } from '../../types';
+
 import { getDeviceType } from '../../utils';
 
+import type { Features, IVersionArray } from '../../types';
+
 export function shouldUpdateBootloaderForClassicAndMini({
   currentVersion,
   bootloaderVersion,

package/src/api/firmware/updateBootloader.ts

@@ -1,11 +1,14 @@
 import ByteBuffer from 'bytebuffer';
 import semver from 'semver';
-import type { EFirmwareType } from '@onekeyfe/hd-shared';
-import { DeviceModelToTypes, Features } from '../../types';
-import { getDeviceType, getDeviceBootloaderVersion, getDeviceFirmwareVersion } from '../../utils';
+
+import { DeviceModelToTypes } from '../../types';
+import { getDeviceBootloaderVersion, getDeviceFirmwareVersion, getDeviceType } from '../../utils';
 import { DataManager } from '../../data-manager';
 import { shouldUpdateBootloaderForClassicAndMini } from './bootloaderHelper';
 
+import type { Features } from '../../types';
+import type { EFirmwareType } from '@onekeyfe/hd-shared';
+
 export function checkNeedUpdateBootForTouch(features: Features, firmwareType: EFirmwareType) {
   const deviceType = getDeviceType(features);
   if (!DeviceModelToTypes.model_touch.includes(deviceType)) return false;