← Watch feed
chore(ethereum): cleanup ERC-7730 type names
Public commit record
57/100 · Thin
What the developer wrote
Authored by Ioan Bizău
chore(ethereum): cleanup ERC-7730 type names
[no changelog]
✓ Descriptive subject✓ Names a concrete action or component✓ Uses a recognizable type or scope! No meaningful explanatory body
What changed, and why it matters
This commit is a simple renaming cleanup. It changes identifiers like 'EthereumERC7730DisplayFormatInfo' to 'EthereumDisplayFormatInfo' and 'ETHEREUM_ERC7730_DISPLAY_FORMAT' to 'ETHEREUM_DISPLAY_FORMAT' across protobuf definitions, generated code, and tests. There are no functional changes to how data is validated, parsed, or displayed.
Recommended action
No action required; this is a non-functional rename.
Security signals we found
No strong security signals were identified.
Evidence from the diff
The commit is a pure refactor: it renames the protobuf message, enum value, and all generated/consumer references for the Ethereum clear-signing display format from names containing ‘ERC7730’ to generic ‘DisplayFormat’ names. The wire format, field numbers, required/optional semantics, and decoding logic remain identical. No security boundary is altered.
Changed components
common/protob/messages-definitions.protocore/src/apps/common/definitions.pycore/src/apps/ethereum/clear_signing.pycore/src/trezor/enums/DefinitionType.pycore/src/trezor/enums/__init__.pycore/src/trezor/messages.pylegacy/firmware/protob/Makefilepython/src/trezorlib/messages.pyrust/trezor-client/src/protos/generated/messages_definitions.rstests/definitions.pytests/device_tests/ethereum/test_definitions.pytests/device_tests/ethereum/test_definitions_bad.pyInspect captured patch +100 / −100
diff --git a/common/protob/messages-definitions.proto b/common/protob/messages-definitions.proto
index 8788ea5d..c3418656 100644
--- a/common/protob/messages-definitions.proto
+++ b/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;
diff --git a/core/src/apps/common/definitions.py b/core/src/apps/common/definitions.py
index 0876742c..43dea5f8 100644
--- a/core/src/apps/common/definitions.py
+++ b/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 @@ if TYPE_CHECKING:
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
diff --git a/core/src/apps/ethereum/clear_signing.py b/core/src/apps/ethereum/clear_signing.py
index eb5fd0c0..b62dc5cc 100644
--- a/core/src/apps/ethereum/clear_signing.py
+++ b/core/src/apps/ethereum/clear_signing.py
@@ -727,11 +727,11 @@ class DisplayFormat:
@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))]),
diff --git a/core/src/trezor/enums/DefinitionType.py b/core/src/trezor/enums/DefinitionType.py
index 0e93c711..c4fd630a 100644
--- a/core/src/trezor/enums/DefinitionType.py
+++ b/core/src/trezor/enums/DefinitionType.py
@@ -5,4 +5,4 @@
ETHEREUM_NETWORK = 0
ETHEREUM_TOKEN = 1
SOLANA_TOKEN = 2
-ETHEREUM_ERC7730_DISPLAY_FORMAT = 3
+ETHEREUM_DISPLAY_FORMAT = 3
diff --git a/core/src/trezor/enums/__init__.py b/core/src/trezor/enums/__init__.py
index 5ad21cb7..32300bc3 100644
--- a/core/src/trezor/enums/__init__.py
+++ b/core/src/trezor/enums/__init__.py
@@ -289,7 +289,7 @@ if TYPE_CHECKING:
ETHEREUM_NETWORK = 0
ETHEREUM_TOKEN = 1
SOLANA_TOKEN = 2
- ETHEREUM_ERC7730_DISPLAY_FORMAT = 3
+ ETHEREUM_DISPLAY_FORMAT = 3
class EthereumABIType(IntEnum):
ABI_ADDRESS = 0
diff --git a/core/src/trezor/messages.py b/core/src/trezor/messages.py
index dca3e154..7b27ec8e 100644
--- a/core/src/trezor/messages.py
+++ b/core/src/trezor/messages.py
@@ -3347,7 +3347,7 @@ if TYPE_CHECKING:
def is_type_of(cls, msg: Any) -> TypeGuard["EthereumERC7730FieldInfo"]:
return isinstance(msg, cls)
- class EthereumERC7730DisplayFormatInfo(protobuf.MessageType):
+ class EthereumDisplayFormatInfo(protobuf.MessageType):
chain_id: "int"
address: "AnyBytes"
func_sig: "AnyBytes"
@@ -3368,7 +3368,7 @@ if TYPE_CHECKING:
pass
@classmethod
- def is_type_of(cls, msg: Any) -> TypeGuard["EthereumERC7730DisplayFormatInfo"]:
+ def is_type_of(cls, msg: Any) -> TypeGuard["EthereumDisplayFormatInfo"]:
return isinstance(msg, cls)
class EosGetPublicKey(protobuf.MessageType):
diff --git a/legacy/firmware/protob/Makefile b/legacy/firmware/protob/Makefile
index 74e1530c..c90e254f 100644
--- a/legacy/firmware/protob/Makefile
+++ b/legacy/firmware/protob/Makefile
@@ -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 \
diff --git a/python/src/trezorlib/messages.py b/python/src/trezorlib/messages.py
index 661daa8a..c400a80b 100644
--- a/python/src/trezorlib/messages.py
+++ b/python/src/trezorlib/messages.py
@@ -329,7 +329,7 @@ class DefinitionType(IntEnum):
ETHEREUM_NETWORK = 0
ETHEREUM_TOKEN = 1
SOLANA_TOKEN = 2
- ETHEREUM_ERC7730_DISPLAY_FORMAT = 3
+ ETHEREUM_DISPLAY_FORMAT = 3
class EthereumABIType(IntEnum):
@@ -4769,7 +4769,7 @@ class EthereumERC7730FieldInfo(protobuf.MessageType):
self.prefix = prefix
-class EthereumERC7730DisplayFormatInfo(protobuf.MessageType):
+class EthereumDisplayFormatInfo(protobuf.MessageType):
MESSAGE_WIRE_TYPE = None
FIELDS = {
1: protobuf.Field("chain_id", "uint64", repeated=False, required=True),
diff --git a/rust/trezor-client/src/protos/generated/messages_definitions.rs b/rust/trezor-client/src/protos/generated/messages_definitions.rs
index 8ff7c144..ab3a2dec 100644
--- a/rust/trezor-client/src/protos/generated/messages_definitions.rs
+++ b/rust/trezor-client/src/protos/generated/messages_definitions.rs
@@ -1954,35 +1954,35 @@ impl ::protobuf::reflect::ProtobufValue for EthereumERC7730FieldInfo {
type RuntimeType = ::protobuf::reflect::rt::RuntimeTypeMessage<Self>;
}
-// @@protoc_insertion_point(message:hw.trezor.messages.definitions.EthereumERC7730DisplayFormatInfo)
+// @@protoc_insertion_point(message:hw.trezor.messages.definitions.EthereumDisplayFormatInfo)
#[derive(PartialEq,Clone,Default,Debug)]
-pub struct EthereumERC7730DisplayFormatInfo {
+pub struct EthereumDisplayFormatInfo {
// message fields
- // @@protoc_insertion_point(field:hw.trezor.messages.definitions.EthereumERC7730DisplayFormatInfo.chain_id)
+ // @@protoc_insertion_point(field:hw.trezor.messages.definitions.EthereumDisplayFormatInfo.chain_id)
pub chain_id: ::std::option::Option<u64>,
- // @@protoc_insertion_point(field:hw.trezor.messages.definitions.EthereumERC7730DisplayFormatInfo.address)
+ // @@protoc_insertion_point(field:hw.trezor.messages.definitions.EthereumDisplayFormatInfo.address)
pub address: ::std::option::Option<::std::vec::Vec<u8>>,
- // @@protoc_insertion_point(field:hw.trezor.messages.definitions.EthereumERC7730DisplayFormatInfo.func_sig)
+ // @@protoc_insertion_point(field:hw.trezor.messages.definitions.EthereumDisplayFormatInfo.func_sig)
pub func_sig: ::std::option::Option<::std::vec::Vec<u8>>,
- // @@protoc_insertion_point(field:hw.trezor.messages.definitions.EthereumERC7730DisplayFormatInfo.intent)
+ // @@protoc_insertion_point(field:hw.trezor.messages.definitions.EthereumDisplayFormatInfo.intent)
pub intent: ::std::option::Option<::std::string::String>,
- // @@protoc_insertion_point(field:hw.trezor.messages.definitions.EthereumERC7730DisplayFormatInfo.parameter_definitions)
+ // @@protoc_insertion_point(field:hw.trezor.messages.definitions.EthereumDisplayFormatInfo.parameter_definitions)
pub parameter_definitions: ::std::vec::Vec<EthereumABIValueInfo>,
- // @@protoc_insertion_point(field:hw.trezor.messages.definitions.EthereumERC7730DisplayFormatInfo.field_definitions)
+ // @@protoc_insertion_point(field:hw.trezor.messages.definitions.EthereumDisplayFormatInfo.field_definitions)
pub field_definitions: ::std::vec::Vec<EthereumERC7730FieldInfo>,
// special fields
- // @@protoc_insertion_point(special_field:hw.trezor.messages.definitions.EthereumERC7730DisplayFormatInfo.special_fields)
+ // @@protoc_insertion_point(special_field:hw.trezor.messages.definitions.EthereumDisplayFormatInfo.special_fields)
pub special_fields: ::protobuf::SpecialFields,
}
-impl<'a> ::std::default::Default for &'a EthereumERC7730DisplayFormatInfo {
- fn default() -> &'a EthereumERC7730DisplayFormatInfo {
- <EthereumERC7730DisplayFormatInfo as ::protobuf::Message>::default_instance()
+impl<'a> ::std::default::Default for &'a EthereumDisplayFormatInfo {
+ fn default() -> &'a EthereumDisplayFormatInfo {
+ <EthereumDisplayFormatInfo as ::protobuf::Message>::default_instance()
}
}
-impl EthereumERC7730DisplayFormatInfo {
- pub fn new() -> EthereumERC7730DisplayFormatInfo {
+impl EthereumDisplayFormatInfo {
+ pub fn new() -> EthereumDisplayFormatInfo {
::std::default::Default::default()
}
@@ -2118,44 +2118,44 @@ impl EthereumERC7730DisplayFormatInfo {
let mut oneofs = ::std::vec::Vec::with_capacity(0);
fields.push(::protobuf::reflect::rt::v2::make_option_accessor::<_, _>(
"chain_id",
- |m: &EthereumERC7730DisplayFormatInfo| { &m.chain_id },
- |m: &mut EthereumERC7730DisplayFormatInfo| { &mut m.chain_id },
+ |m: &EthereumDisplayFormatInfo| { &m.chain_id },
+ |m: &mut EthereumDisplayFormatInfo| { &mut m.chain_id },
));
fields.push(::protobuf::reflect::rt::v2::make_option_accessor::<_, _>(
"address",
- |m: &EthereumERC7730DisplayFormatInfo| { &m.address },
- |m: &mut EthereumERC7730DisplayFormatInfo| { &mut m.address },
+ |m: &EthereumDisplayFormatInfo| { &m.address },
+ |m: &mut EthereumDisplayFormatInfo| { &mut m.address },
));
fields.push(::protobuf::reflect::rt::v2::make_option_accessor::<_, _>(
"func_sig",
- |m: &EthereumERC7730DisplayFormatInfo| { &m.func_sig },
- |m: &mut EthereumERC7730DisplayFormatInfo| { &mut m.func_sig },
+ |m: &EthereumDisplayFormatInfo| { &m.func_sig },
+ |m: &mut EthereumDisplayFormatInfo| { &mut m.func_sig },
));
fields.push(::protobuf::reflect::rt::v2::make_option_accessor::<_, _>(
"intent",
- |m: &EthereumERC7730DisplayFormatInfo| { &m.intent },
- |m: &mut EthereumERC7730DisplayFormatInfo| { &mut m.intent },
+ |m: &EthereumDisplayFormatInfo| { &m.intent },
+ |m: &mut EthereumDisplayFormatInfo| { &mut m.intent },
));
fields.push(::protobuf::reflect::rt::v2::make_vec_simpler_accessor::<_, _>(
"parameter_definitions",
- |m: &EthereumERC7730DisplayFormatInfo| { &m.parameter_definitions },
- |m: &mut EthereumERC7730DisplayFormatInfo| { &mut m.parameter_definitions },
+ |m: &EthereumDisplayFormatInfo| { &m.parameter_definitions },
+ |m: &mut EthereumDisplayFormatInfo| { &mut m.parameter_definitions },
));
fields.push(::protobuf::reflect::rt::v2::make_vec_simpler_accessor::<_, _>(
"field_definitions",
- |m: &EthereumERC7730DisplayFormatInfo| { &m.field_definitions },
- |m: &mut EthereumERC7730DisplayFormatInfo| { &mut m.field_definitions },
+ |m: &EthereumDisplayFormatInfo| { &m.field_definitions },
+ |m: &mut EthereumDisplayFormatInfo| { &mut m.field_definitions },
));
- ::protobuf::reflect::GeneratedMessageDescriptorData::new_2::<EthereumERC7730DisplayFormatInfo>(
- "EthereumERC7730DisplayFormatInfo",
+ ::protobuf::reflect::GeneratedMessageDescriptorData::new_2::<EthereumDisplayFormatInfo>(
+ "EthereumDisplayFormatInfo",
fields,
oneofs,
)
}
}
-impl ::protobuf::Message for EthereumERC7730DisplayFormatInfo {
- const NAME: &'static str = "EthereumERC7730DisplayFormatInfo";
+impl ::protobuf::Message for EthereumDisplayFormatInfo {
+ const NAME: &'static str = "EthereumDisplayFormatInfo";
fn is_initialized(&self) -> bool {
if self.chain_id.is_none() {
@@ -2272,8 +2272,8 @@ impl ::protobuf::Message for EthereumERC7730DisplayFormatInfo {
&mut self.special_fields
}
- fn new() -> EthereumERC7730DisplayFormatInfo {
- EthereumERC7730DisplayFormatInfo::new()
+ fn new() -> EthereumDisplayFormatInfo {
+ EthereumDisplayFormatInfo::new()
}
fn clear(&mut self) {
@@ -2286,8 +2286,8 @@ impl ::protobuf::Message for EthereumERC7730DisplayFormatInfo {
self.special_fields.clear();
}
- fn default_instance() -> &'static EthereumERC7730DisplayFormatInfo {
- static instance: EthereumERC7730DisplayFormatInfo = EthereumERC7730DisplayFormatInfo {
+ fn default_instance() -> &'static EthereumDisplayFormatInfo {
+ static instance: EthereumDisplayFormatInfo = EthereumDisplayFormatInfo {
chain_id: ::std::option::Option::None,
address: ::std::option::Option::None,
func_sig: ::std::option::Option::None,
@@ -2300,20 +2300,20 @@ impl ::protobuf::Message for EthereumERC7730DisplayFormatInfo {
}
}
-impl ::protobuf::MessageFull for EthereumERC7730DisplayFormatInfo {
+impl ::protobuf::MessageFull for EthereumDisplayFormatInfo {
fn descriptor() -> ::protobuf::reflect::MessageDescriptor {
static descriptor: ::protobuf::rt::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::rt::Lazy::new();
- descriptor.get(|| file_descriptor().message_by_package_relative_name("EthereumERC7730DisplayFormatInfo").unwrap()).clone()
+ descriptor.get(|| file_descriptor().message_by_package_relative_name("EthereumDisplayFormatInfo").unwrap()).clone()
}
}
-impl ::std::fmt::Display for EthereumERC7730DisplayFormatInfo {
+impl ::std::fmt::Display for EthereumDisplayFormatInfo {
fn fmt(&self, f: &mut ::std::fmt::Formatter<'_>) -> ::std::fmt::Result {
::protobuf::text_format::fmt(self, f)
}
}
-impl ::protobuf::reflect::ProtobufValue for EthereumERC7730DisplayFormatInfo {
+impl ::protobuf::reflect::ProtobufValue for EthereumDisplayFormatInfo {
type RuntimeType = ::protobuf::reflect::rt::RuntimeTypeMessage<Self>;
}
@@ -2326,8 +2326,8 @@ pub enum DefinitionType {
ETHEREUM_TOKEN = 1,
// @@protoc_insertion_point(enum_value:hw.trezor.messages.definitions.DefinitionType.SOLANA_TOKEN)
SOLANA_TOKEN = 2,
- // @@protoc_insertion_point(enum_value:hw.trezor.messages.definitions.DefinitionType.ETHEREUM_ERC7730_DISPLAY_FORMAT)
- ETHEREUM_ERC7730_DISPLAY_FORMAT = 3,
+ // @@protoc_insertion_point(enum_value:hw.trezor.messages.definitions.DefinitionType.ETHEREUM_DISPLAY_FORMAT)
+ ETHEREUM_DISPLAY_FORMAT = 3,
}
impl ::protobuf::Enum for DefinitionType {
@@ -2342,7 +2342,7 @@ impl ::protobuf::Enum for DefinitionType {
0 => ::std::option::Option::Some(DefinitionType::ETHEREUM_NETWORK),
1 => ::std::option::Option::Some(DefinitionType::ETHEREUM_TOKEN),
2 => ::std::option::Option::Some(DefinitionType::SOLANA_TOKEN),
- 3 => ::std::option::Option::Some(DefinitionType::ETHEREUM_ERC7730_DISPLAY_FORMAT),
+ 3 => ::std::option::Option::Some(DefinitionType::ETHEREUM_DISPLAY_FORMAT),
_ => ::std::option::Option::None
}
}
@@ -2352,7 +2352,7 @@ impl ::protobuf::Enum for DefinitionType {
"ETHEREUM_NETWORK" => ::std::option::Option::Some(DefinitionType::ETHEREUM_NETWORK),
"ETHEREUM_TOKEN" => ::std::option::Option::Some(DefinitionType::ETHEREUM_TOKEN),
"SOLANA_TOKEN" => ::std::option::Option::Some(DefinitionType::SOLANA_TOKEN),
- "ETHEREUM_ERC7730_DISPLAY_FORMAT" => ::std::option::Option::Some(DefinitionType::ETHEREUM_ERC7730_DISPLAY_FORMAT),
+ "ETHEREUM_DISPLAY_FORMAT" => ::std::option::Option::Some(DefinitionType::ETHEREUM_DISPLAY_FORMAT),
_ => ::std::option::Option::None
}
}
@@ -2361,7 +2361,7 @@ impl ::protobuf::Enum for DefinitionType {
DefinitionType::ETHEREUM_NETWORK,
DefinitionType::ETHEREUM_TOKEN,
DefinitionType::SOLANA_TOKEN,
- DefinitionType::ETHEREUM_ERC7730_DISPLAY_FORMAT,
+ DefinitionType::ETHEREUM_DISPLAY_FORMAT,
];
}
@@ -2726,30 +2726,30 @@ static file_descriptor_proto_data: &'static [u8] = b"\
\ttokenPath\x12\x1c\n\tthreshold\x18\x05\x20\x01(\x0cR\tthreshold\x12\
\x1a\n\x08decimals\x18\x06\x20\x01(\rR\x08decimals\x12\x12\n\x04base\x18\
\x07\x20\x01(\tR\x04base\x12\x16\n\x06prefix\x18\x08\x20\x01(\x08R\x06pr\
- efix\"\xdc\x02\n\x20EthereumERC7730DisplayFormatInfo\x12\x19\n\x08chain_\
- id\x18\x01\x20\x02(\x04R\x07chainId\x12\x18\n\x07address\x18\x02\x20\x02\
- (\x0cR\x07address\x12\x19\n\x08func_sig\x18\x03\x20\x02(\x0cR\x07funcSig\
- \x12\x16\n\x06intent\x18\x04\x20\x02(\tR\x06intent\x12i\n\x15parameter_d\
- efinitions\x18\x05\x20\x03(\x0b24.hw.trezor.messages.definitions.Ethereu\
- mABIValueInfoR\x14parameterDefinitions\x12e\n\x11field_definitions\x18\
- \x06\x20\x03(\x0b28.hw.trezor.messages.definitions.EthereumERC7730FieldI\
- nfoR\x10fieldDefinitions*q\n\x0eDefinitionType\x12\x14\n\x10ETHEREUM_NET\
- WORK\x10\0\x12\x12\n\x0eETHEREUM_TOKEN\x10\x01\x12\x10\n\x0cSOLANA_TOKEN\
- \x10\x02\x12#\n\x1fETHEREUM_ERC7730_DISPLAY_FORMAT\x10\x03*\xc4\x02\n\
- \x0fEthereumABIType\x12\x0f\n\x0bABI_ADDRESS\x10\0\x12\x0f\n\x0bABI_UINT\
- 256\x10\x01\x12\x0f\n\x0bABI_UINT248\x10\x02\x12\x0f\n\x0bABI_UINT160\
- \x10\x03\x12\x0f\n\x0bABI_UINT128\x10\x04\x12\x0f\n\x0bABI_UINT120\x10\
- \x05\x12\x0f\n\x0bABI_UINT112\x10\x06\x12\x0e\n\nABI_UINT96\x10\x07\x12\
- \x0e\n\nABI_UINT72\x10\x08\x12\x0e\n\nABI_UINT64\x10\t\x12\x0e\n\nABI_UI\
- NT48\x10\n\x12\x0e\n\nABI_UINT40\x10\x0b\x12\x0e\n\nABI_UINT32\x10\x0c\
- \x12\x0e\n\nABI_UINT24\x10\r\x12\x0e\n\nABI_UINT16\x10\x0e\x12\r\n\tABI_\
- UINT8\x10\x0f\x12\x0c\n\x08ABI_BOOL\x10\x10\x12\r\n\tABI_BYTES\x10\x14\
- \x12\x0e\n\nABI_STRING\x10\x15*\x85\x01\n!EthereumERC7730FieldFormatterT\
- ype\x12\x1a\n\x16FORMATTER_ADDRESS_NAME\x10\0\x12\x14\n\x10FORMATTER_AMO\
- UNT\x10\x01\x12\x1a\n\x16FORMATTER_TOKEN_AMOUNT\x10\x02\x12\x12\n\x0eFOR\
- MATTER_UNIT\x10\x03*3\n\x1cEthereumERC7730ContainerPath\x12\x08\n\x04FRO\
- M\x10\x01\x12\t\n\x05VALUE\x10\x02B?\n#com.satoshilabs.trezor.lib.protob\
- ufB\x18TrezorMessageDefinitions\
+ efix\"\xd5\x02\n\x19EthereumDisplayFormatInfo\x12\x19\n\x08chain_id\x18\
+ \x01\x20\x02(\x04R\x07chainId\x12\x18\n\x07address\x18\x02\x20\x02(\x0cR\
+ \x07address\x12\x19\n\x08func_sig\x18\x03\x20\x02(\x0cR\x07funcSig\x12\
+ \x16\n\x06intent\x18\x04\x20\x02(\tR\x06intent\x12i\n\x15parameter_defin\
+ itions\x18\x05\x20\x03(\x0b24.hw.trezor.messages.definitions.EthereumABI\
+ ValueInfoR\x14parameterDefinitions\x12e\n\x11field_definitions\x18\x06\
+ \x20\x03(\x0b28.hw.trezor.messages.definitions.EthereumERC7730FieldInfoR\
+ \x10fieldDefinitions*i\n\x0eDefinitionType\x12\x14\n\x10ETHEREUM_NETWORK\
+ \x10\0\x12\x12\n\x0eETHEREUM_TOKEN\x10\x01\x12\x10\n\x0cSOLANA_TOKEN\x10\
+ \x02\x12\x1b\n\x17ETHEREUM_DISPLAY_FORMAT\x10\x03*\xc4\x02\n\x0fEthereum\
+ ABIType\x12\x0f\n\x0bABI_ADDRESS\x10\0\x12\x0f\n\x0bABI_UINT256\x10\x01\
+ \x12\x0f\n\x0bABI_UINT248\x10\x02\x12\x0f\n\x0bABI_UINT160\x10\x03\x12\
+ \x0f\n\x0bABI_UINT128\x10\x04\x12\x0f\n\x0bABI_UINT120\x10\x05\x12\x0f\n\
+ \x0bABI_UINT112\x10\x06\x12\x0e\n\nABI_UINT96\x10\x07\x12\x0e\n\nABI_UIN\
+ T72\x10\x08\x12\x0e\n\nABI_UINT64\x10\t\x12\x0e\n\nABI_UINT48\x10\n\x12\
+ \x0e\n\nABI_UINT40\x10\x0b\x12\x0e\n\nABI_UINT32\x10\x0c\x12\x0e\n\nABI_\
+ UINT24\x10\r\x12\x0e\n\nABI_UINT16\x10\x0e\x12\r\n\tABI_UINT8\x10\x0f\
+ \x12\x0c\n\x08ABI_BOOL\x10\x10\x12\r\n\tABI_BYTES\x10\x14\x12\x0e\n\nABI\
+ _STRING\x10\x15*\x85\x01\n!EthereumERC7730FieldFormatterType\x12\x1a\n\
+ \x16FORMATTER_ADDRESS_NAME\x10\0\x12\x14\n\x10FORMATTER_AMOUNT\x10\x01\
+ \x12\x1a\n\x16FORMATTER_TOKEN_AMOUNT\x10\x02\x12\x12\n\x0eFORMATTER_UNIT\
+ \x10\x03*3\n\x1cEthereumERC7730ContainerPath\x12\x08\n\x04FROM\x10\x01\
+ \x12\t\n\x05VALUE\x10\x02B?\n#com.satoshilabs.trezor.lib.protobufB\x18Tr\
+ ezorMessageDefinitions\
";
/// `FileDescriptorProto` object which was a source for this generated file
@@ -2775,7 +2775,7 @@ pub fn file_descriptor() -> &'static ::protobuf::reflect::FileDescriptor {
messages.push(EthereumABIValueInfo::generated_message_descriptor_data());
messages.push(EthereumERC7730Path::generated_message_descriptor_data());
messages.push(EthereumERC7730FieldInfo::generated_message_descriptor_data());
- messages.push(EthereumERC7730DisplayFormatInfo::generated_message_descriptor_data());
+ messages.push(EthereumDisplayFormatInfo::generated_message_descriptor_data());
let mut enums = ::std::vec::Vec::with_capacity(4);
enums.push(DefinitionType::generated_enum_descriptor_data());
enums.push(EthereumABIType::generated_enum_descriptor_data());
diff --git a/tests/definitions.py b/tests/definitions.py
index 8d711da3..34ba6c74 100644
--- a/tests/definitions.py
+++ b/tests/definitions.py
@@ -46,7 +46,7 @@ def make_payload(
messages.EthereumNetworkInfo
| messages.EthereumTokenInfo
| messages.SolanaTokenInfo
- | messages.EthereumERC7730DisplayFormatInfo
+ | messages.EthereumDisplayFormatInfo
| bytes
) = make_eth_network(),
) -> bytes:
@@ -167,14 +167,14 @@ def make_eth_erc7730_display_format(
intent: str = "Fake intent",
parameter_definitions: list[messages.EthereumABIValueInfo] | None = None,
field_definitions: list[messages.EthereumERC7730FieldInfo] | None = None,
-) -> messages.EthereumERC7730DisplayFormatInfo:
+) -> messages.EthereumDisplayFormatInfo:
if isinstance(address, str):
if address.startswith("0x"):
address = address[2:]
address_bytes = bytes.fromhex(address)
else:
address_bytes = address
- return messages.EthereumERC7730DisplayFormatInfo(
+ return messages.EthereumDisplayFormatInfo(
chain_id=chain_id,
address=address_bytes,
func_sig=func_sig,
@@ -185,10 +185,10 @@ def make_eth_erc7730_display_format(
def encode_eth_erc7730_display_format(
- display_format: messages.EthereumERC7730DisplayFormatInfo,
+ display_format: messages.EthereumDisplayFormatInfo,
) -> bytes:
payload = make_payload(
- data_type=messages.DefinitionType.ETHEREUM_ERC7730_DISPLAY_FORMAT,
+ data_type=messages.DefinitionType.ETHEREUM_DISPLAY_FORMAT,
message=display_format,
)
proof, signature = sign_payload(payload, [])
diff --git a/tests/device_tests/ethereum/test_definitions.py b/tests/device_tests/ethereum/test_definitions.py
index 349429e1..d0c33dd4 100644
--- a/tests/device_tests/ethereum/test_definitions.py
+++ b/tests/device_tests/ethereum/test_definitions.py
@@ -420,7 +420,7 @@ UNISWAP_EXACT_INPUT_SINGLE_DISPLAY_FORMAT_LABELS = {
def _sign_tx_with_display_format(
session: Session,
- display_format: messages.EthereumERC7730DisplayFormatInfo,
+ display_format: messages.EthereumDisplayFormatInfo,
token: dict | None = None,
sign_tx_params: dict | None = None,
on_page: Callable[[LayoutContent], None] | None = None,
diff --git a/tests/device_tests/ethereum/test_definitions_bad.py b/tests/device_tests/ethereum/test_definitions_bad.py
index 794fdeb0..79d8533e 100644
--- a/tests/device_tests/ethereum/test_definitions_bad.py
+++ b/tests/device_tests/ethereum/test_definitions_bad.py
@@ -71,14 +71,14 @@ def _make_token_payload(
)
-def _make_erc7730_payload(
+def _make_display_format_payload(
timestamp: int = 0xFFFF_FFFF,
- message: messages.EthereumERC7730DisplayFormatInfo | bytes | None = None,
+ message: messages.EthereumDisplayFormatInfo | bytes | None = None,
) -> bytes:
if message is None:
message = make_eth_erc7730_display_format()
return make_payload(
- data_type=DefinitionType.ETHEREUM_ERC7730_DISPLAY_FORMAT,
+ data_type=DefinitionType.ETHEREUM_DISPLAY_FORMAT,
message=message,
timestamp=timestamp,
)
@@ -90,7 +90,7 @@ def _cases(session: Session) -> list[tuple]:
(_make_token_payload, _fails_token),
]
if session.model in models.CORE_MODELS:
- cases.append((_make_erc7730_payload, _fails_erc7730_display_format))
+ cases.append((_make_display_format_payload, _fails_erc7730_display_format))
return cases
@@ -169,12 +169,12 @@ def test_bad_type(session: Session) -> None:
if session.model in models.CORE_MODELS:
cases += [
(
- DefinitionType.ETHEREUM_ERC7730_DISPLAY_FORMAT,
+ DefinitionType.ETHEREUM_DISPLAY_FORMAT,
make_eth_erc7730_display_format(),
_fails_network,
),
(
- DefinitionType.ETHEREUM_ERC7730_DISPLAY_FORMAT,
+ DefinitionType.ETHEREUM_DISPLAY_FORMAT,
make_eth_erc7730_display_format(),
_fails_token,
),
@@ -227,12 +227,12 @@ def test_protobuf_mismatch(session: Session) -> None:
_fails_token,
),
(
- DefinitionType.ETHEREUM_ERC7730_DISPLAY_FORMAT,
+ DefinitionType.ETHEREUM_DISPLAY_FORMAT,
make_eth_token(),
_fails_erc7730_display_format,
),
(
- DefinitionType.ETHEREUM_ERC7730_DISPLAY_FORMAT,
+ DefinitionType.ETHEREUM_DISPLAY_FORMAT,
make_eth_network(),
_fails_erc7730_display_format,
),
Risk score
Our methodology →Why this scored 15/100
Human-validated context
Community notes
Notes can correct, qualify, or add evidence to the AI analysis. Every note shown here has been validated by a human moderator.
No validated notes yet.
The AI analysis stands alone for now. Submit a note if you can add evidence or important context.