@onekeyfe/hd-core 1.0.12-alpha.2 → 1.0.13

package/dist/index.js

@@ -11782,6 +11782,10 @@ var nested$1 = {
 				rule: "repeated",
 				type: "string",
 				id: 20
+			},
+			jetton_amount_bytes: {
+				type: "bytes",
+				id: 21
 			}
 		}
 	},
@@ -24978,6 +24982,7 @@ const UI_REQUEST$1 = {
     REQUEST_PASSPHRASE: 'ui-request_passphrase',
     REQUEST_PASSPHRASE_ON_DEVICE: 'ui-request_passphrase_on_device',
     CLOSE_UI_WINDOW: 'ui-close_window',
+    DEVICE_PROGRESS: 'ui-device_progress',
     BLUETOOTH_PERMISSION: 'ui-bluetooth_permission',
     BLUETOOTH_CHARACTERISTIC_NOTIFY_CHANGE_FAILURE: 'ui-bluetooth_characteristic_notify_change_failure',
     LOCATION_PERMISSION: 'ui-location_permission',
@@ -25613,6 +25618,7 @@ const UI_REQUEST = {
     NOT_USE_ONEKEY_DEVICE: 'ui-device_please_use_onekey_device',
     FIRMWARE_TIP: 'ui-firmware-tip',
     PREVIOUS_ADDRESS_RESULT: 'ui-previous_address_result',
+    DEVICE_PROGRESS: 'ui-device_progress',
 };
 
 const parseRunOptions = (options) => {
@@ -28099,14 +28105,6 @@ const networkConfigMap = {
     },
     sui: {
         methodName: 'suiGetAddress',
-        dependOnMethodName: ['suiGetPublicKey'],
-        getParams: (baseParams) => {
-            const { path, showOnOneKey } = baseParams;
-            return {
-                path,
-                showOnOneKey,
-            };
-        },
     },
     fil: {
         methodName: 'filecoinGetAddress',
@@ -28227,7 +28225,7 @@ class AllNetworkGetAddress extends BaseMethod {
         };
     }
     callMethod(methodName, params, baseParams) {
-        var _a;
+        var _a, _b, _c;
         return __awaiter(this, void 0, void 0, function* () {
             const method = findMethod({
                 event: IFRAME.CALL,
@@ -28241,17 +28239,27 @@ class AllNetworkGetAddress extends BaseMethod {
             let result;
             try {
                 const response = yield method.run();
-                result = Object.assign(Object.assign({}, baseParams), { success: true, error: response.error, payload: response });
+                result = Object.assign(Object.assign({}, baseParams), { success: true, payload: Object.assign(Object.assign({}, response), { error: (_b = response.payload) === null || _b === void 0 ? void 0 : _b.error, errorCode: (_c = response.payload) === null || _c === void 0 ? void 0 : _c.errorCode }) });
             }
             catch (e) {
-                const errorMessage = e instanceof Error ? handleHardwareError(e, this.device, method) : 'Unknown error';
-                result = Object.assign(Object.assign({}, baseParams), { success: false, error: errorMessage });
+                const error = handleSkippableHardwareError(e, this.device, method);
+                if (error) {
+                    result = Object.assign(Object.assign({}, baseParams), { success: false, payload: {
+                            error: error.message,
+                            code: error.errorCode,
+                            connectId: this.payload.connectId,
+                            deviceId: this.payload.deviceId,
+                        } });
+                }
+                else {
+                    throw e;
+                }
             }
             return result;
         });
     }
     run() {
-        var _a;
+        var _a, _b, _c, _d, _e;
         return __awaiter(this, void 0, void 0, function* () {
             const responses = [];
             for (let i = 0; i < this.payload.bundle.length; i++) {
@@ -28266,31 +28274,50 @@ class AllNetworkGetAddress extends BaseMethod {
                     dependOnMethodResults.push(response);
                 }
                 if (dependOnMethodResults.some(result => !result.success)) {
-                    responses.push(Object.assign(Object.assign({}, param), { success: false, error: (_a = dependOnMethodResults.find(result => !result.success)) === null || _a === void 0 ? void 0 : _a.error }));
+                    responses.push(Object.assign(Object.assign({}, param), { success: false, payload: (_a = dependOnMethodResults.find(result => !result.success)) === null || _a === void 0 ? void 0 : _a.payload }));
                     return Promise.resolve(responses);
                 }
                 const response = yield this.callMethod(methodName, params, param);
                 const dependOnPayloads = dependOnMethodResults.reduce((acc, cur) => Object.assign(acc, lodash.get(cur, 'payload', {})), {});
                 const result = Object.assign(Object.assign({}, response), { payload: Object.assign(Object.assign({}, response.payload), dependOnPayloads) });
                 responses.push(result);
+                if (((_c = (_b = this.payload) === null || _b === void 0 ? void 0 : _b.bundle) === null || _c === void 0 ? void 0 : _c.length) > 1) {
+                    const progress = Math.round(((i + 1) / ((_e = (_d = this.payload) === null || _d === void 0 ? void 0 : _d.bundle) === null || _e === void 0 ? void 0 : _e.length)) * 100);
+                    this.postMessage(createUiMessage(UI_REQUEST.DEVICE_PROGRESS, { progress }));
+                }
                 this.postPreviousAddressMessage(result);
             }
             return Promise.resolve(responses);
         });
     }
 }
-function handleHardwareError(e, device, method) {
-    let message = (e === null || e === void 0 ? void 0 : e.message) || '';
-    if (message.includes('Failure_UnexpectedMessage')) {
+function handleSkippableHardwareError(e, device, method) {
+    let error = undefined;
+    if (e.message.includes('Failure_UnexpectedMessage')) {
         const versionRange = getMethodVersionRange(device.features, type => method.getVersionRange()[type]);
         const currentVersion = getDeviceFirmwareVersion(device.features).join('.');
         if (versionRange &&
             semver__default["default"].valid(versionRange.min) &&
             semver__default["default"].lt(currentVersion, versionRange.min)) {
-            message = hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.CallMethodNeedUpgradeFirmware, `Device firmware version is too low, please update to ${versionRange.min}`, { current: currentVersion, require: versionRange.min }).message;
+            error = hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.CallMethodNeedUpgradeFirmware, `Device firmware version is too low, please update to ${versionRange.min}`, { current: currentVersion, require: versionRange.min });
+        }
+        else {
+            error = hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.CallMethodNotResponse, e.message);
         }
     }
-    return message;
+    else if (e.message.includes('Forbidden key path')) {
+        error = hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.CallMethodInvalidParameter, e.message);
+    }
+    else if (e.message.includes('DeviceCheckPassphraseStateError')) {
+        error = hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.DeviceCheckPassphraseStateError, e.message);
+    }
+    else if (e instanceof hdShared.HardwareError) {
+        const errorCode = e.errorCode;
+        if (errorCode === hdShared.HardwareErrorCode.CallMethodInvalidParameter) {
+            error = e;
+        }
+    }
+    return error;
 }
 
 var bitcoin = [
@@ -29552,9 +29579,10 @@ class EVMGetPublicKey extends BaseMethod {
                 });
                 const result = res.message.public_keys.map((publicKey, index) => ({
                     path: serializedPath(this.params[index].address_n),
+                    pub: publicKey,
                     publicKey,
                 }));
-                validateResult(responses, ['publicKey'], {
+                validateResult(responses, ['pub'], {
                     expectedLength: this.params.length,
                 });
                 return Promise.resolve(result);
@@ -29562,9 +29590,9 @@ class EVMGetPublicKey extends BaseMethod {
             for (let i = 0; i < this.params.length; i++) {
                 const param = this.params[i];
                 const res = yield this.getEvmPublicKey(param);
-                responses.push(Object.assign({ path: serializedPath(param.address_n), publicKey: res.message.node.public_key }, res.message));
+                responses.push(Object.assign({ path: serializedPath(param.address_n), pub: res.message.node.public_key, publicKey: res.message.node.public_key }, res.message));
             }
-            validateResult(responses, ['publicKey'], {
+            validateResult(responses, ['pub'], {
                 expectedLength: this.params.length,
             });
             return Promise.resolve(this.hasBundle ? responses : responses[0]);
@@ -31413,14 +31441,14 @@ class AptosGetAddress extends BaseMethod {
         this.shouldConfirm = false;
     }
     init() {
-        var _a;
+        var _a, _b;
         this.checkDeviceId = true;
         this.notAllowDeviceMode = [...this.notAllowDeviceMode, UI_REQUEST.INITIALIZE];
         this.hasBundle = !!((_a = this.payload) === null || _a === void 0 ? void 0 : _a.bundle);
         const payload = this.hasBundle ? this.payload : { bundle: [this.payload] };
-        this.shouldConfirm = this.hasBundle
-            ? this.payload.bundle.some((i) => !!i.showOnOneKey)
-            : false;
+        this.shouldConfirm =
+            this.payload.showOnOneKey ||
+                ((_b = this.payload.bundle) === null || _b === void 0 ? void 0 : _b.some((i) => !!i.showOnOneKey));
         validateParams(payload, [{ name: 'bundle', type: 'array' }]);
         this.params = [];
         payload.bundle.forEach((batch) => {
@@ -31451,39 +31479,56 @@ class AptosGetAddress extends BaseMethod {
         };
     }
     run() {
-        var _a;
+        var _a, _b, _c;
         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 this.device.commands.typedCall('BatchGetPublickeys', 'EcdsaPublicKeys', {
+            const supportsBatchPublicKey = supportBatchPublicKey((_a = this.device) === null || _a === void 0 ? void 0 : _a.features);
+            let responses = [];
+            if (supportsBatchPublicKey) {
+                const publicKeyRes = yield this.device.commands.typedCall('BatchGetPublickeys', 'EcdsaPublicKeys', {
                     paths: this.params,
                     ecdsa_curve_name: 'ed25519',
                 });
-                const result = res.message.public_keys.map((publicKey, index) => ({
-                    path: serializedPath(this.params[index].address_n),
-                    publicKey,
-                    address: this.publicKeyToAddress(publicKey),
-                }));
-                validateResult(result, ['address'], {
-                    expectedLength: this.params.length,
-                });
-                return Promise.resolve(result);
+                for (let i = 0; i < this.params.length; i++) {
+                    const param = this.params[i];
+                    const publicKey = publicKeyRes.message.public_keys[i];
+                    let address;
+                    if (this.shouldConfirm) {
+                        const addressRes = yield this.device.commands.typedCall('AptosGetAddress', 'AptosAddress', param);
+                        address = (_c = (_b = addressRes.message.address) === null || _b === void 0 ? void 0 : _b.toLowerCase()) !== null && _c !== void 0 ? _c : '';
+                    }
+                    else {
+                        address = this.publicKeyToAddress(publicKey);
+                    }
+                    const result = {
+                        path: serializedPath(param.address_n),
+                        address,
+                        publicKey,
+                        pub: publicKey,
+                    };
+                    if (this.shouldConfirm) {
+                        this.postPreviousAddressMessage(result);
+                    }
+                    responses.push(result);
+                }
             }
-            const responses = [];
-            for (let i = 0; i < this.params.length; i++) {
-                const param = this.params[i];
-                const res = yield this.device.commands.typedCall('AptosGetAddress', 'AptosAddress', Object.assign({}, param));
-                const { address } = res.message;
-                const result = {
-                    path: serializedPath(param.address_n),
-                    address: address === null || address === void 0 ? void 0 : address.toLowerCase(),
-                };
-                responses.push(result);
-                this.postPreviousAddressMessage(result);
+            else {
+                responses = yield Promise.all(this.params.map((param) => __awaiter(this, void 0, void 0, function* () {
+                    var _d, _e;
+                    const res = yield this.device.commands.typedCall('AptosGetAddress', 'AptosAddress', param);
+                    const result = {
+                        path: serializedPath(param.address_n),
+                        address: (_e = (_d = res.message.address) === null || _d === void 0 ? void 0 : _d.toLowerCase()) !== null && _e !== void 0 ? _e : '',
+                    };
+                    if (this.shouldConfirm) {
+                        this.postPreviousAddressMessage(result);
+                    }
+                    return result;
+                })));
             }
             validateResult(responses, ['address'], {
                 expectedLength: this.params.length,
             });
-            return Promise.resolve(this.hasBundle ? responses : responses[0]);
+            return this.hasBundle ? responses : responses[0];
         });
     }
 }
@@ -31530,9 +31575,10 @@ class AptosGetPublicKey extends BaseMethod {
             });
             const responses = res.message.public_keys.map((publicKey, index) => ({
                 path: serializedPath(this.params[index].address_n),
+                pub: publicKey,
                 publicKey,
             }));
-            validateResult(responses, ['publicKey'], {
+            validateResult(responses, ['pub'], {
                 expectedLength: this.params.length,
             });
             return Promise.resolve(this.hasBundle ? responses : responses[0]);
@@ -31841,9 +31887,10 @@ class CosmosGetPublicKey extends BaseMethod {
             });
             const responses = res.message.public_keys.map((publicKey, index) => ({
                 path: serializedPath(this.params[index].address_n),
+                pub: publicKey,
                 publicKey,
             }));
-            validateResult(responses, ['publicKey'], {
+            validateResult(responses, ['pub'], {
                 expectedLength: this.params.length,
             });
             return Promise.resolve(this.hasBundle ? responses : responses[0]);
@@ -31931,7 +31978,7 @@ class XrpGetAddress$1 extends BaseMethod {
         };
     }
     run() {
-        var _a, _b, _c;
+        var _a, _b, _c, _d, _e;
         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 this.device.commands.typedCall('BatchGetPublickeys', 'EcdsaPublicKeys', {
@@ -31962,13 +32009,14 @@ class XrpGetAddress$1 extends BaseMethod {
                     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],
                 });
                 this.postPreviousAddressMessage({
                     path,
                     address,
                 });
             }
-            validateResult(responses, ['address', 'publicKey'], {
+            validateResult(responses, ['address', 'pub'], {
                 expectedLength: this.params.length,
             });
             return Promise.resolve(this.hasBundle ? responses : responses[0]);
@@ -32061,14 +32109,14 @@ class SuiGetAddress extends BaseMethod {
         this.shouldConfirm = false;
     }
     init() {
-        var _a;
+        var _a, _b;
         this.checkDeviceId = true;
         this.notAllowDeviceMode = [...this.notAllowDeviceMode, UI_REQUEST.INITIALIZE];
         this.hasBundle = !!((_a = this.payload) === null || _a === void 0 ? void 0 : _a.bundle);
         const payload = this.hasBundle ? this.payload : { bundle: [this.payload] };
-        this.shouldConfirm = this.hasBundle
-            ? this.payload.bundle.some((i) => !!i.showOnOneKey)
-            : false;
+        this.shouldConfirm =
+            this.payload.showOnOneKey ||
+                ((_b = this.payload.bundle) === null || _b === void 0 ? void 0 : _b.some((i) => !!i.showOnOneKey));
         validateParams(payload, [{ name: 'bundle', type: 'array' }]);
         this.params = [];
         payload.bundle.forEach((batch) => {
@@ -32096,39 +32144,56 @@ class SuiGetAddress extends BaseMethod {
         };
     }
     run() {
-        var _a;
+        var _a, _b, _c;
         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 this.device.commands.typedCall('BatchGetPublickeys', 'EcdsaPublicKeys', {
+            const supportsBatchPublicKey = supportBatchPublicKey((_a = this.device) === null || _a === void 0 ? void 0 : _a.features);
+            let responses = [];
+            if (supportsBatchPublicKey) {
+                const publicKeyRes = yield this.device.commands.typedCall('BatchGetPublickeys', 'EcdsaPublicKeys', {
                     paths: this.params,
                     ecdsa_curve_name: 'ed25519',
                 });
-                const result = res.message.public_keys.map((publicKey, index) => ({
-                    path: serializedPath(this.params[index].address_n),
-                    publicKey,
-                    address: publicKeyToAddress(publicKey),
-                }));
-                validateResult(result, ['address'], {
-                    expectedLength: this.params.length,
-                });
-                return Promise.resolve(result);
+                for (let i = 0; i < this.params.length; i++) {
+                    const param = this.params[i];
+                    const publicKey = publicKeyRes.message.public_keys[i];
+                    let address;
+                    if (this.shouldConfirm) {
+                        const addressRes = yield this.device.commands.typedCall('SuiGetAddress', 'SuiAddress', param);
+                        address = (_c = (_b = addressRes.message.address) === null || _b === void 0 ? void 0 : _b.toLowerCase()) !== null && _c !== void 0 ? _c : '';
+                    }
+                    else {
+                        address = publicKeyToAddress(publicKey);
+                    }
+                    const result = {
+                        path: serializedPath(param.address_n),
+                        address,
+                        publicKey,
+                        pub: publicKey,
+                    };
+                    if (this.shouldConfirm) {
+                        this.postPreviousAddressMessage(result);
+                    }
+                    responses.push(result);
+                }
             }
-            const responses = [];
-            for (let i = 0; i < this.params.length; i++) {
-                const param = this.params[i];
-                const res = yield this.device.commands.typedCall('SuiGetAddress', 'SuiAddress', Object.assign({}, param));
-                const { address } = res.message;
-                const result = {
-                    path: serializedPath(param.address_n),
-                    address: address === null || address === void 0 ? void 0 : address.toLowerCase(),
-                };
-                responses.push(result);
-                this.postPreviousAddressMessage(result);
+            else {
+                responses = yield Promise.all(this.params.map((param) => __awaiter(this, void 0, void 0, function* () {
+                    var _d, _e;
+                    const res = yield this.device.commands.typedCall('SuiGetAddress', 'SuiAddress', param);
+                    const result = {
+                        path: serializedPath(param.address_n),
+                        address: (_e = (_d = res.message.address) === null || _d === void 0 ? void 0 : _d.toLowerCase()) !== null && _e !== void 0 ? _e : '',
+                    };
+                    if (this.shouldConfirm) {
+                        this.postPreviousAddressMessage(result);
+                    }
+                    return result;
+                })));
             }
             validateResult(responses, ['address'], {
                 expectedLength: this.params.length,
             });
-            return Promise.resolve(this.hasBundle ? responses : responses[0]);
+            return this.hasBundle ? responses : responses[0];
         });
     }
 }
@@ -32179,8 +32244,9 @@ class SuiGetPublicKey extends BaseMethod {
             const responses = res.message.public_keys.map((publicKey, index) => ({
                 path: serializedPath(this.params[index].address_n),
                 publicKey,
+                pub: publicKey,
             }));
-            validateResult(responses, ['publicKey'], {
+            validateResult(responses, ['pub'], {
                 expectedLength: this.params.length,
             });
             return Promise.resolve(this.hasBundle ? responses : responses[0]);
@@ -32527,11 +32593,11 @@ class CardanoGetPublicKey extends BaseMethod {
                 responses.push({
                     path: batch.address_n,
                     serializedPath: serializedPath(batch.address_n),
-                    publicKey: message.xpub,
+                    xpub: message.xpub,
                     node: message.node,
                 });
             }
-            validateResult(responses, ['publicKey'], {
+            validateResult(responses, ['xpub'], {
                 expectedLength: this.params.length,
             });
             return this.hasBundle ? responses : responses[0];
@@ -33395,6 +33461,7 @@ class PolkadotGetAddress extends BaseMethod {
                 responses.push({
                     path,
                     address,
+                    pub: public_key !== null && public_key !== void 0 ? public_key : '',
                     publicKey: public_key !== null && public_key !== void 0 ? public_key : '',
                 });
                 this.postPreviousAddressMessage({
@@ -33402,7 +33469,7 @@ class PolkadotGetAddress extends BaseMethod {
                     address,
                 });
             }
-            validateResult(responses, ['address', 'publicKey'], {
+            validateResult(responses, ['address', 'pub'], {
                 expectedLength: this.params.length,
             });
             return Promise.resolve(this.hasBundle ? responses : responses[0]);
@@ -34087,7 +34154,12 @@ class NostrGetPublicKey extends BaseMethod {
             for (let i = 0; i < this.params.length; i++) {
                 const param = this.params[i];
                 const res = yield this.device.commands.typedCall('NostrGetPublicKey', 'NostrPublicKey', Object.assign({}, param));
-                const response = Object.assign({ path: serializedPath(param.address_n) }, res.message);
+                const response = {
+                    path: serializedPath(param.address_n),
+                    npub: res.message.npub,
+                    pub: res.message.publickey,
+                    publickey: res.message.publickey,
+                };
                 responses.push(response);
             }
             return Promise.resolve(this.hasBundle ? responses : responses[0]);
@@ -34333,7 +34405,7 @@ class LnurlAuth1 extends BaseMethod {
         return __awaiter(this, void 0, void 0, function* () {
             const { message } = yield this.device.commands.typedCall('LnurlAuth', 'LnurlAuthResp', this.params);
             validateResult(message, ['publickey', 'path']);
-            return message;
+            return Object.assign(Object.assign({}, message), { pub: message.publickey });
         });
     }
 }
@@ -34679,12 +34751,13 @@ class TonGetAddress extends BaseMethod {
                 const result = {
                     path: serializedPath(param.address_n),
                     publicKey: public_key,
+                    pub: public_key,
                     address,
                 };
                 responses.push(result);
                 this.postPreviousAddressMessage(result);
             }
-            validateResult(responses, ['address', 'publicKey'], {
+            validateResult(responses, ['address', 'pub'], {
                 expectedLength: this.params.length,
             });
             return Promise.resolve(this.hasBundle ? responses : responses[0]);
@@ -34701,14 +34774,14 @@ class TonSignMessage extends BaseMethod {
             { name: 'destination', type: 'string' },
             { name: 'jettonMasterAddress', type: 'string' },
             { name: 'jettonWalletAddress', type: 'string' },
-            { name: 'tonAmount', type: 'number' },
-            { name: 'jettonAmount', type: 'number' },
-            { name: 'fwdFee', type: 'number' },
+            { name: 'tonAmount' },
+            { name: 'jettonAmount' },
+            { name: 'fwdFee' },
             { name: 'comment', type: 'string' },
             { name: 'isRawData', type: 'boolean' },
             { name: 'mode', type: 'number' },
             { name: 'seqno', type: 'number' },
-            { name: 'expireAt', type: 'number' },
+            { name: 'expireAt' },
             { name: 'walletVersion' },
             { name: 'walletId', type: 'number' },
             { name: 'workchain' },
@@ -34726,7 +34799,6 @@ class TonSignMessage extends BaseMethod {
             jetton_master_address: this.payload.jettonMasterAddress,
             jetton_wallet_address: this.payload.jettonWalletAddress,
             ton_amount: this.payload.tonAmount,
-            jetton_amount: this.payload.jettonAmount,
             fwd_fee: this.payload.fwdFee,
             comment: this.payload.comment,
             mode: this.payload.mode,
@@ -34748,10 +34820,64 @@ class TonSignMessage extends BaseMethod {
             model_touch: {
                 min: '4.10.0',
             },
+            classic1s: {
+                min: '3.10.0',
+            },
+        };
+    }
+    getSupportJettonAmountBytesVersionRange() {
+        return {
+            pro: {
+                min: '4.10.2',
+            },
+        };
+    }
+    checkSupportJettonAmountBytes() {
+        var _a;
+        const firmwareVersion = (_a = getDeviceFirmwareVersion(this.device.features)) === null || _a === void 0 ? void 0 : _a.join('.');
+        const versionRange = getMethodVersionRange(this.device.features, type => this.getSupportJettonAmountBytesVersionRange()[type]);
+        if (!versionRange) {
+            return true;
+        }
+        if (semver__default["default"].valid(firmwareVersion) && semver__default["default"].gte(firmwareVersion, versionRange.min)) {
+            return true;
+        }
+        return false;
+    }
+    getFixCommentErrorVersionRange() {
+        return {
+            pro: {
+                min: '4.10.1',
+            },
         };
     }
+    checkFixCommentError() {
+        var _a;
+        const { comment, jettonAmount } = this.payload;
+        if (lodash.isEmpty(comment) || jettonAmount === null || jettonAmount === undefined) {
+            return;
+        }
+        const firmwareVersion = (_a = getDeviceFirmwareVersion(this.device.features)) === null || _a === void 0 ? void 0 : _a.join('.');
+        const versionRange = getMethodVersionRange(this.device.features, type => this.getFixCommentErrorVersionRange()[type]);
+        if (!versionRange) {
+            return;
+        }
+        if (semver__default["default"].valid(firmwareVersion) && semver__default["default"].lt(firmwareVersion, versionRange.min)) {
+            throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.CallMethodNeedUpgradeFirmware, `Device firmware version is too low, please update to ${versionRange.min}`, { current: firmwareVersion, require: versionRange.min });
+        }
+    }
     run() {
         return __awaiter(this, void 0, void 0, function* () {
+            this.checkFixCommentError();
+            const { jettonAmount } = this.payload;
+            if (jettonAmount) {
+                if (this.checkSupportJettonAmountBytes()) {
+                    this.params.jetton_amount_bytes = stripHexStartZeroes(formatAnyHex(new BigNumber__default["default"](jettonAmount).toString(16)));
+                }
+                else {
+                    this.params.jetton_amount = jettonAmount;
+                }
+            }
             const deviceType = getDeviceType(this.device.features);
             const res = yield this.device.commands.typedCall('TonSignMessage', 'TonSignedMessage', Object.assign({}, this.params));
             return Promise.resolve(Object.assign(Object.assign({}, res.message), { skip_validate: DeviceModelToTypes.model_mini.includes(deviceType) }));
@@ -34767,7 +34893,7 @@ class TonSignProof extends BaseMethod {
             { name: 'path', required: true },
             { name: 'appdomain', type: 'string' },
             { name: 'comment', type: 'string' },
-            { name: 'expireAt', type: 'number' },
+            { name: 'expireAt' },
             { name: 'walletVersion' },
             { name: 'walletId', type: 'number' },
             { name: 'workchain' },
@@ -35003,6 +35129,7 @@ class AlephiumGetAddress extends BaseMethod {
                     path: serializedPath(param.address_n),
                     address,
                     publicKey: param.include_public_key ? res.message.public_key : undefined,
+                    pub: param.include_public_key ? res.message.public_key : undefined,
                     derivedPath: serializedPath(res.message.derived_path),
                 };
                 responses.push(result);

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

@@ -2,6 +2,7 @@ import type { CommonParams, Response } from '../params';
 export type AlephiumAddress = {
     path: string;
     publicKey?: string;
+    pub?: string;
     address: string;
     derivedPath: string;
 };

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

@@ -1 +1 @@
-{"version":3,"file":"alephiumGetAddress.d.ts","sourceRoot":"","sources":["../../../src/types/api/alephiumGetAddress.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAExD,MAAM,MAAM,eAAe,GAAG;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,CAAC;CACrB,CAAC;AAEF,MAAM,MAAM,wBAAwB,GAAG;IACrC,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IACxB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,KAAK,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,CAAC;CAClC,CAAC;AAEF,MAAM,CAAC,OAAO,UAAU,kBAAkB,CACxC,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,YAAY,GAAG,wBAAwB,GAC9C,QAAQ,CAAC,eAAe,CAAC,CAAC;AAE7B,MAAM,CAAC,OAAO,UAAU,kBAAkB,CACxC,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,YAAY,GAAG;IAAE,MAAM,CAAC,EAAE,wBAAwB,EAAE,CAAA;CAAE,GAC7D,QAAQ,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC,CAAC"}
+{"version":3,"file":"alephiumGetAddress.d.ts","sourceRoot":"","sources":["../../../src/types/api/alephiumGetAddress.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAExD,MAAM,MAAM,eAAe,GAAG;IAC5B,IAAI,EAAE,MAAM,CAAC;IAIb,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,CAAC;CACrB,CAAC;AAEF,MAAM,MAAM,wBAAwB,GAAG;IACrC,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IACxB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,KAAK,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,CAAC;CAClC,CAAC;AAEF,MAAM,CAAC,OAAO,UAAU,kBAAkB,CACxC,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,YAAY,GAAG,wBAAwB,GAC9C,QAAQ,CAAC,eAAe,CAAC,CAAC;AAE7B,MAAM,CAAC,OAAO,UAAU,kBAAkB,CACxC,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,YAAY,GAAG;IAAE,MAAM,CAAC,EAAE,wBAAwB,EAAE,CAAA;CAAE,GAC7D,QAAQ,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC,CAAC"}

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

@@ -13,11 +13,13 @@ export type AllNetworkAddressParams = {
     chainName?: string;
     prefix?: string;
     showOnOneKey?: boolean;
+    includePublicKey?: boolean;
+    group?: string;
 };
 type AllNetworkAddressPayload = {
     address: string;
-    publicKey?: string;
     pub?: string;
+    publicKey?: string;
     npub?: string;
 } | {
     addressParameters: CardanoAddressParameters;
@@ -43,8 +45,12 @@ type AllNetworkAddressPayload = {
 };
 export type AllNetworkAddress = CommonResponseParams & {
     success: boolean;
-    error?: string;
-    payload?: AllNetworkAddressPayload;
+    payload?: AllNetworkAddressPayload | {
+        error: string;
+        code: number;
+        connectId: string;
+        deviceId: string;
+    };
 };
 export type AllNetworkGetAddressParams = {
     bundle: AllNetworkAddressParams[];

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

@@ -1 +1 @@
-{"version":3,"file":"allNetworkGetAddress.d.ts","sourceRoot":"","sources":["../../../src/types/api/allNetworkGetAddress.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AACxD,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,WAAW,CAAC;AAE1D,MAAM,MAAM,QAAQ,GAChB,KAAK,GAEL,KAAK,GACL,MAAM,GACN,MAAM,GACN,QAAQ,GACR,KAAK,GACL,KAAK,GAEL,KAAK,GACL,MAAM,GACN,MAAM,GACN,KAAK,GACL,KAAK,GACL,MAAM,GACN,OAAO,GACP,KAAK,GACL,QAAQ,GACR,KAAK,GACL,KAAK,GACL,KAAK,GACL,KAAK,GACL,OAAO,GACP,MAAM,GACN,OAAO,GACP,QAAQ,GACR,MAAM,GACN,KAAK,GACL,MAAM,GACN,OAAO,CAAC;AAEZ,MAAM,MAAM,oBAAoB,GAAG;IACjC,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,QAAQ,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,MAAM,MAAM,uBAAuB,GAAG;IACpC,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IACxB,OAAO,EAAE,QAAQ,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB,CAAC;AAEF,KAAK,wBAAwB,GACzB;IACE,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,GAAG,CAAC,EAAE,MAAM,CAAC;IAEb,IAAI,CAAC,EAAE,MAAM,CAAC;CACf,GACD;IAEE,iBAAiB,EAAE,wBAAwB,CAAC;IAC5C,aAAa,EAAE,MAAM,CAAC;IACtB,SAAS,EAAE,MAAM,CAAC;IAClB,cAAc,EAAE,MAAM,CAAC;IACvB,qBAAqB,EAAE,MAAM,CAAC;IAC9B,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB,GACD;IAEE,IAAI,EAAE;QACJ,KAAK,EAAE,MAAM,CAAC;QACd,WAAW,EAAE,MAAM,CAAC;QACpB,SAAS,EAAE,MAAM,CAAC;QAClB,UAAU,EAAE,MAAM,CAAC;QACnB,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;QAC3B,UAAU,EAAE,MAAM,CAAC;KACpB,CAAC;IACF,IAAI,EAAE,MAAM,CAAC;IACb,gBAAgB,EAAE,MAAM,CAAC;IACzB,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;AAEN,MAAM,MAAM,iBAAiB,GAAG,oBAAoB,GAAG;IACrD,OAAO,EAAE,OAAO,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,wBAAwB,CAAC;CACpC,CAAC;AAEF,MAAM,MAAM,0BAA0B,GAAG;IACvC,MAAM,EAAE,uBAAuB,EAAE,CAAC;CACnC,CAAC;AAEF,MAAM,CAAC,OAAO,UAAU,oBAAoB,CAC1C,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,YAAY,GAAG,0BAA0B,GAChD,QAAQ,CAAC,iBAAiB,EAAE,CAAC,CAAC"}
+{"version":3,"file":"allNetworkGetAddress.d.ts","sourceRoot":"","sources":["../../../src/types/api/allNetworkGetAddress.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AACxD,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,WAAW,CAAC;AAE1D,MAAM,MAAM,QAAQ,GAChB,KAAK,GAEL,KAAK,GACL,MAAM,GACN,MAAM,GACN,QAAQ,GACR,KAAK,GACL,KAAK,GAEL,KAAK,GACL,MAAM,GACN,MAAM,GACN,KAAK,GACL,KAAK,GACL,MAAM,GACN,OAAO,GACP,KAAK,GACL,QAAQ,GACR,KAAK,GACL,KAAK,GACL,KAAK,GACL,KAAK,GACL,OAAO,GACP,MAAM,GACN,OAAO,GACP,QAAQ,GACR,MAAM,GACN,KAAK,GACL,MAAM,GACN,OAAO,CAAC;AAEZ,MAAM,MAAM,oBAAoB,GAAG;IACjC,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,QAAQ,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,MAAM,MAAM,uBAAuB,GAAG;IACpC,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IACxB,OAAO,EAAE,QAAQ,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,YAAY,CAAC,EAAE,OAAO,CAAC;IAEvB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,KAAK,wBAAwB,GACzB;IACE,OAAO,EAAE,MAAM,CAAC;IAChB,GAAG,CAAC,EAAE,MAAM,CAAC;IAIb,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB,IAAI,CAAC,EAAE,MAAM,CAAC;CACf,GACD;IAEE,iBAAiB,EAAE,wBAAwB,CAAC;IAC5C,aAAa,EAAE,MAAM,CAAC;IACtB,SAAS,EAAE,MAAM,CAAC;IAClB,cAAc,EAAE,MAAM,CAAC;IACvB,qBAAqB,EAAE,MAAM,CAAC;IAC9B,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB,GACD;IAEE,IAAI,EAAE;QACJ,KAAK,EAAE,MAAM,CAAC;QACd,WAAW,EAAE,MAAM,CAAC;QACpB,SAAS,EAAE,MAAM,CAAC;QAClB,UAAU,EAAE,MAAM,CAAC;QACnB,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;QAC3B,UAAU,EAAE,MAAM,CAAC;KACpB,CAAC;IACF,IAAI,EAAE,MAAM,CAAC;IACb,gBAAgB,EAAE,MAAM,CAAC;IACzB,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;AAEN,MAAM,MAAM,iBAAiB,GAAG,oBAAoB,GAAG;IACrD,OAAO,EAAE,OAAO,CAAC;IACjB,OAAO,CAAC,EACJ,wBAAwB,GACxB;QACE,KAAK,EAAE,MAAM,CAAC;QACd,IAAI,EAAE,MAAM,CAAC;QACb,SAAS,EAAE,MAAM,CAAC;QAClB,QAAQ,EAAE,MAAM,CAAC;KAClB,CAAC;CACP,CAAC;AAEF,MAAM,MAAM,0BAA0B,GAAG;IACvC,MAAM,EAAE,uBAAuB,EAAE,CAAC;CACnC,CAAC;AAEF,MAAM,CAAC,OAAO,UAAU,oBAAoB,CAC1C,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,YAAY,GAAG,0BAA0B,GAChD,QAAQ,CAAC,iBAAiB,EAAE,CAAC,CAAC"}