@onekeyfe/hd-core 1.0.36-alpha.1 → 1.0.37-alpha.3

package/dist/index.js

@@ -73,6 +73,7 @@ const createCoreApi = (call) => ({
     getPassphraseState: (connectId, params) => call(Object.assign(Object.assign({}, params), { connectId, method: 'getPassphraseState' })),
     deviceCancel: (connectId, params) => call(Object.assign(Object.assign({}, params), { connectId, method: 'deviceCancel' })),
     deviceLock: (connectId, params) => call(Object.assign(Object.assign({}, params), { connectId, method: 'deviceLock' })),
+    deviceUnlock: (connectId, params) => call(Object.assign(Object.assign({}, params), { useEmptyPassphrase: true, connectId, method: 'deviceUnlock' })),
     getNextU2FCounter: (connectId, params) => call(Object.assign(Object.assign({}, params), { connectId, method: 'getNextU2FCounter' })),
     setU2FCounter: (connectId, params) => call(Object.assign(Object.assign({}, params), { connectId, method: 'setU2FCounter' })),
     allNetworkGetAddress: (connectId, deviceId, params) => call(Object.assign(Object.assign({}, params), { connectId, deviceId, method: 'allNetworkGetAddress' })),
@@ -876,6 +877,7 @@ exports.LoggerNames = void 0;
     LoggerNames["HdTransportHttp"] = "@onekey/hd-transport-http";
     LoggerNames["HdTransportLowLevel"] = "@onekey/hd-transport-lowlevel";
     LoggerNames["HdBleTransport"] = "@onekey/hd-ble-transport";
+    LoggerNames["HdWebBleTransport"] = "@onekey/hd-web-ble-transport";
     LoggerNames["Connect"] = "@onekey/connect";
     LoggerNames["Iframe"] = "IFrame";
     LoggerNames["SendMessage"] = "[SendMessage]";
@@ -892,6 +894,7 @@ const LoggerMap = {
     [exports.LoggerNames.HdBleSdk]: initLog(exports.LoggerNames.HdBleSdk),
     [exports.LoggerNames.HdTransportHttp]: initLog(exports.LoggerNames.HdTransportHttp),
     [exports.LoggerNames.HdBleTransport]: initLog(exports.LoggerNames.HdBleTransport),
+    [exports.LoggerNames.HdWebBleTransport]: initLog(exports.LoggerNames.HdWebBleTransport),
     [exports.LoggerNames.HdTransportLowLevel]: initLog(exports.LoggerNames.HdTransportLowLevel),
     [exports.LoggerNames.Connect]: initLog(exports.LoggerNames.Connect),
     [exports.LoggerNames.Iframe]: initLog(exports.LoggerNames.Iframe),
@@ -4329,7 +4332,8 @@ var nested$1 = {
 					ButtonRequest_Success: 17,
 					ButtonRequest_Warning: 18,
 					ButtonRequest_PassphraseEntry: 19,
-					ButtonRequest_PinEntry: 20
+					ButtonRequest_PinEntry: 20,
+					ButtonRequest_AttachPin: 8000
 				}
 			}
 		}
@@ -4380,6 +4384,10 @@ var nested$1 = {
 				options: {
 					deprecated: true
 				}
+			},
+			exists_attach_pin_user: {
+				type: "bool",
+				id: 8000
 			}
 		}
 	},
@@ -4399,6 +4407,10 @@ var nested$1 = {
 			on_device: {
 				type: "bool",
 				id: 3
+			},
+			on_device_attach_pin: {
+				type: "bool",
+				id: 8000
 			}
 		}
 	},
@@ -7366,6 +7378,10 @@ var nested$1 = {
 			derive_cardano: {
 				type: "bool",
 				id: 3
+			},
+			passphrase_state: {
+				type: "string",
+				id: 8000
 			}
 		}
 	},
@@ -7746,6 +7762,14 @@ var nested$1 = {
 			onekey_se04_state: {
 				type: "OneKeySEState",
 				id: 624
+			},
+			attach_to_pin_user: {
+				type: "bool",
+				id: 625
+			},
+			unlocked_attach_pin: {
+				type: "bool",
+				id: 626
 			}
 		},
 		nested: {
@@ -8868,6 +8892,30 @@ var nested$1 = {
 			}
 		}
 	},
+	GetPassphraseState: {
+		fields: {
+			passphrase_state: {
+				type: "string",
+				id: 1
+			}
+		}
+	},
+	PassphraseState: {
+		fields: {
+			passphrase_state: {
+				type: "string",
+				id: 1
+			},
+			session_id: {
+				type: "bytes",
+				id: 2
+			},
+			unlocked_attach_pin: {
+				type: "bool",
+				id: 3
+			}
+		}
+	},
 	MoneroTransactionSourceEntry: {
 		fields: {
 			outputs: {
@@ -13492,7 +13540,9 @@ var nested$1 = {
 			MessageType_ListResDir: 10023,
 			MessageType_FileInfoList: 10024,
 			MessageType_OnekeyGetFeatures: 10025,
-			MessageType_OnekeyFeatures: 10026
+			MessageType_OnekeyFeatures: 10026,
+			MessageType_GetPassphraseState: 10028,
+			MessageType_PassphraseState: 10029
 		}
 	},
 	google: {
@@ -24893,7 +24943,7 @@ DataManager.getTransportStatus = (localVersion) => {
     return isLatest ? 'valid' : 'outdated';
 };
 DataManager.getBridgeChangelog = () => { var _b; return (_b = _a$1.assets) === null || _b === void 0 ? void 0 : _b.bridge.changelog; };
-DataManager.isBleConnect = (env) => env === 'react-native' || env === 'lowlevel';
+DataManager.isBleConnect = (env) => env === 'react-native' || env === 'lowlevel' || env === 'desktop-web-ble';
 DataManager.isWebUsbConnect = (env) => env === 'webusb';
 
 const PROTOBUF_MESSAGE_CONFIG = {
@@ -24955,21 +25005,40 @@ const supportNewPassphrase = (features) => {
     const currentVersion = getDeviceFirmwareVersion(features).join('.');
     return { support: semver__default["default"].gte(currentVersion, '2.4.0'), require: '2.4.0' };
 };
-const getPassphraseStateWithRefreshDeviceInfo = (device) => __awaiter(void 0, void 0, void 0, function* () {
+const getPassphraseStateWithRefreshDeviceInfo = (device, options) => __awaiter(void 0, void 0, void 0, function* () {
+    var _a, _b, _c, _d, _e;
     const { features, commands } = device;
     const locked = (features === null || features === void 0 ? void 0 : features.unlocked) === false;
-    const passphraseState = yield getPassphraseState(features, commands);
+    const { passphraseState, newSession, unlockedAttachPin } = yield getPassphraseState(features, commands, Object.assign({}, options));
     const isModeT = getDeviceType(features) === hdShared.EDeviceType.Touch || getDeviceType(features) === hdShared.EDeviceType.Pro;
     const needRefreshWithPassphrase = passphraseState && (features === null || features === void 0 ? void 0 : features.passphrase_protection) !== true;
     const needRefreshWithLocked = isModeT && locked;
     if (needRefreshWithLocked || needRefreshWithPassphrase) {
         yield device.getFeatures();
     }
-    return passphraseState;
+    if (features === null || features === void 0 ? void 0 : features.device_id) {
+        device.updateInternalState((_b = (_a = device.features) === null || _a === void 0 ? void 0 : _a.passphrase_protection) !== null && _b !== void 0 ? _b : false, passphraseState, (_d = (_c = device.features) === null || _c === void 0 ? void 0 : _c.device_id) !== null && _d !== void 0 ? _d : '', newSession, (_e = device.features) === null || _e === void 0 ? void 0 : _e.session_id);
+    }
+    return { passphraseState, newSession, unlockedAttachPin };
 });
-const getPassphraseState = (features, commands) => __awaiter(void 0, void 0, void 0, function* () {
+const getPassphraseState = (features, commands, options) => __awaiter(void 0, void 0, void 0, function* () {
     if (!features)
-        return false;
+        return { passphraseState: undefined, newSession: undefined, unlockedAttachPin: undefined };
+    const firmwareVersion = getDeviceFirmwareVersion(features);
+    const deviceType = getDeviceType(features);
+    if (deviceType === hdShared.EDeviceType.Pro && semver__default["default"].gte(firmwareVersion.join('.'), '4.15.0')) {
+        const { message, type } = yield commands.typedCall('GetPassphraseState', 'PassphraseState', {
+            passphrase_state: (options === null || options === void 0 ? void 0 : options.onlyMainPin) ? undefined : options === null || options === void 0 ? void 0 : options.expectPassphraseState,
+        });
+        if (type === 'CallMethodError') {
+            throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, 'Get the passphrase state error');
+        }
+        return {
+            passphraseState: message.passphrase_state,
+            newSession: message.session_id,
+            unlockedAttachPin: message.unlocked_attach_pin,
+        };
+    }
     const { message, type } = yield commands.typedCall('GetAddress', 'Address', {
         address_n: [toHardened(44), toHardened(1), toHardened(0), 0, 0],
         coin_name: 'Testnet',
@@ -24979,7 +25048,11 @@ const getPassphraseState = (features, commands) => __awaiter(void 0, void 0, voi
     if (type === 'CallMethodError') {
         throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, 'Get the passphrase state error');
     }
-    return message.address;
+    return {
+        passphraseState: message.address,
+        newSession: undefined,
+        unlockedAttachPin: undefined,
+    };
 });
 const supportBatchPublicKey = (features, options) => {
     if (!features)
@@ -24989,12 +25062,18 @@ const supportBatchPublicKey = (features, options) => {
     if (!!(options === null || options === void 0 ? void 0 : options.includeNode) && deviceType === hdShared.EDeviceType.Pro) {
         return semver__default["default"].gte(currentVersion, '4.14.0');
     }
+    if (!!(options === null || options === void 0 ? void 0 : options.includeNode) && deviceType === hdShared.EDeviceType.Touch) {
+        return semver__default["default"].gte(currentVersion, '4.11.0');
+    }
     if (!!(options === null || options === void 0 ? void 0 : options.includeNode) && DeviceModelToTypes.model_classic1s.includes(deviceType)) {
         return semver__default["default"].gte(currentVersion, '3.12.0');
     }
-    if (!!(options === null || options === void 0 ? void 0 : options.includeNode) && deviceType === hdShared.EDeviceType.Classic) {
+    if (!!(options === null || options === void 0 ? void 0 : options.includeNode) && DeviceModelToTypes.model_mini.includes(deviceType)) {
         return semver__default["default"].gte(currentVersion, '3.10.0');
     }
+    if (options === null || options === void 0 ? void 0 : options.includeNode) {
+        return false;
+    }
     if (deviceType === hdShared.EDeviceType.Touch || deviceType === hdShared.EDeviceType.Pro) {
         return semver__default["default"].gte(currentVersion, '3.1.0');
     }
@@ -25953,6 +26032,7 @@ const Log$c = getLogger(exports.LoggerNames.Transport);
 const BleLogger = getLogger(exports.LoggerNames.HdBleTransport);
 const HttpLogger = getLogger(exports.LoggerNames.HdTransportHttp);
 const LowLevelLogger = getLogger(exports.LoggerNames.HdTransportLowLevel);
+const WebBleLogger = getLogger(exports.LoggerNames.HdWebBleTransport);
 class TransportManager {
     static load() {
         Log$c.debug('transport manager load');
@@ -25980,6 +26060,9 @@ class TransportManager {
                     }
                     yield this.transport.init(LowLevelLogger, DevicePool.emitter, this.plugin);
                 }
+                else if (env === 'desktop-web-ble') {
+                    yield this.transport.init(WebBleLogger);
+                }
                 else {
                     yield this.transport.init(HttpLogger);
                 }
@@ -26193,7 +26276,6 @@ class DeviceCommands {
                 this.callPromise = promise;
                 const res = yield promise;
                 Log$b.debug('[DeviceCommands] [call] Received', res.type);
-                console.log('[DeviceCommands] [call] Received', res.type);
                 return res;
             }
             catch (error) {
@@ -26355,8 +26437,14 @@ class DeviceCommands {
             }, error => Promise.reject(error));
         }
         if (res.type === 'PassphraseRequest') {
-            return this._promptPassphrase().then(response => {
-                const { passphrase, passphraseOnDevice } = response;
+            const existsAttachPinUser = res.message.exists_attach_pin_user;
+            return this._promptPassphrase({
+                existsAttachPinUser,
+            }).then(response => {
+                const { passphrase, passphraseOnDevice, attachPinOnDevice } = response;
+                if (attachPinOnDevice && existsAttachPinUser) {
+                    return this._commonCall('PassphraseAck', { on_device_attach_pin: true });
+                }
                 return !passphraseOnDevice
                     ? this._commonCall('PassphraseAck', { passphrase })
                     : this._commonCall('PassphraseAck', { on_device: true });
@@ -26400,7 +26488,7 @@ class DeviceCommands {
             }
         });
     }
-    _promptPassphrase() {
+    _promptPassphrase(options) {
         return new Promise((resolve, reject) => {
             const cancelAndReject = (_error) => cancelDeviceInPrompt(this.device, false)
                 .then(onCancel => {
@@ -26418,7 +26506,7 @@ class DeviceCommands {
             });
             if (this.device.listenerCount(DEVICE.PASSPHRASE) > 0) {
                 this.device.setCancelableAction(cancelAndReject);
-                this.device.emit(DEVICE.PASSPHRASE, this.device, (response, error) => {
+                this.device.emit(DEVICE.PASSPHRASE, this.device, options, (response, error) => {
                     this.device.clearCancelableAction();
                     if (error) {
                         cancelAndReject();
@@ -26591,8 +26679,8 @@ class Device extends events.exports {
     }
     getInternalState(_deviceId) {
         var _a, _b;
-        Log$a.debug('getInternalState session param: ', `device_id: ${_deviceId}`, `features.device_id: ${(_a = this.features) === null || _a === void 0 ? void 0 : _a.device_id}`, `passphraseState: ${this.passphraseState}`);
         Log$a.debug('getInternalState session cache: ', deviceSessionCache);
+        Log$a.debug('getInternalState session param: ', `device_id: ${_deviceId}`, `features.device_id: ${(_a = this.features) === null || _a === void 0 ? void 0 : _a.device_id}`, `passphraseState: ${this.passphraseState}`);
         const deviceId = _deviceId || ((_b = this.features) === null || _b === void 0 ? void 0 : _b.device_id);
         if (!deviceId)
             return undefined;
@@ -26601,18 +26689,21 @@ class Device extends events.exports {
         const usePassKey = this.generateStateKey(deviceId, this.passphraseState);
         return deviceSessionCache[usePassKey];
     }
-    tryFixInternalState(state, deviceId, sessionId = null) {
-        Log$a.debug('tryFixInternalState session param: ', `device_id: ${deviceId}`, `passphraseState: ${state}`, `sessionId: ${sessionId}`);
-        const key = `${deviceId}`;
-        const session = deviceSessionCache[key];
-        if (session) {
-            deviceSessionCache[this.generateStateKey(deviceId, state)] = session;
-            delete deviceSessionCache[key];
+    updateInternalState(enablePassphrase, passphraseState, deviceId, sessionId = null, featuresSessionId = null) {
+        Log$a.debug('updateInternalState session param: ', `device_id: ${deviceId}`, `enablePassphrase: ${enablePassphrase}`, `passphraseState: ${passphraseState}`, `sessionId: ${sessionId}`, `featuresSessionId: ${featuresSessionId}`);
+        if (enablePassphrase) {
+            if (sessionId) {
+                deviceSessionCache[this.generateStateKey(deviceId, passphraseState)] = sessionId;
+            }
+            else if (featuresSessionId) {
+                deviceSessionCache[this.generateStateKey(deviceId, passphraseState)] = featuresSessionId;
+            }
         }
-        else if (sessionId) {
-            deviceSessionCache[this.generateStateKey(deviceId, state)] = sessionId;
+        const oldKey = `${deviceId}`;
+        if (deviceSessionCache[oldKey]) {
+            delete deviceSessionCache[oldKey];
         }
-        Log$a.debug('tryFixInternalState session cache: ', deviceSessionCache);
+        Log$a.debug('updateInternalState session cache: ', deviceSessionCache);
     }
     setInternalState(state, initSession) {
         var _a, _b;
@@ -26645,7 +26736,6 @@ class Device extends events.exports {
     }
     initialize(options) {
         return __awaiter(this, void 0, void 0, function* () {
-            Log$a.debug('initialize param:', options);
             this.passphraseState = options === null || options === void 0 ? void 0 : options.passphraseState;
             if (options === null || options === void 0 ? void 0 : options.initSession) {
                 this.clearInternalState(options === null || options === void 0 ? void 0 : options.deviceId);
@@ -26658,7 +26748,13 @@ class Device extends events.exports {
             if (options === null || options === void 0 ? void 0 : options.deriveCardano) {
                 payload.derive_cardano = true;
             }
-            Log$a.debug('initialize payload:', payload);
+            payload.passphrase_state = options === null || options === void 0 ? void 0 : options.passphraseState;
+            Log$a.debug('Initialize device begin:', {
+                deviceId: options === null || options === void 0 ? void 0 : options.deviceId,
+                passphraseState: options === null || options === void 0 ? void 0 : options.passphraseState,
+                initSession: options === null || options === void 0 ? void 0 : options.initSession,
+                InitializePayload: payload,
+            });
             try {
                 const { message } = yield Promise.race([
                     this.commands.typedCall('Initialize', 'Features', payload),
@@ -26668,6 +26764,7 @@ class Device extends events.exports {
                         }, 25 * 1000);
                     }),
                 ]);
+                Log$a.debug('Initialize device end: ', message);
                 this._updateFeatures(message, options === null || options === void 0 ? void 0 : options.initSession);
                 yield TransportManager.reconfigure(this.features);
             }
@@ -26919,12 +27016,41 @@ class Device extends events.exports {
         }
         return false;
     }
-    checkPassphraseStateSafety(passphraseState) {
+    lockDevice() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const res = yield this.commands.typedCall('LockDevice', 'Success', {});
+            return res.message;
+        });
+    }
+    checkPassphraseStateSafety(passphraseState, useEmptyPassphraseState, skipPassphraseCheck) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.features)
                 return false;
-            const newState = yield getPassphraseStateWithRefreshDeviceInfo(this);
-            if (passphraseState && passphraseState !== newState) {
+            const { passphraseState: newPassphraseState, unlockedAttachPin } = yield getPassphraseStateWithRefreshDeviceInfo(this, {
+                expectPassphraseState: passphraseState,
+                onlyMainPin: useEmptyPassphraseState,
+            });
+            if (skipPassphraseCheck) {
+                return true;
+            }
+            const mainWalletUseAttachPin = unlockedAttachPin && useEmptyPassphraseState;
+            const useErrorAttachPin = unlockedAttachPin && passphraseState && passphraseState !== newPassphraseState;
+            Log$a.debug('Check passphrase state safety: ', {
+                passphraseState,
+                newPassphraseState,
+                unlockedAttachPin,
+                useEmptyPassphraseState,
+            });
+            if (mainWalletUseAttachPin || useErrorAttachPin) {
+                try {
+                    yield this.lockDevice();
+                }
+                catch (error) {
+                }
+                this.clearInternalState();
+                return Promise.reject(hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.DeviceCheckUnlockTypeError));
+            }
+            if (passphraseState && passphraseState !== newPassphraseState) {
                 this.clearInternalState();
                 return false;
             }
@@ -27191,12 +27317,9 @@ class GetPassphraseState extends BaseMethod {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.device.features)
                 return Promise.reject(hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.DeviceInitializeFailed));
-            const passphraseState = yield getPassphraseStateWithRefreshDeviceInfo(this.device);
+            const { passphraseState } = yield getPassphraseStateWithRefreshDeviceInfo(this.device);
             const { features } = this.device;
             if (features && features.passphrase_protection === true) {
-                if (passphraseState && features.device_id) {
-                    this.device.tryFixInternalState(passphraseState, features.device_id, features.session_id);
-                }
                 return Promise.resolve(passphraseState);
             }
             return Promise.resolve(undefined);
@@ -28467,6 +28590,27 @@ class DeviceLock extends BaseMethod {
     }
 }
 
+class DeviceUnlock extends BaseMethod {
+    init() {
+        this.useDevicePassphraseState = false;
+    }
+    run() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const { type } = yield this.device.commands.typedCall('GetAddress', 'Address', {
+                address_n: [toHardened(44), toHardened(1), toHardened(0), 0, 0],
+                coin_name: 'Testnet',
+                script_type: 'SPENDADDRESS',
+                show_display: false,
+            });
+            if (type === 'CallMethodError') {
+                throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, 'Get the passphrase state error');
+            }
+            const res = yield this.device.commands.typedCall('GetFeatures', 'Features');
+            return Promise.resolve(res.message);
+        });
+    }
+}
+
 class DeviceCancel extends BaseMethod {
     init() {
         this.useDevicePassphraseState = false;
@@ -28611,7 +28755,7 @@ class FirmwareUpdate extends BaseMethod {
                     if (e instanceof hdShared.HardwareError) {
                         return Promise.reject(e);
                     }
-                    console.log('auto go to bootloader mode failed: ', e);
+                    Log$7.log('auto go to bootloader mode failed: ', e);
                     return Promise.reject(hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.FirmwareUpdateAutoEnterBootFailure));
                 }
             }
@@ -29116,10 +29260,10 @@ class FirmwareUpdateBaseMethod extends BaseMethod {
                 let progress;
                 if (totalSize !== undefined && processedSize !== undefined) {
                     currentFileProcessed = processedSize + chunkEnd;
-                    progress = Math.min(Math.floor((currentFileProcessed / totalSize) * 100), 100);
+                    progress = Math.min(Math.ceil((currentFileProcessed / totalSize) * 100), 99);
                 }
                 else {
-                    progress = Math.min(Math.round(((i + 1) / totalChunks) * 100), 100);
+                    progress = Math.min(Math.ceil(((i + 1) / totalChunks) * 100), 99);
                 }
                 const writeRes = yield this.emmcFileWriteWithRetry(filePath, chunkLength, offset, chunk, overwrite, progress);
                 offset += writeRes.message.processed_byte;
@@ -29837,7 +29981,7 @@ class AllNetworkGetAddress extends BaseMethod {
             ]);
         });
     }
-    generateMethodName({ network, payload, }) {
+    generateMethodName({ network, payload, originalIndex, }) {
         var _a, _b;
         const { name: networkName, coin } = networkAliases[network] || {
             name: network,
@@ -29851,6 +29995,7 @@ class AllNetworkGetAddress extends BaseMethod {
             methodName: config.methodName,
             params: Object.assign(Object.assign({}, ((_b = (_a = config === null || config === void 0 ? void 0 : config.getParams) === null || _a === void 0 ? void 0 : _a.call(config, payload, coin, config.methodName)) !== null && _b !== void 0 ? _b : payload)), { originPayload: payload }),
             _originRequestParams: payload,
+            _originalIndex: originalIndex,
         };
     }
     callMethod(methodName, params) {
@@ -29898,10 +30043,11 @@ class AllNetworkGetAddress extends BaseMethod {
             const responses = [];
             const resultMap = {};
             const { bundle } = this.payload;
-            const methodReduceParams = bundle
-                .map(param => this.generateMethodName({
+            const methodGroups = bundle
+                .map((param, index) => this.generateMethodName({
                 network: param.network,
                 payload: param,
+                originalIndex: index,
             }))
                 .reduce((acc, cur) => {
                 if (!acc[cur.methodName]) {
@@ -29910,28 +30056,25 @@ class AllNetworkGetAddress extends BaseMethod {
                 acc[cur.methodName].push(cur);
                 return acc;
             }, {});
-            const methodParamsArray = Object.values(methodReduceParams);
-            const generateResponseKey = (payload) => `${payload.path}-${payload.network}-${payload.chainName}-${payload.prefix}`;
-            for (let i = 0; i < methodParamsArray.length; i++) {
-                const methodParams = methodParamsArray[i];
-                const { methodName } = methodParams[0];
-                const params = {
-                    bundle: methodParams.map(param => (Object.assign({}, param.params))),
+            let i = 0;
+            for (const [methodName, params] of Object.entries(methodGroups)) {
+                const methodParams = {
+                    bundle: params.map(param => (Object.assign({}, param.params))),
                 };
-                const response = yield this.callMethod(methodName, params);
-                for (let i = 0; i < methodParams.length; i++) {
-                    const { _originRequestParams } = methodParams[i];
-                    const responseKey = generateResponseKey(_originRequestParams);
+                const response = yield this.callMethod(methodName, methodParams);
+                for (let i = 0; i < params.length; i++) {
+                    const { _originRequestParams, _originalIndex } = params[i];
+                    const responseKey = `${_originalIndex}`;
                     resultMap[responseKey] = Object.assign(Object.assign({}, _originRequestParams), response[i]);
                 }
                 if (((_b = (_a = this.payload) === null || _a === void 0 ? void 0 : _a.bundle) === null || _b === void 0 ? void 0 : _b.length) > 1) {
                     const progress = Math.round(((i + 1) / this.payload.bundle.length) * 100);
                     this.postMessage(createUiMessage(UI_REQUEST.DEVICE_PROGRESS, { progress }));
                 }
+                i++;
             }
-            for (const param of bundle) {
-                const responseKey = generateResponseKey(param);
-                responses.push(resultMap[responseKey]);
+            for (let i = 0; i < bundle.length; i++) {
+                responses.push(resultMap[i]);
             }
             return Promise.resolve(responses);
         });
@@ -33111,8 +33254,6 @@ class StellarSignTransaction extends BaseMethod {
                 this.operations.push(transformed);
             }
         });
-        console.log('StellarSignTransactionParams', this.params);
-        console.log('StellarSignTransactionOperations', this.operations);
     }
     run() {
         return __awaiter(this, void 0, void 0, function* () {
@@ -37863,6 +38004,7 @@ var ApiMethods = /*#__PURE__*/Object.freeze({
     deviceFullyUploadResource: DeviceFullyUploadResource,
     deviceUpdateBootloader: DeviceUpdateBootloader,
     deviceLock: DeviceLock,
+    deviceUnlock: DeviceUnlock,
     deviceCancel: DeviceCancel,
     setU2FCounter: SetU2FCounter,
     getNextU2FCounter: GetNextU2FCounter,
@@ -38314,7 +38456,7 @@ const onCallDevice = (context, message, method) => __awaiter(void 0, void 0, voi
     try {
         yield waitForPendingPromise(getPrePendingCallPromise, setPrePendingCallPromise);
         const inner = () => __awaiter(void 0, void 0, void 0, function* () {
-            var _c, _d, _e;
+            var _c, _d, _e, _f, _g;
             const versionRange = getMethodVersionRange(device.features, type => method.getVersionRange()[type]);
             if (device.features) {
                 yield DataManager.checkAndReloadData();
@@ -38371,12 +38513,13 @@ const onCallDevice = (context, message, method) => __awaiter(void 0, void 0, voi
                         require: support.require,
                     }));
                 }
-                const passphraseStateSafety = yield device.checkPassphraseStateSafety((_c = method.payload) === null || _c === void 0 ? void 0 : _c.passphraseState);
+                const passphraseStateSafety = yield device.checkPassphraseStateSafety((_c = method.payload) === null || _c === void 0 ? void 0 : _c.passphraseState, (_d = method.payload) === null || _d === void 0 ? void 0 : _d.useEmptyPassphrase, (_e = method.payload) === null || _e === void 0 ? void 0 : _e.skipPassphraseCheck);
                 checkPassphraseEnableState(method, device.features);
                 if (!passphraseStateSafety) {
                     DevicePool.clearDeviceCache(method.payload.connectId);
                     return Promise.reject(hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.DeviceCheckPassphraseStateError));
                 }
+                postMessage(createUiMessage(UI_REQUEST.CLOSE_UI_WINDOW));
             }
             try {
                 yield method.checkSafetyLevelOnTestNet();
@@ -38387,7 +38530,7 @@ const onCallDevice = (context, message, method) => __awaiter(void 0, void 0, voi
                     : hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, 'open safety check failed.');
                 throw error;
             }
-            (_e = (_d = method.device) === null || _d === void 0 ? void 0 : _d.commands) === null || _e === void 0 ? void 0 : _e.checkDisposed();
+            (_g = (_f = method.device) === null || _f === void 0 ? void 0 : _f.commands) === null || _g === void 0 ? void 0 : _g.checkDisposed();
             try {
                 const response = yield method.run();
                 Log.debug('Call API - Inner Method Run: ');
@@ -38705,7 +38848,7 @@ const checkPassphraseEnableState = (method, features) => {
         return;
     if ((features === null || features === void 0 ? void 0 : features.passphrase_protection) === true &&
         (method.payload.passphraseState == null || method.payload.passphraseState === '') &&
-        !method.payload.useEmptyPassphrase) {
+        (!method.payload.useEmptyPassphrase || !method.payload.skipPassphraseCheck)) {
         DevicePool.clearDeviceCache(method.payload.connectId);
         throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.DeviceOpenedPassphrase);
     }
@@ -38747,11 +38890,11 @@ const onDevicePinHandler = (...[device, type, callback]) => __awaiter(void 0, vo
 });
 const onDeviceButtonHandler = (...[device, request]) => {
     postMessage(createDeviceMessage(DEVICE.BUTTON, Object.assign(Object.assign({}, request), { device: device.toMessageObject() })));
-    if (request.code === 'ButtonRequest_PinEntry') {
-        Log.log('request Confirm Input PIN');
+    if (request.code === 'ButtonRequest_PinEntry' || request.code === 'ButtonRequest_AttachPin') {
+        Log.log('request Confirm Input PIN or Attach PIN');
         postMessage(createUiMessage(UI_REQUEST.REQUEST_PIN, {
             device: device.toMessageObject(),
-            type: 'ButtonRequest_PinEntry',
+            type: request.code,
         }));
     }
     else {
@@ -38762,22 +38905,24 @@ const onDeviceButtonHandler = (...[device, request]) => {
 const onDeviceFeaturesHandler = (...[_, features]) => {
     postMessage(createDeviceMessage(DEVICE.FEATURES, Object.assign({}, features)));
 };
-const onDevicePassphraseHandler = (...[device, callback]) => __awaiter(void 0, void 0, void 0, function* () {
+const onDevicePassphraseHandler = (...[device, requestPayload, callback]) => __awaiter(void 0, void 0, void 0, function* () {
     Log.debug('onDevicePassphraseHandler');
     const uiPromise = createUiPromise(UI_RESPONSE.RECEIVE_PASSPHRASE, device);
     postMessage(createUiMessage(UI_REQUEST.REQUEST_PASSPHRASE, {
         device: device.toMessageObject(),
         passphraseState: device.passphraseState,
+        existsAttachPinUser: requestPayload.existsAttachPinUser,
     }));
     const uiResp = yield uiPromise.promise;
-    const { value, passphraseOnDevice, save } = uiResp.payload;
+    const { value, passphraseOnDevice, save, attachPinOnDevice } = uiResp.payload;
     callback({
         passphrase: value.normalize('NFKD'),
         passphraseOnDevice,
+        attachPinOnDevice,
         cache: save,
     });
 });
-const onEmptyPassphraseHandler = (...[_, callback]) => {
+const onEmptyPassphraseHandler = (...[_, , callback]) => {
     Log.debug('onEmptyPassphraseHandler');
     callback({ passphrase: '' });
 };
@@ -38886,7 +39031,7 @@ const init = (settings, Transport, plugin) => __awaiter(void 0, void 0, void 0,
             yield DataManager.load(settings);
             initTransport(Transport, plugin);
         }
-        catch (_f) {
+        catch (_h) {
             Log.error('DataManager.load error');
         }
         enableLog(DataManager.getSettings('debug'));

package/dist/inject.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"inject.d.ts","sourceRoot":"","sources":["../src/inject.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AACtC,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AACtC,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAEtC,MAAM,WAAW,SAAS;IACxB,IAAI,EAAE,UAAU,CAAC;IACjB,YAAY,EAAE,YAAY,CAAC;IAC3B,IAAI,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;IACtB,cAAc,EAAE,OAAO,CAAC,gBAAgB,CAAC,CAAC;IAC1C,OAAO,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC;IAC5B,UAAU,EAAE,OAAO,CAAC,YAAY,CAAC,CAAC;IAClC,MAAM,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC;IAC1B,eAAe,EAAE,OAAO,CAAC,iBAAiB,CAAC,CAAC;CAC7C;AAED,eAAO,MAAM,MAAM,gGAShB,SAAS,KAAG,OAiCd,CAAC;AAEF,eAAO,MAAM,aAAa,SAClB,OAAO,CAAC,MAAM,CAAC,KACpB,KACD,OAAO,EACL,IAAI,GACJ,KAAK,GACL,MAAM,GACN,oBAAoB,GACpB,MAAM,GACN,MAAM,GACN,SAAS,GACT,YAAY,GACZ,QAAQ,GACR,gBAAgB,GAChB,iBAAiB,CAyRnB,CAAC"}
+{"version":3,"file":"inject.d.ts","sourceRoot":"","sources":["../src/inject.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AACtC,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AACtC,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAEtC,MAAM,WAAW,SAAS;IACxB,IAAI,EAAE,UAAU,CAAC;IACjB,YAAY,EAAE,YAAY,CAAC;IAC3B,IAAI,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;IACtB,cAAc,EAAE,OAAO,CAAC,gBAAgB,CAAC,CAAC;IAC1C,OAAO,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC;IAC5B,UAAU,EAAE,OAAO,CAAC,YAAY,CAAC,CAAC;IAClC,MAAM,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC;IAC1B,eAAe,EAAE,OAAO,CAAC,iBAAiB,CAAC,CAAC;CAC7C;AAED,eAAO,MAAM,MAAM,gGAShB,SAAS,KAAG,OAiCd,CAAC;AAEF,eAAO,MAAM,aAAa,SAClB,OAAO,CAAC,MAAM,CAAC,KACpB,KACD,OAAO,EACL,IAAI,GACJ,KAAK,GACL,MAAM,GACN,oBAAoB,GACpB,MAAM,GACN,MAAM,GACN,SAAS,GACT,YAAY,GACZ,QAAQ,GACR,gBAAgB,GAChB,iBAAiB,CA2RnB,CAAC"}

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

@@ -0,0 +1,4 @@
+import { Features } from '@onekeyfe/hd-transport';
+import type { CommonParams, Response } from '../params';
+export declare function deviceUnlock(connectId: string, params?: CommonParams): Response<Features>;
+//# sourceMappingURL=deviceUnlock.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"deviceUnlock.d.ts","sourceRoot":"","sources":["../../../src/types/api/deviceUnlock.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAClD,OAAO,KAAK,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAExD,MAAM,CAAC,OAAO,UAAU,YAAY,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,YAAY,GAAG,QAAQ,CAAC,QAAQ,CAAC,CAAC"}

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

@@ -31,6 +31,7 @@ import { deviceSupportFeatures } from './deviceSupportFeatures';
 import { deviceFullyUploadResource } from './deviceFullyUploadResource';
 import { deviceUpdateBootloader } from './deviceUpdateBootloader';
 import { deviceLock } from './deviceLock';
+import { deviceUnlock } from './deviceUnlock';
 import { deviceCancel } from './deviceCancel';
 import { getNextU2FCounter } from './getNextU2FCounter';
 import { setU2FCounter } from './setU2FCounter';
@@ -166,6 +167,7 @@ export type CoreApi = {
     deviceFullyUploadResource: typeof deviceFullyUploadResource;
     deviceUpdateBootloader: typeof deviceUpdateBootloader;
     deviceLock: typeof deviceLock;
+    deviceUnlock: typeof deviceUnlock;
     deviceCancel: typeof deviceCancel;
     getNextU2FCounter: typeof getNextU2FCounter;
     setU2FCounter: typeof setU2FCounter;