@onekeyfe/hd-core 1.1.3-alpha.3 → 1.1.3

package/dist/index.js

@@ -26,82 +26,6 @@ var ByteBuffer__default = /*#__PURE__*/_interopDefaultLegacy(ByteBuffer);
 var BigNumber__default = /*#__PURE__*/_interopDefaultLegacy(BigNumber);
 var JSZip__default = /*#__PURE__*/_interopDefaultLegacy(JSZip);
 
-/******************************************************************************
-Copyright (c) Microsoft Corporation.
-
-Permission to use, copy, modify, and/or distribute this software for any
-purpose with or without fee is hereby granted.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
-REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
-INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
-LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
-***************************************************************************** */
-
-function __rest(s, e) {
-    var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
-        t[p] = s[p];
-    if (s != null && typeof Object.getOwnPropertySymbols === "function")
-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
-                t[p[i]] = s[p[i]];
-        }
-    return t;
-}
-
-function __awaiter(thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-}
-
-function __values(o) {
-    var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
-    if (m) return m.call(o);
-    if (o && typeof o.length === "number") return {
-        next: function () {
-            if (o && i >= o.length) o = void 0;
-            return { value: o && o[i++], done: !o };
-        }
-    };
-    throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
-}
-
-function __asyncValues(o) {
-    if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
-    var m = o[Symbol.asyncIterator], i;
-    return m ? m.call(o) : (o = typeof __values === "function" ? __values(o) : o[Symbol.iterator](), i = {}, verb("next"), verb("throw"), verb("return"), i[Symbol.asyncIterator] = function () { return this; }, i);
-    function verb(n) { i[n] = o[n] && function (v) { return new Promise(function (resolve, reject) { v = o[n](v), settle(resolve, reject, v.done, v.value); }); }; }
-    function settle(resolve, reject, d, v) { Promise.resolve(v).then(function(v) { resolve({ value: v, done: d }); }, reject); }
-}
-
-typeof SuppressedError === "function" ? SuppressedError : function (error, suppressed, message) {
-    var e = new Error(message);
-    return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
-};
-
-const callbackManager = new Map();
-const generateCallbackId = () => `callback_${Date.now()}_${Math.random().toString(36).substring(2, 11)}`;
-const registerCallback = (id, callback) => {
-    callbackManager.set(id, callback);
-};
-const executeCallback = (id, ...args) => {
-    const callback = callbackManager.get(id);
-    if (callback) {
-        callback(...args);
-    }
-};
-const cleanupCallback = (id) => {
-    callbackManager.delete(id);
-};
 const inject = ({ call, cancel, dispose, eventEmitter, init, updateSettings, switchTransport, uiResponse, }) => {
     const api = Object.assign({ on: (type, fn) => {
             eventEmitter.on(type, fn);
@@ -153,20 +77,6 @@ const createCoreApi = (call) => ({
     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' })),
-    allNetworkGetAddressByLoop: (connectId, deviceId, params) => {
-        const { onLoopItemResponse, onAllItemsResponse } = params, restParams = __rest(params, ["onLoopItemResponse", "onAllItemsResponse"]);
-        const callbackId = generateCallbackId();
-        registerCallback(callbackId, onLoopItemResponse);
-        const callbackIdFinish = generateCallbackId();
-        registerCallback(callbackIdFinish, (data) => {
-            onAllItemsResponse === null || onAllItemsResponse === void 0 ? void 0 : onAllItemsResponse(data);
-            cleanupCallback(callbackIdFinish);
-            cleanupCallback(callbackId);
-        });
-        return call(Object.assign(Object.assign({}, restParams), { connectId,
-            deviceId, method: 'allNetworkGetAddressByLoop', callbackId,
-            callbackIdFinish }));
-    },
     evmGetAddress: (connectId, deviceId, params) => call(Object.assign(Object.assign({}, params), { connectId, deviceId, method: 'evmGetAddress' })),
     evmGetPublicKey: (connectId, deviceId, params) => call(Object.assign(Object.assign({}, params), { connectId, deviceId, method: 'evmGetPublicKey' })),
     evmSignMessage: (connectId, deviceId, params) => call(Object.assign(Object.assign({}, params), { connectId, deviceId, method: 'evmSignMessage' })),
@@ -774,6 +684,68 @@ const topLevelInject = () => {
     return api;
 };
 
+/******************************************************************************
+Copyright (c) Microsoft Corporation.
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
+REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
+INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
+OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
+***************************************************************************** */
+
+function __rest(s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+}
+
+function __awaiter(thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+}
+
+function __values(o) {
+    var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
+    if (m) return m.call(o);
+    if (o && typeof o.length === "number") return {
+        next: function () {
+            if (o && i >= o.length) o = void 0;
+            return { value: o && o[i++], done: !o };
+        }
+    };
+    throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
+}
+
+function __asyncValues(o) {
+    if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
+    var m = o[Symbol.asyncIterator], i;
+    return m ? m.call(o) : (o = typeof __values === "function" ? __values(o) : o[Symbol.iterator](), i = {}, verb("next"), verb("throw"), verb("return"), i[Symbol.asyncIterator] = function () { return this; }, i);
+    function verb(n) { i[n] = o[n] && function (v) { return new Promise(function (resolve, reject) { v = o[n](v), settle(resolve, reject, v.done, v.value); }); }; }
+    function settle(resolve, reject, d, v) { Promise.resolve(v).then(function(v) { resolve({ value: v, done: d }); }, reject); }
+}
+
+typeof SuppressedError === "function" ? SuppressedError : function (error, suppressed, message) {
+    var e = new Error(message);
+    return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
+};
+
 const LOG_EVENT = 'LOG_EVENT';
 const LOG = {
     OUTPUT: 'log-output',
@@ -25826,7 +25798,6 @@ const IFRAME = {
     CALL: 'iframe-call',
     CANCEL: 'iframe-cancel',
     SWITCH_TRANSPORT: 'iframe-switch-transport',
-    CALLBACK: 'iframe-callback',
 };
 const createIFrameMessage = (type, payload) => ({
     event: UI_EVENT,
@@ -26720,15 +26691,6 @@ class Device extends events.exports {
             const env = DataManager.getSettings('env');
             if ((this.isUsedHere() && !this.keepSession && this.mainId) ||
                 (this.mainId && DataManager.isBleConnect(env))) {
-                if (this.pendingCallbackPromise) {
-                    try {
-                        Log$a.debug('Waiting for callback tasks to complete before releasing device (in release method)');
-                        yield this.pendingCallbackPromise.promise;
-                    }
-                    catch (error) {
-                        Log$a.error('Error waiting for callback tasks in release method:', error);
-                    }
-                }
                 if (this.commands) {
                     this.commands.dispose(false);
                     if (this.commands.callPromise) {
@@ -27109,46 +27071,6 @@ class Device extends events.exports {
             return res.message;
         });
     }
-    supportUnlockVersionRange() {
-        return {
-            pro: {
-                min: '4.15.0',
-            },
-        };
-    }
-    unlockDevice() {
-        var _a;
-        return __awaiter(this, void 0, void 0, function* () {
-            const firmwareVersion = (_a = getDeviceFirmwareVersion(this.features)) === null || _a === void 0 ? void 0 : _a.join('.');
-            const versionRange = getMethodVersionRange(this.features, type => this.supportUnlockVersionRange()[type]);
-            if (versionRange && semver__default["default"].gte(firmwareVersion, versionRange.min)) {
-                const res = yield this.commands.typedCall('UnLockDevice', 'UnLockDeviceResponse');
-                if (this.features) {
-                    this.features.unlocked = res.message.unlocked == null ? null : res.message.unlocked;
-                    this.features.unlocked_attach_pin =
-                        res.message.unlocked_attach_pin == null ? undefined : res.message.unlocked_attach_pin;
-                    this.features.passphrase_protection =
-                        res.message.passphrase_protection == null ? null : res.message.passphrase_protection;
-                    return Promise.resolve(this.features);
-                }
-                const featuresRes = yield this.commands.typedCall('GetFeatures', 'Features');
-                this._updateFeatures(featuresRes.message);
-                return Promise.resolve(featuresRes.message);
-            }
-            const { type } = yield this.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, 'unlock device error');
-            }
-            const res = yield this.commands.typedCall('GetFeatures', 'Features');
-            this._updateFeatures(res.message);
-            return Promise.resolve(res.message);
-        });
-    }
     checkPassphraseStateSafety(passphraseState, useEmptyPassphrase, skipPassphraseCheck) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.features)
@@ -28721,9 +28643,42 @@ class DeviceUnlock extends BaseMethod {
     init() {
         this.useDevicePassphraseState = false;
     }
+    supportUnlockVersionRange() {
+        return {
+            pro: {
+                min: '4.15.0',
+            },
+        };
+    }
     run() {
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            return this.device.unlockDevice();
+            const firmwareVersion = (_a = getDeviceFirmwareVersion(this.device.features)) === null || _a === void 0 ? void 0 : _a.join('.');
+            const versionRange = getMethodVersionRange(this.device.features, type => this.supportUnlockVersionRange()[type]);
+            if (versionRange && semver__default["default"].gte(firmwareVersion, versionRange.min)) {
+                const res = yield this.device.commands.typedCall('UnLockDevice', 'UnLockDeviceResponse');
+                if (this.device.features) {
+                    this.device.features.unlocked = res.message.unlocked == null ? null : res.message.unlocked;
+                    this.device.features.unlocked_attach_pin =
+                        res.message.unlocked_attach_pin == null ? undefined : res.message.unlocked_attach_pin;
+                    this.device.features.passphrase_protection =
+                        res.message.passphrase_protection == null ? null : res.message.passphrase_protection;
+                    return Promise.resolve(this.device.features);
+                }
+                const featuresRes = yield this.device.commands.typedCall('GetFeatures', 'Features');
+                return Promise.resolve(featuresRes.message);
+            }
+            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);
         });
     }
 }
@@ -30086,17 +30041,12 @@ const networkConfigMap = {
         methodName: 'neoGetAddress',
     },
 };
-class AllNetworkGetAddressBase extends BaseMethod {
-    constructor() {
-        super(...arguments);
-        this.abortController = null;
-    }
+class AllNetworkGetAddress extends BaseMethod {
     init() {
-        var _a, _b;
         this.checkDeviceId = true;
         this.allowDeviceMode = [...this.allowDeviceMode, UI_REQUEST.NOT_INITIALIZE];
         validateParams(this.payload, [{ name: 'bundle', type: 'array' }]);
-        (_b = (_a = this.payload) === null || _a === void 0 ? void 0 : _a.bundle) === null || _b === void 0 ? void 0 : _b.forEach((batch) => {
+        this.payload.bundle.forEach((batch) => {
             validateParams(batch, [
                 { name: 'path', required: true },
                 { name: 'network', type: 'string', required: true },
@@ -30136,24 +30086,6 @@ class AllNetworkGetAddressBase extends BaseMethod {
             try {
                 method.init();
                 (_a = method.setDevice) === null || _a === void 0 ? void 0 : _a.call(method, this.device);
-                method.context = this.context;
-                const onSignalAbort = () => {
-                    var _a;
-                    console.log('=====>>>>> onSignalAbort');
-                    (_a = this.abortController) === null || _a === void 0 ? void 0 : _a.abort(hdShared.HardwareErrorCodeMessage[hdShared.HardwareErrorCode.RepeatUnlocking]);
-                };
-                const _onDeviceButtonHandler = (...[device, request]) => {
-                    if (request.code === 'ButtonRequest_PinEntry' ||
-                        request.code === 'ButtonRequest_AttachPin') {
-                        onSignalAbort();
-                    }
-                    else {
-                        onDeviceButtonHandler(device, request);
-                    }
-                };
-                this.device.on(DEVICE.BUTTON, _onDeviceButtonHandler);
-                this.device.on(DEVICE.PIN, onSignalAbort);
-                this.device.on(DEVICE.PASSPHRASE, onSignalAbort);
                 preCheckDeviceSupport(this.device, method);
                 const response = yield method.run();
                 if (!Array.isArray(response) || response.length === 0) {
@@ -30180,20 +30112,45 @@ class AllNetworkGetAddressBase extends BaseMethod {
         });
     }
     run() {
+        var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
-            const passphraseStateSafety = yield this.device.checkPassphraseStateSafety(this.payload.passphraseState, this.payload.useEmptyPassphrase);
-            if (!passphraseStateSafety) {
-                DevicePool.clearDeviceCache(this.payload.connectId);
-                return Promise.reject(hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.DeviceCheckPassphraseStateError));
-            }
-            this.postMessage(createUiMessage(UI_REQUEST.CLOSE_UI_PIN_WINDOW));
-            this.abortController = new AbortController();
-            return this.getAllNetworkAddress().catch(e => {
-                if (e instanceof hdShared.HardwareError && e.errorCode === hdShared.HardwareErrorCode.RepeatUnlocking) {
-                    throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RepeatUnlocking, e.message);
+            const responses = [];
+            const resultMap = {};
+            const { bundle } = this.payload;
+            const methodGroups = bundle
+                .map((param, index) => this.generateMethodName({
+                network: param.network,
+                payload: param,
+                originalIndex: index,
+            }))
+                .reduce((acc, cur) => {
+                if (!acc[cur.methodName]) {
+                    acc[cur.methodName] = [];
                 }
-                throw e;
-            });
+                acc[cur.methodName].push(cur);
+                return acc;
+            }, {});
+            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, 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 (let i = 0; i < bundle.length; i++) {
+                responses.push(resultMap[i]);
+            }
+            return Promise.resolve(responses);
         });
     }
 }
@@ -30214,7 +30171,10 @@ function handleSkippableHardwareError(e, device, method) {
     let error;
     if (e instanceof hdShared.HardwareError && e.errorCode !== hdShared.HardwareErrorCode.RuntimeError) {
         const { errorCode } = e;
-        if (errorCode === hdShared.HardwareErrorCode.CallMethodNeedUpgradeFirmware) {
+        if (errorCode === hdShared.HardwareErrorCode.CallMethodInvalidParameter) {
+            error = e;
+        }
+        else if (errorCode === hdShared.HardwareErrorCode.CallMethodNeedUpgradeFirmware) {
             error = e;
         }
         else if (errorCode === hdShared.HardwareErrorCode.DeviceNotSupportMethod) {
@@ -30240,164 +30200,6 @@ function handleSkippableHardwareError(e, device, method) {
     return error;
 }
 
-class AllNetworkGetAddress extends AllNetworkGetAddressBase {
-    getAllNetworkAddress() {
-        var _a, _b, _c, _d;
-        return __awaiter(this, void 0, void 0, function* () {
-            const responses = [];
-            const resultMap = {};
-            const { bundle } = this.payload;
-            const methodGroups = bundle
-                .map((param, index) => this.generateMethodName({
-                network: param.network,
-                payload: param,
-                originalIndex: index,
-            }))
-                .reduce((acc, cur) => {
-                if (!acc[cur.methodName]) {
-                    acc[cur.methodName] = [];
-                }
-                acc[cur.methodName].push(cur);
-                return acc;
-            }, {});
-            let i = 0;
-            for (const [methodName, params] of Object.entries(methodGroups)) {
-                const methodParams = {
-                    bundle: params.map(param => (Object.assign({}, param.params))),
-                };
-                if ((_a = this.abortController) === null || _a === void 0 ? void 0 : _a.signal.aborted) {
-                    throw new Error(hdShared.HardwareErrorCodeMessage[hdShared.HardwareErrorCode.RepeatUnlocking]);
-                }
-                const response = yield this.callMethod(methodName, methodParams);
-                if ((_b = this.abortController) === null || _b === void 0 ? void 0 : _b.signal.aborted) {
-                    throw new Error(hdShared.HardwareErrorCodeMessage[hdShared.HardwareErrorCode.RepeatUnlocking]);
-                }
-                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 (((_d = (_c = this.payload) === null || _c === void 0 ? void 0 : _c.bundle) === null || _d === void 0 ? void 0 : _d.length) > 1) {
-                    const progress = Math.round(((i + 1) / this.payload.bundle.length) * 100);
-                    this.postMessage(createUiMessage(UI_REQUEST.DEVICE_PROGRESS, { progress }));
-                }
-                i++;
-            }
-            for (let i = 0; i < bundle.length; i++) {
-                responses.push(resultMap[i]);
-            }
-            this.abortController = null;
-            return Promise.resolve(responses);
-        });
-    }
-}
-
-class AllNetworkGetAddressByLoop extends AllNetworkGetAddressBase {
-    getAllNetworkAddress() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const { callbackId, callbackIdFinish } = this.payload;
-            if (!callbackId) {
-                throw new Error('callbackId is required');
-            }
-            if (!callbackIdFinish) {
-                throw new Error('callbackIdFinish is required');
-            }
-            const bundle = this.payload.bundle || [this.payload];
-            const callbackPromise = this.processCallbacksInBackground(bundle, callbackId, callbackIdFinish);
-            this.device.pendingCallbackPromise = hdShared.createDeferred(callbackPromise);
-            if (this.context && this.payload.connectId) {
-                this.context.registerCallbackTask(this.payload.connectId, this.device.pendingCallbackPromise);
-            }
-            return Promise.resolve([]);
-        });
-    }
-    processCallbacksInBackground(bundle, callbackId, callbackIdFinish) {
-        var _a, _b, _c;
-        return __awaiter(this, void 0, void 0, function* () {
-            try {
-                const allResults = [];
-                for (let i = 0; i < bundle.length; i++) {
-                    const item = bundle[i];
-                    if ((_a = this.abortController) === null || _a === void 0 ? void 0 : _a.signal.aborted) {
-                        throw new Error(hdShared.HardwareErrorCodeMessage[hdShared.HardwareErrorCode.RepeatUnlocking]);
-                    }
-                    const methodParams = this.generateMethodName({
-                        network: item.network,
-                        payload: item,
-                        originalIndex: i,
-                    });
-                    const singleMethodParams = {
-                        bundle: [methodParams.params],
-                    };
-                    const response = yield this.callMethod(methodParams.methodName, singleMethodParams);
-                    if ((_b = this.abortController) === null || _b === void 0 ? void 0 : _b.signal.aborted) {
-                        throw new Error(hdShared.HardwareErrorCodeMessage[hdShared.HardwareErrorCode.RepeatUnlocking]);
-                    }
-                    const singleResult = Object.assign(Object.assign({}, item), response[0]);
-                    allResults.push(singleResult);
-                    this.sendItemCallback(callbackId, singleResult, i);
-                }
-                this.sendFinishCallback({
-                    callbackId: callbackIdFinish,
-                    data: allResults,
-                });
-            }
-            catch (error) {
-                let errorCode = error.errorCode || error.code;
-                let errorMessage = error.message;
-                if (error instanceof hdShared.HardwareError) {
-                    errorCode = error.errorCode;
-                    errorMessage = error.message;
-                }
-                else if (error.message === hdShared.HardwareErrorCodeMessage[hdShared.HardwareErrorCode.RepeatUnlocking]) {
-                    errorCode = hdShared.HardwareErrorCode.RepeatUnlocking;
-                    errorMessage = error.message;
-                }
-                else {
-                    const hardwareError = hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, error.message);
-                    errorCode = hardwareError.errorCode;
-                    errorMessage = hardwareError.message;
-                }
-                this.sendFinishCallback({
-                    callbackId: callbackIdFinish,
-                    error: {
-                        success: false,
-                        payload: {
-                            error: errorMessage,
-                            code: errorCode,
-                        },
-                    },
-                });
-            }
-            finally {
-                (_c = this.context) === null || _c === void 0 ? void 0 : _c.cancelCallbackTasks(this.payload.connectId);
-                this.abortController = null;
-            }
-        });
-    }
-    sendFinishCallback({ callbackId, data, error, }) {
-        this.postMessage({
-            event: IFRAME.CALLBACK,
-            type: IFRAME.CALLBACK,
-            payload: {
-                callbackId,
-                data,
-                error,
-            },
-        });
-    }
-    sendItemCallback(callbackId, data, itemIndex) {
-        this.postMessage({
-            event: IFRAME.CALLBACK,
-            type: IFRAME.CALLBACK,
-            payload: {
-                callbackId,
-                data: Object.assign(Object.assign({}, data), { index: itemIndex }),
-            },
-        });
-    }
-}
-
 var bitcoin = [
 	{
 		name: "Bitcoin",
@@ -30972,15 +30774,6 @@ class BTCGetPublicKey extends BaseMethod {
                 }
             }
             catch (error) {
-                if (error instanceof hdShared.HardwareError) {
-                    const { errorCode } = error;
-                    if (errorCode === hdShared.HardwareErrorCode.PinCancelled ||
-                        errorCode === hdShared.HardwareErrorCode.ActionCancelled ||
-                        errorCode === hdShared.HardwareErrorCode.ResponseUnexpectTypeError ||
-                        errorCode === hdShared.HardwareErrorCode.PinInvalid) {
-                        throw error;
-                    }
-                }
                 responses = [];
                 for (let i = 0; i < this.params.length; i++) {
                     const param = this.params[i];
@@ -31820,7 +31613,6 @@ class EVMGetPublicKey extends BaseMethod {
     constructor() {
         super(...arguments);
         this.hasBundle = false;
-        this.confirmShowOnOneKey = false;
         this.useBatch = false;
     }
     init() {
@@ -31828,8 +31620,7 @@ class EVMGetPublicKey extends BaseMethod {
         this.checkDeviceId = true;
         this.allowDeviceMode = [...this.allowDeviceMode, UI_REQUEST.NOT_INITIALIZE];
         this.hasBundle = !!((_a = this.payload) === null || _a === void 0 ? void 0 : _a.bundle);
-        this.confirmShowOnOneKey = (_c = (_b = this.payload) === null || _b === void 0 ? void 0 : _b.bundle) === null || _c === void 0 ? void 0 : _c.some((item) => !!item.showOnOneKey);
-        this.useBatch = !this.confirmShowOnOneKey && this.hasBundle && this.payload.useBatch;
+        this.useBatch = (_c = (_b = this.payload) === null || _b === void 0 ? void 0 : _b.bundle) === null || _c === void 0 ? void 0 : _c.every((item) => item.showOnOneKey !== true);
         const payload = this.hasBundle ? this.payload : { bundle: [this.payload] };
         validateParams(payload, [{ name: 'bundle', type: 'array' }]);
         this.params = [];
@@ -31865,7 +31656,7 @@ class EVMGetPublicKey extends BaseMethod {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
             const responses = [];
-            if (this.useBatch && supportBatchPublicKey((_a = this.device) === null || _a === void 0 ? void 0 : _a.features)) {
+            if (this.useBatch && this.hasBundle && supportBatchPublicKey((_a = this.device) === null || _a === void 0 ? void 0 : _a.features)) {
                 try {
                     const res = yield batchGetPublickeys(this.device, this.params, 'secp256k1', 60, {
                         includeNode: false,
@@ -38322,7 +38113,6 @@ var ApiMethods = /*#__PURE__*/Object.freeze({
     promptWebDeviceAccess: PromptWebDeviceAccess,
     cipherKeyValue: CipherKeyValue,
     allNetworkGetAddress: AllNetworkGetAddress,
-    allNetworkGetAddressByLoop: AllNetworkGetAddressByLoop,
     btcGetAddress: BTCGetAddress,
     btcGetPublicKey: BTCGetPublicKey,
     btcSignMessage: BTCSignMessage,
@@ -38535,7 +38325,6 @@ const Log$1 = getLogger(exports.LoggerNames.Core);
 class RequestQueue {
     constructor() {
         this.requestQueue = new Map();
-        this.pendingCallbackTasks = new Map();
         this.generateRequestId = (method) => {
             if (method && method.responseID != null) {
                 return method.responseID;
@@ -38612,28 +38401,6 @@ class RequestQueue {
     releaseTask(requestId) {
         this.requestQueue.delete(requestId);
     }
-    registerPendingCallbackTask(connectId, callbackPromise) {
-        this.pendingCallbackTasks.set(connectId, callbackPromise);
-        callbackPromise.promise.finally(() => {
-            Log$1.debug(`Callback task completed for connectId: ${connectId}`);
-            this.pendingCallbackTasks.delete(connectId);
-        });
-    }
-    waitForPendingCallbackTasks(connectId) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const pendingTask = this.pendingCallbackTasks.get(connectId);
-            if (pendingTask) {
-                Log$1.debug(`Waiting for pending callback task to complete for connectId: ${connectId}`);
-                yield pendingTask.promise;
-            }
-        });
-    }
-    cancelCallbackTasks(connectId) {
-        const pendingTask = this.pendingCallbackTasks.get(connectId);
-        if (pendingTask) {
-            pendingTask.resolve();
-        }
-    }
 }
 
 const getMutex = () => {
@@ -38756,9 +38523,6 @@ const onCallDevice = (context, message, method) => __awaiter(void 0, void 0, voi
         Log.debug('passphrase state change, clear device cache');
         DevicePool.clearDeviceCache(method.payload.connectId);
     }
-    if (method.connectId) {
-        yield context.waitForCallbackTasks(method.connectId);
-    }
     yield waitForPendingPromise(getPrePendingCallPromise, setPrePendingCallPromise);
     const task = requestQueue.createTask(method);
     let device;
@@ -38782,7 +38546,6 @@ const onCallDevice = (context, message, method) => __awaiter(void 0, void 0, voi
     }
     Log.debug('Call API - setDevice: ', device.mainId);
     (_b = method.setDevice) === null || _b === void 0 ? void 0 : _b.call(method, device);
-    method.context = context;
     device.on(DEVICE.PIN, onDevicePinHandler);
     device.on(DEVICE.BUTTON, onDeviceButtonHandler);
     device.on(DEVICE.PASSPHRASE, message.payload.useEmptyPassphrase ? onEmptyPassphraseHandler : onDevicePassphraseHandler);
@@ -38790,9 +38553,6 @@ const onCallDevice = (context, message, method) => __awaiter(void 0, void 0, voi
     device.on(DEVICE.FEATURES, onDeviceFeaturesHandler);
     device.on(DEVICE.SELECT_DEVICE_IN_BOOTLOADER_FOR_WEB_DEVICE, onSelectDeviceInBootloaderForWebDeviceHandler);
     try {
-        if (method.connectId) {
-            yield context.waitForCallbackTasks(method.connectId);
-        }
         yield waitForPendingPromise(getPrePendingCallPromise, setPrePendingCallPromise);
         const inner = () => __awaiter(void 0, void 0, void 0, function* () {
             var _c, _d, _e, _f, _g;
@@ -39130,7 +38890,6 @@ const cancel = (context, connectId) => {
     const { requestQueue, setPrePendingCallPromise } = context;
     if (connectId) {
         try {
-            requestQueue.cancelCallbackTasks(connectId);
             const requestIds = requestQueue.getRequestTasksId();
             Log.debug(`Cancel Api connect requestQueues: length:${requestIds.length} requestIds:${requestIds.join(',')}`);
             const canceledDevices = [];
@@ -39311,11 +39070,6 @@ class Core extends events.exports {
             setPrePendingCallPromise: (promise) => {
                 this.prePendingCallPromise = promise;
             },
-            registerCallbackTask: (connectId, callbackPromise) => {
-                this.requestQueue.registerPendingCallbackTask(connectId, callbackPromise);
-            },
-            waitForCallbackTasks: (connectId) => this.requestQueue.waitForPendingCallbackTasks(connectId),
-            cancelCallbackTasks: (connectId) => this.requestQueue.cancelCallbackTasks(connectId),
         };
     }
     handleMessage(message) {
@@ -39357,11 +39111,6 @@ class Core extends events.exports {
                     cancel(this.getCoreContext(), message.payload.connectId);
                     break;
                 }
-                case IFRAME.CALLBACK: {
-                    Log.log('callback message: ', message);
-                    postMessage(message);
-                    break;
-                }
             }
             return Promise.resolve(message);
         });
@@ -39460,7 +39209,6 @@ exports.UI_REQUEST = UI_REQUEST;
 exports.UI_RESPONSE = UI_RESPONSE;
 exports.checkNeedUpdateBootForClassicAndMini = checkNeedUpdateBootForClassicAndMini;
 exports.checkNeedUpdateBootForTouch = checkNeedUpdateBootForTouch;
-exports.cleanupCallback = cleanupCallback;
 exports.corsValidator = corsValidator;
 exports.createDeviceMessage = createDeviceMessage;
 exports.createErrorMessage = createErrorMessage;
@@ -39472,7 +39220,6 @@ exports.createUiMessage = createUiMessage;
 exports.createUiResponse = createUiResponse;
 exports["default"] = HardwareSdk;
 exports.enableLog = enableLog;
-exports.executeCallback = executeCallback;
 exports.getDeviceBLEFirmwareVersion = getDeviceBLEFirmwareVersion;
 exports.getDeviceBleName = getDeviceBleName;
 exports.getDeviceBoardloaderVersion = getDeviceBoardloaderVersion;