fix(core): misc fix

1. fix Solana signing issue
2. optimize Ethereum sign-typed-data display
3. optimize the auto screen off logic

Author: somebodyLi

core/src/apps/base.py

@@ -822,7 +822,9 @@ def boot() -> None:
     )
     workflow_handlers.register(MessageType.UnLockDevice, handle_UnLockDevice)
 
-    reload_settings_from_storage()
+    reload_settings_from_storage(
+        timeout_ms=10 * 1000 if utils.is_rest_by_usb_lock() else None
+    )
     from trezor.lvglui.scrs import fingerprints
 
     if config.is_unlocked() and fingerprints.is_unlocked():

core/src/apps/ethereum/onekey/sign_typed_data.py

@@ -593,4 +593,5 @@ async def confirm_domain(ctx: Context, typed_data_envelope: TypedDataEnvelope) -
         eip712_domain[member.name] = value
     from ..layout import confirm_domain
 
-    await confirm_domain(ctx, eip712_domain)
+    if eip712_domain:
+        await confirm_domain(ctx, eip712_domain)

core/src/apps/solana/sign_tx.py

@@ -67,7 +67,8 @@ async def sign_tx(
                 print(
                     f"Invalid signer used: {PublicKey(fee_payer.get())} != {PublicKey(signer_pub_key_bytes)}"
                 )
-            raise wire.DataError("Invalid signer used")
+            else:
+                raise wire.DataError("Invalid signer used")
     else:
         if PublicKey(signer_pub_key_bytes) not in accounts_keys[:sigs_count]:
             raise wire.DataError("Invalid transaction params")

core/src/apps/solana/spl/spl_token_program.py

@@ -437,7 +437,7 @@ async def parse(ctx: wire.Context, accounts: list[PublicKey], data: bytes) -> No
         from ..constents import SPL_TOKEN_PROGRAM_ID
 
         owner_address = None
-        if hasattr(ctx, "extra"):
+        if ctx.extra is not None:
             owner_address = try_get_token_account_owner_address(
                 params.dest.get(),
                 SPL_TOKEN_PROGRAM_ID.get(),

core/src/trezor/lvglui/scrs/template.py

@@ -2741,7 +2741,7 @@ def __init__(
         if warning_banner_text:
             self.warning_banner = Banner(
                 self.content_area,
-                3,
+                2,
                 warning_banner_text,
             )
             self.warning_banner.align_to(self.title, lv.ALIGN.OUT_BOTTOM_MID, 0, 40)

core/src/trezor/messages.py

@@ -8869,44 +8869,6 @@ def __init__(
         def is_type_of(cls, msg: Any) -> TypeGuard["StellarSignedTx"]:
             return isinstance(msg, cls)
 
-    class StellarSignMessage(protobuf.MessageType):
-        address_n: "list[int]"
-        message: "bytes"
-
-        def __init__(
-            self,
-            *,
-            message: "bytes",
-            address_n: "list[int] | None" = None,
-        ) -> None:
-            pass
-
-        @classmethod
-        def is_type_of(cls, msg: Any) -> TypeGuard["StellarSignMessage"]:
-            return isinstance(msg, cls)
-
-    class StellarSignAuthorization(protobuf.MessageType):
-        address_n: "list[int]"
-        network_passphrase: "str"
-        nonce: "int"
-        expiration: "int"
-        invocation: "bytes"
-
-        def __init__(
-            self,
-            *,
-            network_passphrase: "str",
-            nonce: "int",
-            expiration: "int",
-            invocation: "bytes",
-            address_n: "list[int] | None" = None,
-        ) -> None:
-            pass
-
-        @classmethod
-        def is_type_of(cls, msg: Any) -> TypeGuard["StellarSignAuthorization"]:
-            return isinstance(msg, cls)
-
     class SuiGetAddress(protobuf.MessageType):
         address_n: "list[int]"
         show_display: "bool | None"

core/src/trezor/uart.py

@@ -182,6 +182,7 @@ async def handle_usb_state():
     while True:
         try:
             utils.USB_STATE_CHANGED = False
+            utils.unmark_rest_by_usb_lock()
             usb_state = loop.wait(io.USB_STATE)
             state, enable = await usb_state
             if enable is not None and utils.is_usb_enabled():
@@ -226,6 +227,7 @@ async def handle_usb_state():
                         else:
                             config.lock()
                         await safe_reloop()
+                        utils.mark_rest_by_usb_lock()
                         await workflow.spawn(utils.internal_reloop())
                 elif not usb_auto_lock and not state:
                     await safe_reloop(ack=False)

core/src/trezor/utils.py

@@ -88,6 +88,7 @@ def board_version() -> str:
 CHARGE_ENABLE: bool | None = None
 CHARGING = False
 USB_STATE_CHANGED = False
+_REST_AFTER_USB_LOCK = False
 RESTART_MAIN_LOOP = False
 _WIRE_BUSY = False
 _PENDING_SLEEP_AFTER_CANCEL = False
@@ -387,6 +388,22 @@ def mark_collecting_fingerprint_done():
     _COLLECTING_FINGERPRINT = False
 
 
+def is_rest_by_usb_lock():
+    return _REST_AFTER_USB_LOCK
+
+
+def mark_rest_by_usb_lock():
+    global _REST_AFTER_USB_LOCK
+
+    _REST_AFTER_USB_LOCK = True
+
+
+def unmark_rest_by_usb_lock():
+    global _REST_AFTER_USB_LOCK
+
+    _REST_AFTER_USB_LOCK = False
+
+
 def set_backup_none():
     global _CURRENT_BACKUP_METHOD
     _CURRENT_BACKUP_METHOD = BACKUP_METHOD_NONE

python/src/trezorlib/messages.py

@@ -11052,49 +11052,6 @@ def __init__(
         self.signature = signature
 
 
-class StellarSignMessage(protobuf.MessageType):
-    MESSAGE_WIRE_TYPE = None
-    FIELDS = {
-        1: protobuf.Field("address_n", "uint32", repeated=True, required=False),
-        2: protobuf.Field("message", "bytes", repeated=False, required=True),
-    }
-
-    def __init__(
-        self,
-        *,
-        message: "bytes",
-        address_n: Optional[Sequence["int"]] = None,
-    ) -> None:
-        self.address_n: Sequence["int"] = address_n if address_n is not None else []
-        self.message = message
-
-
-class StellarSignAuthorization(protobuf.MessageType):
-    MESSAGE_WIRE_TYPE = None
-    FIELDS = {
-        1: protobuf.Field("address_n", "uint32", repeated=True, required=False),
-        2: protobuf.Field("network_passphrase", "string", repeated=False, required=True),
-        3: protobuf.Field("nonce", "uint64", repeated=False, required=True),
-        4: protobuf.Field("expiration", "uint32", repeated=False, required=True),
-        5: protobuf.Field("invocation", "bytes", repeated=False, required=True),
-    }
-
-    def __init__(
-        self,
-        *,
-        network_passphrase: "str",
-        nonce: "int",
-        expiration: "int",
-        invocation: "bytes",
-        address_n: Optional[Sequence["int"]] = None,
-    ) -> None:
-        self.address_n: Sequence["int"] = address_n if address_n is not None else []
-        self.network_passphrase = network_passphrase
-        self.nonce = nonce
-        self.expiration = expiration
-        self.invocation = invocation
-
-
 class SuiGetAddress(protobuf.MessageType):
     MESSAGE_WIRE_TYPE = 11100
     FIELDS = {