chore(ethereum): cleanup ERC-7730 type names

[no changelog]

Author: ibz

common/protob/messages-definitions.proto

@@ -13,7 +13,7 @@ enum DefinitionType {
     ETHEREUM_NETWORK = 0;
     ETHEREUM_TOKEN = 1;
     SOLANA_TOKEN = 2;
-    ETHEREUM_ERC7730_DISPLAY_FORMAT = 3;
+    ETHEREUM_DISPLAY_FORMAT = 3;
 }
 
 // ****** CROSS-PARSEABILITY NOTE ******
@@ -27,7 +27,7 @@ enum DefinitionType {
 // * EthereumNetworkInfo: varint, length-delimited, varint, ...
 // * EthereumTokenInfo: length-delimited, varint, ...
 // * SolanaTokenInfo: length-delimited, length-delimited, ...
-// * EthereumERC7730DisplayFormat: varint, length-delimited, length-delimited, ...
+// * EthereumDisplayFormat: varint, length-delimited, length-delimited, ...
 
 // ****** ETHEREUM_NETWORK ******
 
@@ -68,7 +68,7 @@ message SolanaTokenInfo {
     required string name = 3;
 }
 
-// ****** ETHEREUM_ERC7730_DISPLAY_FORMAT ******
+// ****** ETHEREUM_DISPLAY_FORMAT ******
 
 /**
  * Solidity types.
@@ -172,10 +172,10 @@ message EthereumERC7730FieldInfo {
 }
 
 /**
- * Ethereum ERC-7730 display format - corresponding to `DisplayFormat` in `clear_signing.py`.
+ * Ethereum display format - corresponding to `DisplayFormat` in `clear_signing.py`.
  * @embed
  */
-message EthereumERC7730DisplayFormatInfo {
+message EthereumDisplayFormatInfo {
     required uint64 chain_id = 1;
     required bytes address = 2;
     required bytes func_sig = 3;

core/src/apps/common/definitions.py

@@ -1,7 +1,7 @@
 from typing import TYPE_CHECKING
 
 from trezor.messages import (
-    EthereumERC7730DisplayFormatInfo,
+    EthereumDisplayFormatInfo,
     EthereumNetworkInfo,
     EthereumTokenInfo,
     SolanaTokenInfo,
@@ -18,7 +18,7 @@
         EthereumNetworkInfo,
         EthereumTokenInfo,
         SolanaTokenInfo,
-        EthereumERC7730DisplayFormatInfo,
+        EthereumDisplayFormatInfo,
     )
 
 
@@ -42,8 +42,8 @@ def decode_definition(definition: AnyBytes, expected_type: type[DefType]) -> Def
         expected_type_number = DefinitionType.ETHEREUM_TOKEN
     if expected_type.MESSAGE_NAME == SolanaTokenInfo.MESSAGE_NAME:
         expected_type_number = DefinitionType.SOLANA_TOKEN
-    if expected_type.MESSAGE_NAME == EthereumERC7730DisplayFormatInfo.MESSAGE_NAME:
-        expected_type_number = DefinitionType.ETHEREUM_ERC7730_DISPLAY_FORMAT
+    if expected_type.MESSAGE_NAME == EthereumDisplayFormatInfo.MESSAGE_NAME:
+        expected_type_number = DefinitionType.ETHEREUM_DISPLAY_FORMAT
 
     try:
         # first check format version

core/src/apps/ethereum/clear_signing.py

@@ -727,11 +727,11 @@ def get_value_for_path(path: Path) -> Value:
 
     @classmethod
     def from_encoded(cls, encoded: AnyBytes) -> Self:
-        from trezor.messages import EthereumERC7730DisplayFormatInfo
+        from trezor.messages import EthereumDisplayFormatInfo
 
         from apps.common.definitions import decode_definition
 
-        proto = decode_definition(encoded, EthereumERC7730DisplayFormatInfo)
+        proto = decode_definition(encoded, EthereumDisplayFormatInfo)
 
         return cls(
             binding_context=BindingContext([(proto.chain_id, bytes(proto.address))]),

core/src/trezor/enums/DefinitionType.py

@@ -9,7 +9,7 @@ SKIPPED_MESSAGES := Cardano DebugMonero Eos Monero Ontology Ripple SdProtect Tez
 	DebugLinkN4W1Connected DebugLinkN4W1Read DebugLinkN4W1Write DebugLinkN4W1Response \
 	DebugLinkOptigaSetSecMax DebugLinkSetLogFilter \
 	GetNonce TxAckInput TxAckOutput TxAckPrev PaymentRequest \
-	EthereumABITupleInfo EthereumABIValueInfo EthereumERC7730FieldInfo EthereumERC7730DisplayFormatInfo EthereumERC7730Path \
+	EthereumABITupleInfo EthereumABIValueInfo EthereumERC7730FieldInfo EthereumDisplayFormatInfo EthereumERC7730Path \
 	EthereumSignTypedData EthereumTypedDataStructRequest EthereumTypedDataStructAck \
 	EthereumTypedDataValueRequest EthereumTypedDataValueAck ShowDeviceTutorial \
 	UnlockBootloader AuthenticateDevice AuthenticityProof \