refactor(core): optimize the signing process of Stellar transactions.

Author: overcat

core/embed/rust/librust_qstr.h

@@ -1227,13 +1227,15 @@ static void _librust_qstrs(void) {
   MP_QSTR_stellar__confirm_operation;
   MP_QSTR_stellar__confirm_stellar;
   MP_QSTR_stellar__confirm_timebounds;
+  MP_QSTR_stellar__confirm_transaction_source;
   MP_QSTR_stellar__create_account;
   MP_QSTR_stellar__debited_amount;
   MP_QSTR_stellar__delete;
   MP_QSTR_stellar__delete_passive_offer;
   MP_QSTR_stellar__delete_trust;
   MP_QSTR_stellar__destination;
   MP_QSTR_stellar__exchanges_require_memo;
+  MP_QSTR_stellar__extra_transaction_info;
   MP_QSTR_stellar__final_confirm;
   MP_QSTR_stellar__hash;
   MP_QSTR_stellar__high;
@@ -1247,6 +1249,7 @@ static void _librust_qstrs(void) {
   MP_QSTR_stellar__low;
   MP_QSTR_stellar__master_weight;
   MP_QSTR_stellar__medium;
+  MP_QSTR_stellar__network;
   MP_QSTR_stellar__new_offer;
   MP_QSTR_stellar__new_passive_offer;
   MP_QSTR_stellar__no_memo_set;
@@ -1267,13 +1270,16 @@ static void _librust_qstrs(void) {
   MP_QSTR_stellar__set_sequence_to_template;
   MP_QSTR_stellar__sign_tx_count_template;
   MP_QSTR_stellar__sign_tx_fee_template;
+  MP_QSTR_stellar__signing_with;
   MP_QSTR_stellar__source_account;
   MP_QSTR_stellar__testnet_network;
+  MP_QSTR_stellar__transaction_source_diff_warning;
   MP_QSTR_stellar__trusted_account;
   MP_QSTR_stellar__update;
   MP_QSTR_stellar__valid_from;
   MP_QSTR_stellar__valid_to;
   MP_QSTR_stellar__value_sha256;
+  MP_QSTR_stellar__verify_issuer;
   MP_QSTR_stellar__wanna_clean_value_key_template;
   MP_QSTR_stellar__your_account;
   MP_QSTR_tezos__baker_address;

core/embed/rust/src/translations/generated/translated_string.rs

@@ -837,13 +837,15 @@ class TR:
     stellar__confirm_operation: str = "Confirm operation"
     stellar__confirm_stellar: str = "Confirm Stellar"
     stellar__confirm_timebounds: str = "Confirm timebounds"
+    stellar__confirm_transaction_source: str = "Confirm transaction source"
     stellar__create_account: str = "Create Account"
     stellar__debited_amount: str = "Debited amount"
     stellar__delete: str = "Delete"
     stellar__delete_passive_offer: str = "Delete Passive Offer"
     stellar__delete_trust: str = "Delete trust"
     stellar__destination: str = "Destination"
     stellar__exchanges_require_memo: str = "Important: Many exchanges require a memo when depositing"
+    stellar__extra_transaction_info: str = "Transaction info"
     stellar__final_confirm: str = "Final confirm"
     stellar__hash: str = "Hash"
     stellar__high: str = "High:"
@@ -857,6 +859,7 @@ class TR:
     stellar__low: str = "Low:"
     stellar__master_weight: str = "Master Weight:"
     stellar__medium: str = "Medium:"
+    stellar__network: str = "Network"
     stellar__new_offer: str = "New Offer"
     stellar__new_passive_offer: str = "New Passive Offer"
     stellar__no_memo_set: str = "No memo set!"
@@ -877,13 +880,16 @@ class TR:
     stellar__set_sequence_to_template: str = "Set sequence to {0}?"
     stellar__sign_tx_count_template: str = "Sign this transaction made up of {0}"
     stellar__sign_tx_fee_template: str = "and pay {0}\nfor fee?"
+    stellar__signing_with: str = "Signing with"
     stellar__source_account: str = "Source account"
     stellar__testnet_network: str = "testnet network"
+    stellar__transaction_source_diff_warning: str = "Transaction source differs from Trezor account"
     stellar__trusted_account: str = "Trusted Account"
     stellar__update: str = "Update"
     stellar__valid_from: str = "Valid from (UTC)"
     stellar__valid_to: str = "Valid to (UTC)"
     stellar__value_sha256: str = "Value (SHA-256):"
+    stellar__verify_issuer: str = "Verify issuer"
     stellar__wanna_clean_value_key_template: str = "Do you want to clear value key {0}?"
     stellar__your_account: str = " your account"
     storage_msg__processing: str = "Processing"

core/mocks/trezortranslate_keys.pyi

@@ -11,63 +11,13 @@
     from trezor.messages import StellarAsset
 
 
-async def require_confirm_init(
-    address: str,
-    network_passphrase: str,
-    accounts_match: bool,
-) -> None:
-    description = (
-        TR.stellar__initialize_signing_with + TR.stellar__your_account
-        if accounts_match
-        else ""
-    )
+async def require_confirm_tx_source(tx_source: str):
     await layouts.confirm_address(
-        TR.stellar__confirm_stellar,
-        address,
-        description=description,
-        br_name="confirm_init",
-    )
-
-    # get_network_warning
-    if network_passphrase == consts.NETWORK_PASSPHRASE_PUBLIC:
-        network = None
-    elif network_passphrase == consts.NETWORK_PASSPHRASE_TESTNET:
-        network = TR.stellar__testnet_network
-    else:
-        network = TR.stellar__private_network
-
-    if network:
-        await layouts.confirm_metadata(
-            "confirm_init_network",
-            TR.stellar__confirm_network,
-            TR.stellar__on_network_template,
-            network,
-            ButtonRequestType.ConfirmOutput,
-        )
-
-
-async def require_confirm_timebounds(start: int, end: int) -> None:
-    await layouts.confirm_properties(
-        "confirm_timebounds",
-        TR.stellar__confirm_timebounds,
-        (
-            (
-                TR.stellar__valid_from,
-                (
-                    strings.format_timestamp(start)
-                    if start > 0
-                    else TR.stellar__no_restriction
-                ),
-            ),
-            (
-                TR.stellar__valid_to,
-                (
-                    strings.format_timestamp(end)
-                    if end > 0
-                    else TR.stellar__no_restriction
-                ),
-            ),
-        ),
+        TR.stellar__confirm_transaction_source,
+        tx_source,
+        description=TR.stellar__transaction_source_diff_warning,
+        br_name="confirm_tx_source",
+        br_code=ButtonRequestType.ConfirmOutput,
     )
 
 
@@ -89,32 +39,53 @@ async def require_confirm_memo(memo_type: StellarMemoType, memo_text: str) -> No
             TR.stellar__no_memo_set,
             TR.stellar__exchanges_require_memo,
             br_code=ButtonRequestType.ConfirmOutput,
-            prompt_screen=True,
         )
 
-    await layouts.confirm_blob(
+    await layouts.confirm_text(
         "confirm_memo",
         TR.stellar__confirm_memo,
         memo_text,
         description,
+        ButtonRequestType.ConfirmOutput,
     )
 
 
-async def require_confirm_final(fee: int, num_operations: int) -> None:
-    op_str = strings.format_plural(
-        "{count} {plural}", num_operations, TR.plurals__transaction_of_x_operations
-    )
-    text = (
-        TR.stellar__sign_tx_count_template.format(op_str)
-        + " "
-        + TR.stellar__sign_tx_fee_template
-    )
-    await layouts.confirm_metadata(
-        "confirm_final",
-        TR.stellar__final_confirm,
-        text,
-        format_amount(fee),
-        hold=True,
+async def require_confirm_final(
+    fee: int,
+    timebonuds: tuple[int, int],
+    network_passphrase: str,
+    account_index: int,
+    account_id: str,
+) -> None:
+    extra_items = []
+
+    # Add network info if it is not public
+    if network_passphrase == consts.NETWORK_PASSPHRASE_PUBLIC:
+        pass
+    elif network_passphrase == consts.NETWORK_PASSPHRASE_TESTNET:
+        extra_items.append(("Network", TR.stellar__testnet_network))
+    else:
+        extra_items.append(("Network", TR.stellar__private_network))
+
+    # Add timebounds info if they are restricted
+    timebonuds_start, timebonuds_end = timebonuds
+    if timebonuds_start > 0:
+        extra_items.append(
+            (
+                TR.stellar__valid_from,
+                strings.format_timestamp(timebonuds_start),
+            )
+        )
+    if timebonuds_end > 0:
+        extra_items.append(
+            (
+                TR.stellar__valid_to,
+                strings.format_timestamp(timebonuds_end),
+            )
+        )
+
+    await layouts.confirm_stellar_tx(
+        format_amount(fee), account_index, account_id, extra_items
     )
 
 

core/src/apps/stellar/layout.py

@@ -8,9 +8,10 @@
     confirm_metadata,
     confirm_output,
     confirm_properties,
+    should_show_more,
 )
 from trezor.wire import DataError, ProcessError
-
+from trezor.enums import ButtonRequestType
 from ..layout import format_amount
 
 if TYPE_CHECKING:
@@ -82,13 +83,21 @@ async def confirm_change_trust_op(op: StellarChangeTrustOp) -> None:
 
 
 async def confirm_create_account_op(op: StellarCreateAccountOp) -> None:
-    await confirm_properties(
-        "op_create_account",
-        TR.stellar__create_account,
-        (
-            (TR.words__account, op.new_account),
-            (TR.stellar__initial_balance, format_amount(op.starting_balance)),
-        ),
+    # The `title` in the `confirm_output` function works on `bolt`,
+    # while the `description` works on `delizia` and `eckhart`.
+    await confirm_address(
+        TR.words__recipient,
+        op.new_account,
+        description=TR.stellar__create_account,
+        br_name="op_create_account_new_account",
+        br_code=ButtonRequestType.ConfirmOutput,
+    )
+    await confirm_amount(
+        TR.words__amount,
+        format_amount(op.starting_balance),
+        TR.stellar__initial_balance,
+        br_name="op_create_account_starting_balance",
+        br_code=ButtonRequestType.ConfirmOutput,
     )
 
 
@@ -223,11 +232,34 @@ async def confirm_path_payment_strict_send_op(
 
 
 async def confirm_payment_op(op: StellarPaymentOp) -> None:
-    await confirm_output(
+    from trezor.enums import StellarAssetType
+
+    await confirm_address(
+        TR.words__recipient,
         op.destination_account,
-        format_amount(op.amount, op.asset),
+        br_name="op_payment_destination_account",
+        br_code=ButtonRequestType.ConfirmOutput,
     )
-    await confirm_asset_issuer(op.asset)
+
+    amount = format_amount(op.amount, op.asset)
+    if op.asset.type == StellarAssetType.NATIVE:
+        await confirm_amount(
+            TR.words__amount,
+            amount,
+            br_name="op_payment_amount",
+            br_code=ButtonRequestType.ConfirmOutput,
+        )
+    else:
+        # Users can only send assets they've already trusted,
+        # so we don't display the issuer by default.
+        if await should_show_more(
+            TR.words__amount,
+            ((amount, False),),
+            TR.stellar__verify_issuer,
+            br_name="op_payment_amount",
+            br_code=ButtonRequestType.ConfirmOutput,
+        ):
+            await confirm_asset_issuer(op.asset)
 
 
 async def confirm_set_options_op(op: StellarSetOptionsOp) -> None: