Skip to content

fix(eip712): Fix cyclic message types handling #4650

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sergei-boiko-trustwallet merged 2 commits into from
Feb 12, 2026
Merged

fix(eip712): Fix cyclic message types handling #4650

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9c2646a
fix(eip712): Fix cyclic message types handling
sergei-boiko-trustwallet Feb 10, 2026
07c1506
fix(eip712): Add an extra test
sergei-boiko-trustwallet Feb 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 33 additions & 2 deletions rust/tw_evm/src/message/eip712/eip712_message.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -321,7 +321,7 @@ mod encode_custom_type {
&field.property_type
};
// Seen this type before? or not a custom type - skip
if !deps.contains(field_type) || custom_types.contains_key(field_type) {
if !deps.contains(field_type) && custom_types.contains_key(field_type) {
types_stack.push(field_type);
}
}
Expand All @@ -340,6 +340,8 @@ mod tests {

#[test]
fn test_build_dependencies() {
// This custom types definition has an intentional cycle dependency between `Person` and `Mail`
// to test if the `build_dependencies` function can handle it without getting into an infinite loop.
let custom_types = r#"{
"EIP712Domain": [
{ "name": "name", "type": "string" },
Expand All @@ -349,7 +351,8 @@ mod tests {
],
"Person": [
{ "name": "name", "type": "string" },
{ "name": "wallet", "type": "address" }
{ "name": "wallet", "type": "address" },
{ "name": "mail", "type": "Mail" }
],
"Mail": [
{ "name": "from", "type": "Person" },
Expand Down Expand Up @@ -402,6 +405,34 @@ mod tests {
)
}

#[test]
fn test_encode_type_cyclic_dependency() {
let custom_types = r#"{
"EIP712Domain": [
{ "name": "name", "type": "string" },
{ "name": "version", "type": "string" },
{ "name": "chainId", "type": "uint256" },
{ "name": "verifyingContract", "type": "address" }
],
"Person": [
{ "name": "name", "type": "string" },
{ "name": "wallet", "type": "address" },
{ "name": "mail", "type": "Mail" }
],
"Mail": [
{ "name": "from", "type": "Person" },
{ "name": "to", "type": "Person" },
{ "name": "contents", "type": "string" }
]
}"#;

let custom_types: CustomTypes = serde_json::from_str(custom_types).expect("alas error!");
assert_eq!(
"Mail(Person from,Person to,string contents)Person(string name,address wallet,Mail mail)",
encode_custom_type::encode_type(&custom_types, "Mail").expect("alas error!")
)
}

#[test]
fn test_encode_type_hash() {
let custom_types = r#"{
Expand Down
Loading
⚡