fix(core/sol): handle the situation where the signer is missing in the memo program

Author: somebodyLi

core/src/apps/solana/sign_tx.py

@@ -62,6 +62,10 @@ async def sign_tx(
     # verify fee payer
     if not multiple_signers:
         if fee_payer.get() != signer_pub_key_bytes:
+            if __debug__:
+                print(
+                    f"Invalid signer used: {PublicKey(fee_payer.get())} != {PublicKey(signer_pub_key_bytes)}"
+                )
             raise wire.DataError("Invalid signer used")
     else:
         if PublicKey(signer_pub_key_bytes) not in accounts_keys[:sigs_count]:
@@ -100,7 +104,7 @@ async def sign_tx(
             elif program_id == SPL_MEMO_PROGRAM_ID:
                 from .spl.memo.memo_program import parse
 
-                await parse(ctx, accounts, i.data)
+                await parse(ctx, accounts if len(accounts) > 0 else [fee_payer], i.data)
             # elif program_id == COMPUTE_BUDGET_PROGRAM_ID:
             #    pass
             # # elif program_id == STAKE_PROGRAM_ID:

core/src/apps/solana/spl/memo/memo_program.py

@@ -18,10 +18,11 @@ async def parse(ctx: wire.Context, accounts: list[PublicKey], data: bytes) -> No
     """Parse memo instruction params."""
     from trezor.lvglui.i18n import gettext as _, keys as i18n_keys
 
-    params = MemoParams(signer=accounts[0], message=data)
-    memo = params.message.decode("utf-8")
+    signer = accounts[0]
+    params = MemoParams(signer=signer, message=data)
+    from apps.common.signverify import decode_message
+
+    memo = decode_message(params.message)
     from trezor.ui.layouts.lvgl import confirm_sol_memo
 
-    await confirm_sol_memo(
-        ctx, _(i18n_keys.TITLE__MEMO), _(i18n_keys.LIST_KEY__MESSAGE__COLON), memo
-    )
+    await confirm_sol_memo(ctx, _(i18n_keys.TITLE__MEMO), memo, str(signer))

core/src/trezor/ui/layouts/lvgl/__init__.py

@@ -1235,11 +1235,19 @@ async def confirm_sol_token_transfer(
 
 
 async def confirm_sol_memo(
-    ctx: wire.GenericContext, title: str, description: str, memo: str
+    ctx: wire.GenericContext, title: str, memo: str, signer: str
 ) -> None:
-    from trezor.lvglui.scrs.template import BlobDisPlay
+    from trezor.lvglui.scrs.template import Message
 
-    screen = BlobDisPlay(title, description, memo, None)
+    screen = Message(
+        title,
+        signer,
+        memo,
+        ctx.primary_color,
+        ctx.icon_path,
+        False,
+        item_addr_title=_(i18n_keys.LIST_KEY__SIGNER__COLON),
+    )
     await raise_if_cancelled(
         interact(ctx, screen, "sol_memo", ButtonRequestType.ProtectCall)
     )