Skip to content

fix btc-only version issues #366

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lihuanhuan merged 2 commits into from
Jul 21, 2025
Merged

fix btc-only version issues #366

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
336958e
fix(btc-only): fix firmware response and UI issues.
lihuanhuan Jul 21, 2025
9906b0d
feat(ui):optimize progress bar display.
lihuanhuan Jul 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 24 additions & 19 deletions core/embed/trezorhal/se_thd89.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1986,17 +1986,20 @@ secbool se_gen_session_seed(const char *passphrase, bool cardano) {
if (!session_generate_cardano_seed(passphrase, &percent)) {
return secfalse;
}
while (percent != 100) {
if (ui_callback) {
ui_callback(0, percent * 10, NULL);
if (percent != 100) {
while (percent != 100) {
if (ui_callback) {
ui_callback(0, percent * 10, NULL);
}
if (!session_generate_seed_percent(&percent)) {
return secfalse;
}
hal_delay(100);
}
if (!session_generate_seed_percent(&percent)) {
return secfalse;

if (ui_callback) {
ui_callback(0, 100 * 10, NULL);
}
hal_delay(100);
}
if (ui_callback) {
ui_callback(0, 100 * 10, NULL);
}
} else {
if (status & 0x80) {
Expand All @@ -2005,18 +2008,20 @@ secbool se_gen_session_seed(const char *passphrase, bool cardano) {
if (!session_generate_master_seed(passphrase, &percent)) {
return secfalse;
}
while (percent != 100) {
if (ui_callback) {
ui_callback(0, percent * 10, NULL);
if (percent != 100) {
while (percent != 100) {
if (ui_callback) {
ui_callback(0, percent * 10, NULL);
}
if (!session_generate_seed_percent(&percent)) {
return secfalse;
}
hal_delay(100);
}
if (!session_generate_seed_percent(&percent)) {
return secfalse;
}
hal_delay(100);
}

if (ui_callback) {
ui_callback(0, 100 * 10, NULL);
if (ui_callback) {
ui_callback(0, 100 * 10, NULL);
}
}
}

Expand Down
94 changes: 52 additions & 42 deletions core/src/apps/workflow_handlers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -392,7 +392,11 @@ def find_registered_handler(iface: WireInterface, msg_type: int) -> Handler | No
module = __import__(modname, None, None, (handler_name,), 0)
handler = getattr(module, handler_name)

if iface is not None and _is_address_derivation_message(msg_type):
if (
handler is not None
and iface is not None
and _is_address_derivation_message(msg_type)
):
return _wrap_with_version_check(handler)

return handler
Expand All @@ -401,47 +405,53 @@ def find_registered_handler(iface: WireInterface, msg_type: int) -> Handler | No


def _is_address_derivation_message(msg_type: int) -> bool:
return msg_type in (
MessageType.GetAddress,
MessageType.GetPublicKey,
MessageType.EthereumGetAddress,
MessageType.EthereumGetAddressOneKey,
MessageType.MoneroGetAddress,
MessageType.NEMGetAddress,
MessageType.NeoGetAddress,
MessageType.StellarGetAddress,
MessageType.RippleGetAddress,
MessageType.CardanoGetAddress,
MessageType.TezosGetAddress,
MessageType.BinanceGetAddress,
MessageType.ConfluxGetAddress,
MessageType.TonGetAddress,
MessageType.TronGetAddress,
MessageType.SolanaGetAddress,
MessageType.StarcoinGetAddress,
MessageType.NearGetAddress,
MessageType.AptosGetAddress,
MessageType.AlgorandGetAddress,
MessageType.PolkadotGetAddress,
MessageType.SuiGetAddress,
MessageType.FilecoinGetAddress,
MessageType.CosmosGetAddress,
MessageType.KaspaGetAddress,
MessageType.NexaGetAddress,
MessageType.NervosGetAddress,
MessageType.ScdoGetAddress,
MessageType.AlephiumGetAddress,
MessageType.BenfenGetAddress,
# Add other GetPublicKey variants
MessageType.BinanceGetPublicKey,
MessageType.CardanoGetPublicKey,
MessageType.EthereumGetPublicKey,
MessageType.EthereumGetPublicKeyOneKey,
MessageType.TezosGetPublicKey,
MessageType.StarcoinGetPublicKey,
# MessageType.EOSGetPublicKey,
MessageType.NostrGetPublicKey,
)
if utils.BITCOIN_ONLY:
return msg_type in (
MessageType.GetAddress,
MessageType.GetPublicKey,
)
else:
return msg_type in (
MessageType.GetAddress,
MessageType.GetPublicKey,
MessageType.EthereumGetAddress,
MessageType.EthereumGetAddressOneKey,
MessageType.MoneroGetAddress,
MessageType.NEMGetAddress,
MessageType.NeoGetAddress,
MessageType.StellarGetAddress,
MessageType.RippleGetAddress,
MessageType.CardanoGetAddress,
MessageType.TezosGetAddress,
MessageType.BinanceGetAddress,
MessageType.ConfluxGetAddress,
MessageType.TonGetAddress,
MessageType.TronGetAddress,
MessageType.SolanaGetAddress,
MessageType.StarcoinGetAddress,
MessageType.NearGetAddress,
MessageType.AptosGetAddress,
MessageType.AlgorandGetAddress,
MessageType.PolkadotGetAddress,
MessageType.SuiGetAddress,
MessageType.FilecoinGetAddress,
MessageType.CosmosGetAddress,
MessageType.KaspaGetAddress,
MessageType.NexaGetAddress,
MessageType.NervosGetAddress,
MessageType.ScdoGetAddress,
MessageType.AlephiumGetAddress,
MessageType.BenfenGetAddress,
# Add other GetPublicKey variants
MessageType.BinanceGetPublicKey,
MessageType.CardanoGetPublicKey,
MessageType.EthereumGetPublicKey,
MessageType.EthereumGetPublicKeyOneKey,
MessageType.TezosGetPublicKey,
MessageType.StarcoinGetPublicKey,
# MessageType.EOSGetPublicKey,
MessageType.NostrGetPublicKey,
)


def _wrap_with_version_check(handler):
Expand Down
16 changes: 9 additions & 7 deletions core/src/trezor/lvglui/scrs/homescreen.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1562,11 +1562,12 @@ def __init__(self, prev_scr=None):
self.wallet = ListItemBtn(
self.container, _(i18n_keys.ITEM__WALLET), left_img_src="A:/res/wallet.png"
)
self.fido_keys = ListItemBtn(
self.container,
_(i18n_keys.FIDO_FIDO_KEYS_LABEL),
left_img_src="A:/res/fido-keys.png",
)
if not utils.BITCOIN_ONLY:
self.fido_keys = ListItemBtn(
self.container,
_(i18n_keys.FIDO_FIDO_KEYS_LABEL),
left_img_src="A:/res/fido-keys.png",
)
self.about = ListItemBtn(
self.container,
_(i18n_keys.ITEM__ABOUT_DEVICE),
Expand All @@ -1587,7 +1588,8 @@ def refresh_text(self):
# self.home_scr.label_left.set_text(_(i18n_keys.ITEM__HOMESCREEN))
self.security.label_left.set_text(_(i18n_keys.ITEM__SECURITY))
self.wallet.label_left.set_text(_(i18n_keys.ITEM__WALLET))
self.fido_keys.label_left.set_text(_(i18n_keys.FIDO_FIDO_KEYS_LABEL))
if not utils.BITCOIN_ONLY:
self.fido_keys.label_left.set_text(_(i18n_keys.FIDO_FIDO_KEYS_LABEL))
self.about.label_left.set_text(_(i18n_keys.ITEM__ABOUT_DEVICE))

def on_click(self, event_obj):
Expand All @@ -1612,7 +1614,7 @@ def on_click(self, event_obj):
# Go2UpdateMode(self)
elif target == self.air_gap:
AirGapSetting(self)
elif target == self.fido_keys:
elif not utils.BITCOIN_ONLY and target == self.fido_keys:
FidoKeysSetting(self)
elif not utils.PRODUCTION and target == self.fp_test:
FingerprintTest(self)
Expand Down
Loading