chore(core/pystyle): Fix errors and simplify imports based on feedback

[no changelog]

core/src/apps/ethereum/layout.py

@@ -1,9 +1,11 @@
 from typing import TYPE_CHECKING
+from ubinascii import hexlify
 
 from trezor import ui
 from trezor.enums import ButtonRequestType
 from trezor.strings import format_plural
 from trezor.ui.layouts import (
+    confirm_action,
     confirm_amount,
     confirm_blob,
     confirm_text,
@@ -14,7 +16,7 @@ from trezor.ui.layouts import (
 from .helpers import decode_typed_data
 
 if TYPE_CHECKING:
-    from typing import Awaitable, Iterable
+    from typing import Any, Awaitable, Iterable
 
     from trezor.messages import (
         EthereumFieldType,
@@ -103,7 +105,7 @@ async def require_confirm_eip1559_fee(
     )
     if spending is None:
         await confirm_max_fee(
-            gas_price,
+            max_gas_fee,
             gas_limit,
             network,
         )
@@ -117,7 +119,6 @@ async def require_confirm_eip1559_fee(
 
 
 def require_confirm_unknown_token(address_bytes: bytes) -> Awaitable[None]:
-    from ubinascii import hexlify
     from trezor.ui.layouts import confirm_address
 
     contract_address_hex = "0x" + hexlify(address_bytes).decode()
@@ -131,7 +132,6 @@ def require_confirm_unknown_token(address_bytes: bytes) -> Awaitable[None]:
 
 
 def require_confirm_address(address_bytes: bytes) -> Awaitable[None]:
-    from ubinascii import hexlify
     from trezor.ui.layouts import confirm_address
 
     address_hex = "0x" + hexlify(address_bytes).decode()
@@ -154,8 +154,6 @@ def require_confirm_data(data: bytes, data_total: int) -> Awaitable[None]:
 
 
 async def confirm_typed_data_final() -> None:
-    from trezor.ui.layouts import confirm_action
-
     await confirm_action(
         "confirm_typed_data_final",
         "Confirm typed data",
@@ -165,15 +163,12 @@ async def confirm_typed_data_final() -> None:
     )
 
 
-def require_confirm_approve_tx(
+async def require_confirm_approve_tx(
     address_bytes: bytes,
     allowance: int,
     network: EthereumNetworkInfo,
     token: EthereumTokenInfo,
-) -> Awaitable[None]:
-    from trezor.ui.layouts import confirm_action
-    from ubinascii import hexlify
-
+) -> None:
     address_hex = "0x" + hexlify(address_bytes).decode()
 
     await confirm_action(

core/src/apps/ethereum/sign_tx.py

@@ -37,7 +37,7 @@ async def sign_tx(
     if len(msg.gas_price) + len(msg.gas_limit) > 30:
         raise DataError("Fee overflow")
 
-    token, address_bytes, recipient, value = await sign_tx_inner(msg, keychain, defs)
+    token, address_bytes, _recipient, value = await sign_tx_inner(msg, keychain, defs)
 
     data_total = msg.data_length
 
@@ -90,12 +90,11 @@ async def sign_tx_inner(
     msg: MsgInSignTx,
     keychain: Keychain,
     defs: Definitions,
-) -> tuple[EthereumTokenInfo | None, bytes, bytes, int]:
+) -> tuple[EthereumTokenInfo | None, bytes, bytes, int | None]:
     from . import tokens
     from .layout import (
         require_confirm_approve_tx,
         require_confirm_data,
-        require_confirm_fee,
         require_confirm_tx,
         require_confirm_unknown_token,
     )
@@ -108,7 +107,6 @@ async def sign_tx_inner(
     token = None
     address_bytes = recipient = bytes_from_address(msg.to)
     value = int.from_bytes(msg.value, "big")
-    run_confirm_tx = True
     if (
         len(msg.to) in (40, 42)
         and len(msg.value) == 0
@@ -139,9 +137,8 @@ async def sign_tx_inner(
             allowance = int.from_bytes(data_initial_chunk[36:68], "big")
 
             await require_confirm_approve_tx(recipient, allowance, defs.network, token)
-            run_confirm_tx = False
 
-    if run_confirm_tx:
+    if value is not None:
         await require_confirm_tx(recipient, value, defs.network, token)
 
     if token is None and msg.data_length > 0:

core/src/apps/ethereum/sign_tx_eip1559.py

@@ -37,11 +37,8 @@ async def sign_tx_eip1559(
     from trezor.utils import HashWriter
     from trezor import wire
     from trezor.crypto import rlp  # local_cache_global
-    from apps.common import paths
     from .layout import (
-        require_confirm_data,
         require_confirm_eip1559_fee,
-        require_confirm_tx,
     )
     from .sign_tx import sign_tx_inner, send_request_chunk
 
@@ -53,7 +50,7 @@ async def sign_tx_eip1559(
     if len(msg.max_priority_fee) + len(gas_limit) > 30:
         raise wire.DataError("Fee overflow")
 
-    token, address_bytes, recipient, value = await sign_tx_inner(msg, keychain, defs)
+    token, address_bytes, _recipient, value = await sign_tx_inner(msg, keychain, defs)
 
     data_total = msg.data_length
 

tests/ui_tests/fixtures.json

@@ -2757,7 +2757,7 @@
 "TT_ethereum-test_signtx.py::test_signtx[data_1]": "863146c0494b76d4d8a9773a406994c3a35fb8c0cb989f372214aaa80b63b73c",
 "TT_ethereum-test_signtx.py::test_signtx[data_2_bigdata]": "05aa081d00a78c3a432904b19c21df1512c7660f4be3edaec75c9bc1aad83ae8",
 "TT_ethereum-test_signtx.py::test_signtx[erc20_token]": "d51cf4119a784bac447971e8e80be44985c28a9e5f14917efb7c2064d7f21752",
-"TT_ethereum-test_signtx.py::test_signtx[erc20_approve]": "a171451f6f0ba9da5d77790a7600766f639c5e4845c47b7992c430ce49f5260a",
+"TT_ethereum-test_signtx.py::test_signtx[erc20_approve]": "52b9f649ead0dd8a8fbcc8c6ee215299310b40c8837be323f6acf9d4789c010d",
 "TT_ethereum-test_signtx.py::test_signtx[max_chain_id]": "3723ceb0436e8d7f4669edcf36e72cb1fe65d891f910886fa79e9e406c5e9479",
 "TT_ethereum-test_signtx.py::test_signtx[max_chain_plus_one]": "3723ceb0436e8d7f4669edcf36e72cb1fe65d891f910886fa79e9e406c5e9479",
 "TT_ethereum-test_signtx.py::test_signtx[max_uint64]": "3723ceb0436e8d7f4669edcf36e72cb1fe65d891f910886fa79e9e406c5e9479",