From b6e8567a498faaa96a5c4d7841f806c52a8b8e83 Mon Sep 17 00:00:00 2001 From: matejcik Date: Thu, 7 Mar 2024 13:47:22 +0100 Subject: [PATCH] fix(core): exclude altcoin functions from bitcoinonly build --- core/src/trezor/ui/layouts/tr/__init__.py | 228 +++++++++++----------- core/src/trezor/ui/layouts/tr/progress.py | 16 +- core/src/trezor/ui/layouts/tt/__init__.py | 206 +++++++++---------- core/src/trezor/ui/layouts/tt/progress.py | 16 +- 4 files changed, 233 insertions(+), 233 deletions(-) diff --git a/core/src/trezor/ui/layouts/tr/__init__.py b/core/src/trezor/ui/layouts/tr/__init__.py index 510d35876..f99cc9487 100644 --- a/core/src/trezor/ui/layouts/tr/__init__.py +++ b/core/src/trezor/ui/layouts/tr/__init__.py @@ -1,7 +1,7 @@ from typing import TYPE_CHECKING import trezorui2 -from trezor import TR, io, loop, ui +from trezor import TR, io, loop, ui, utils from trezor.enums import ButtonRequestType from trezor.wire import ActionCancelled from trezor.wire.context import wait as ctx_wait @@ -1079,128 +1079,128 @@ def confirm_total( ) -async def confirm_ethereum_staking_tx( - title: str, - intro_question: str, - verb: str, - total_amount: str, - maximum_fee: str, - address: str, - address_title: str, - info_items: Iterable[tuple[str, str]], - chunkify: bool = False, - br_type: str = "confirm_ethereum_staking_tx", - br_code: ButtonRequestType = ButtonRequestType.SignTx, -) -> None: - # intro - await confirm_value( - title, - intro_question, - "", - br_type, - br_code, - verb=verb, - info_items=((address_title, address),), - chunkify_info=chunkify, - ) - - # confirmation - if verb == TR.ethereum__staking_claim: - amount_title = verb - amount_value = "" - else: - amount_title = TR.words__amount + ":" - amount_value = total_amount - await raise_if_not_confirmed( - interact( - RustLayout( - trezorui2.altcoin_tx_summary( - amount_title=amount_title, - amount_value=amount_value, - fee_title=TR.send__maximum_fee, - fee_value=maximum_fee, - items=info_items, - cancel_cross=True, - ) - ), - br_type=br_type, - br_code=br_code, +if not utils.BITCOIN_ONLY: + + async def confirm_ethereum_staking_tx( + title: str, + intro_question: str, + verb: str, + total_amount: str, + maximum_fee: str, + address: str, + address_title: str, + info_items: Iterable[tuple[str, str]], + chunkify: bool = False, + br_type: str = "confirm_ethereum_staking_tx", + br_code: ButtonRequestType = ButtonRequestType.SignTx, + ) -> None: + # intro + await confirm_value( + title, + intro_question, + "", + br_type, + br_code, + verb=verb, + info_items=((address_title, address),), + chunkify_info=chunkify, ) - ) - -def confirm_solana_tx( - amount: str, - fee: str, - items: Iterable[tuple[str, str]], - amount_title: str | None = None, - fee_title: str | None = None, - br_type: str = "confirm_solana_tx", - br_code: ButtonRequestType = ButtonRequestType.SignTx, -) -> Awaitable[None]: - amount_title = ( - amount_title if amount_title is not None else f"{TR.words__amount}:" - ) # def_arg - fee_title = fee_title or TR.words__fee # def_arg - return raise_if_not_confirmed( - interact( - RustLayout( - trezorui2.altcoin_tx_summary( - amount_title=amount_title, - amount_value=amount, - fee_title=fee_title, - fee_value=fee, - items=items, - cancel_cross=True, - ) - ), - br_type=br_type, - br_code=br_code, + # confirmation + if verb == TR.ethereum__staking_claim: + amount_title = verb + amount_value = "" + else: + amount_title = TR.words__amount + ":" + amount_value = total_amount + await raise_if_not_confirmed( + interact( + RustLayout( + trezorui2.altcoin_tx_summary( + amount_title=amount_title, + amount_value=amount_value, + fee_title=TR.send__maximum_fee, + fee_value=maximum_fee, + items=info_items, + cancel_cross=True, + ) + ), + br_type=br_type, + br_code=br_code, + ) ) - ) - -async def confirm_ethereum_tx( - recipient: str, - total_amount: str, - maximum_fee: str, - items: Iterable[tuple[str, str]], - br_type: str = "confirm_ethereum_tx", - br_code: ButtonRequestType = ButtonRequestType.SignTx, - chunkify: bool = False, -) -> None: - summary_layout = RustLayout( - trezorui2.altcoin_tx_summary( - amount_title=f"{TR.words__amount}:", - amount_value=total_amount, - fee_title=TR.send__maximum_fee, - fee_value=maximum_fee, - items=items, + def confirm_solana_tx( + amount: str, + fee: str, + items: Iterable[tuple[str, str]], + amount_title: str | None = None, + fee_title: str | None = None, + br_type: str = "confirm_solana_tx", + br_code: ButtonRequestType = ButtonRequestType.SignTx, + ) -> Awaitable[None]: + amount_title = ( + amount_title if amount_title is not None else f"{TR.words__amount}:" + ) # def_arg + fee_title = fee_title or TR.words__fee # def_arg + return raise_if_not_confirmed( + interact( + RustLayout( + trezorui2.altcoin_tx_summary( + amount_title=amount_title, + amount_value=amount, + fee_title=fee_title, + fee_value=fee, + items=items, + cancel_cross=True, + ) + ), + br_type=br_type, + br_code=br_code, + ) ) - ) - while True: - # Allowing going back and forth between recipient and summary/details - await confirm_blob( - br_type, - TR.words__recipient, - recipient, - verb=TR.buttons__continue, - chunkify=chunkify, + async def confirm_ethereum_tx( + recipient: str, + total_amount: str, + maximum_fee: str, + items: Iterable[tuple[str, str]], + br_type: str = "confirm_ethereum_tx", + br_code: ButtonRequestType = ButtonRequestType.SignTx, + chunkify: bool = False, + ) -> None: + summary_layout = RustLayout( + trezorui2.altcoin_tx_summary( + amount_title=f"{TR.words__amount}:", + amount_value=total_amount, + fee_title=TR.send__maximum_fee, + fee_value=maximum_fee, + items=items, + ) ) - try: - summary_layout.request_complete_repaint() - await raise_if_not_confirmed( - interact( - summary_layout, - br_type, - br_code, - ) + while True: + # Allowing going back and forth between recipient and summary/details + await confirm_blob( + br_type, + TR.words__recipient, + recipient, + verb=TR.buttons__continue, + chunkify=chunkify, ) - break - except ActionCancelled: - continue + + try: + summary_layout.request_complete_repaint() + await raise_if_not_confirmed( + interact( + summary_layout, + br_type, + br_code, + ) + ) + break + except ActionCancelled: + continue def confirm_joint_total(spending_amount: str, total_amount: str) -> Awaitable[None]: diff --git a/core/src/trezor/ui/layouts/tr/progress.py b/core/src/trezor/ui/layouts/tr/progress.py index 36ac9ced4..6cf843a58 100644 --- a/core/src/trezor/ui/layouts/tr/progress.py +++ b/core/src/trezor/ui/layouts/tr/progress.py @@ -1,7 +1,7 @@ from typing import TYPE_CHECKING import trezorui2 -from trezor import TR, ui +from trezor import TR, ui, utils if TYPE_CHECKING: from typing import Any @@ -57,13 +57,13 @@ def pin_progress(message: str, description: str) -> ProgressLayout: return progress(message, description) -def monero_keyimage_sync_progress() -> ProgressLayout: - return progress("", TR.progress__syncing) +if not utils.BITCOIN_ONLY: + def monero_keyimage_sync_progress() -> ProgressLayout: + return progress("", TR.progress__syncing) -def monero_live_refresh_progress() -> ProgressLayout: - return progress("", TR.progress__refreshing, indeterminate=True) + def monero_live_refresh_progress() -> ProgressLayout: + return progress("", TR.progress__refreshing, indeterminate=True) - -def monero_transaction_progress_inner() -> ProgressLayout: - return progress("", TR.progress__signing_transaction) + def monero_transaction_progress_inner() -> ProgressLayout: + return progress("", TR.progress__signing_transaction) diff --git a/core/src/trezor/ui/layouts/tt/__init__.py b/core/src/trezor/ui/layouts/tt/__init__.py index c865c9935..919f9a962 100644 --- a/core/src/trezor/ui/layouts/tt/__init__.py +++ b/core/src/trezor/ui/layouts/tt/__init__.py @@ -1,7 +1,7 @@ from typing import TYPE_CHECKING import trezorui2 -from trezor import TR, io, loop, ui +from trezor import TR, io, loop, ui, utils from trezor.enums import ButtonRequestType from trezor.wire import ActionCancelled from trezor.wire.context import wait as ctx_wait @@ -1001,117 +1001,117 @@ def confirm_summary( ) -async def confirm_ethereum_tx( - recipient: str, - total_amount: str, - maximum_fee: str, - items: Iterable[tuple[str, str]], - br_type: str = "confirm_ethereum_tx", - br_code: ButtonRequestType = ButtonRequestType.SignTx, - chunkify: bool = False, -) -> None: - total_layout = RustLayout( - trezorui2.confirm_total( - title=TR.words__title_summary, - items=[ - (f"{TR.words__amount}:", total_amount), - (TR.send__maximum_fee, maximum_fee), - ], - info_button=True, - cancel_arrow=True, - ) - ) - info_layout = RustLayout( - trezorui2.show_info_with_cancel( - title=TR.confirm_total__title_fee, - items=items, +if not utils.BITCOIN_ONLY: + + async def confirm_ethereum_tx( + recipient: str, + total_amount: str, + maximum_fee: str, + items: Iterable[tuple[str, str]], + br_type: str = "confirm_ethereum_tx", + br_code: ButtonRequestType = ButtonRequestType.SignTx, + chunkify: bool = False, + ) -> None: + total_layout = RustLayout( + trezorui2.confirm_total( + title=TR.words__title_summary, + items=[ + (f"{TR.words__amount}:", total_amount), + (TR.send__maximum_fee, maximum_fee), + ], + info_button=True, + cancel_arrow=True, + ) ) - ) - - while True: - # Allowing going back and forth between recipient and summary/details - await confirm_blob( - br_type, - TR.words__recipient.upper(), - recipient, - verb=TR.buttons__continue, - chunkify=chunkify, + info_layout = RustLayout( + trezorui2.show_info_with_cancel( + title=TR.confirm_total__title_fee, + items=items, + ) ) - try: - total_layout.request_complete_repaint() - await raise_if_not_confirmed( - with_info(total_layout, info_layout, br_type, br_code) + while True: + # Allowing going back and forth between recipient and summary/details + await confirm_blob( + br_type, + TR.words__recipient.upper(), + recipient, + verb=TR.buttons__continue, + chunkify=chunkify, ) - break - except ActionCancelled: - continue - -async def confirm_ethereum_staking_tx( - title: str, - intro_question: str, - verb: str, - total_amount: str, - maximum_fee: str, - address: str, - address_title: str, - info_items: Iterable[tuple[str, str]], - chunkify: bool = False, - br_type: str = "confirm_ethereum_staking_tx", - br_code: ButtonRequestType = ButtonRequestType.SignTx, -) -> None: - # intro - await confirm_value( - title, - intro_question, - "", - br_type, - br_code, - verb=verb, - value_text_mono=False, - info_items=(("", address),), - info_title=address_title, - chunkify_info=chunkify, - ) + try: + total_layout.request_complete_repaint() + await raise_if_not_confirmed( + with_info(total_layout, info_layout, br_type, br_code) + ) + break + except ActionCancelled: + continue - # confirmation - if verb == TR.ethereum__staking_claim: - items = ((TR.send__maximum_fee, maximum_fee),) - else: - items = ( - (TR.words__amount + ":", total_amount), - (TR.send__maximum_fee, maximum_fee), + async def confirm_ethereum_staking_tx( + title: str, + intro_question: str, + verb: str, + total_amount: str, + maximum_fee: str, + address: str, + address_title: str, + info_items: Iterable[tuple[str, str]], + chunkify: bool = False, + br_type: str = "confirm_ethereum_staking_tx", + br_code: ButtonRequestType = ButtonRequestType.SignTx, + ) -> None: + # intro + await confirm_value( + title, + intro_question, + "", + br_type, + br_code, + verb=verb, + value_text_mono=False, + info_items=(("", address),), + info_title=address_title, + chunkify_info=chunkify, ) - await confirm_summary( - items, # items - title=title, - info_title=TR.confirm_total__title_fee, - info_items=info_items, - br_type=br_type, - br_code=br_code, - ) + # confirmation + if verb == TR.ethereum__staking_claim: + items = ((TR.send__maximum_fee, maximum_fee),) + else: + items = ( + (TR.words__amount + ":", total_amount), + (TR.send__maximum_fee, maximum_fee), + ) + await confirm_summary( + items, # items + title=title, + info_title=TR.confirm_total__title_fee, + info_items=info_items, + br_type=br_type, + br_code=br_code, + ) -def confirm_solana_tx( - amount: str, - fee: str, - items: Iterable[tuple[str, str]], - amount_title: str | None = None, - fee_title: str | None = None, - br_type: str = "confirm_solana_tx", - br_code: ButtonRequestType = ButtonRequestType.SignTx, -) -> Awaitable[None]: - amount_title = ( - amount_title if amount_title is not None else f"{TR.words__amount}:" - ) # def_arg - fee_title = fee_title or TR.words__fee # def_arg - return confirm_summary( - ((amount_title, amount), (fee_title, fee)), - info_items=items, - br_type=br_type, - br_code=br_code, - ) + def confirm_solana_tx( + amount: str, + fee: str, + items: Iterable[tuple[str, str]], + amount_title: str | None = None, + fee_title: str | None = None, + br_type: str = "confirm_solana_tx", + br_code: ButtonRequestType = ButtonRequestType.SignTx, + ) -> Awaitable[None]: + amount_title = ( + amount_title if amount_title is not None else f"{TR.words__amount}:" + ) # def_arg + fee_title = fee_title or TR.words__fee # def_arg + return confirm_summary( + ((amount_title, amount), (fee_title, fee)), + info_items=items, + br_type=br_type, + br_code=br_code, + ) def confirm_joint_total(spending_amount: str, total_amount: str) -> Awaitable[None]: diff --git a/core/src/trezor/ui/layouts/tt/progress.py b/core/src/trezor/ui/layouts/tt/progress.py index 5997d247f..472e6d30e 100644 --- a/core/src/trezor/ui/layouts/tt/progress.py +++ b/core/src/trezor/ui/layouts/tt/progress.py @@ -1,7 +1,7 @@ from typing import TYPE_CHECKING import trezorui2 -from trezor import TR, ui +from trezor import TR, ui, utils if TYPE_CHECKING: from typing import Any @@ -60,13 +60,13 @@ def pin_progress(message: str, description: str) -> ProgressLayout: return progress(message, description=description) -def monero_keyimage_sync_progress() -> ProgressLayout: - return progress("", TR.progress__syncing) +if not utils.BITCOIN_ONLY: + def monero_keyimage_sync_progress() -> ProgressLayout: + return progress("", TR.progress__syncing) -def monero_live_refresh_progress() -> ProgressLayout: - return progress("", TR.progress__refreshing, indeterminate=True) + def monero_live_refresh_progress() -> ProgressLayout: + return progress("", TR.progress__refreshing, indeterminate=True) - -def monero_transaction_progress_inner() -> ProgressLayout: - return progress("", TR.progress__signing_transaction) + def monero_transaction_progress_inner() -> ProgressLayout: + return progress("", TR.progress__signing_transaction)