Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](http://keepachangelog.com/)
and this project adheres to [Semantic Versioning](http://semver.org/).

## [1.21.3](../../compare/1.21.2...1.21.3) - 2026-03-17

### Fixed

- Missing trusted name matching with EIP-712 empty calldata

## [1.21.2](../../compare/1.21.1...1.21.2) - 2026-03-03

### Added
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ include ./makefile_conf/chain/$(CHAIN).mk

APPVERSION_M = 1
APPVERSION_N = 21
APPVERSION_P = 2
APPVERSION_P = 3
APPVERSION = $(APPVERSION_M).$(APPVERSION_N).$(APPVERSION_P)

# Application source files
Expand Down
28 changes: 21 additions & 7 deletions src/features/signMessageEIP712/ui_logic.c
Original file line number Diff line number Diff line change
Expand Up @@ -732,14 +732,28 @@ static bool handle_fallback_empty_calldata(const s_eip712_calldata_info *calldat
} else {
ui_712_set_intent_field("Empty transaction");
}
if (!getEthDisplayableAddress((uint8_t *) calldata_info->callee,
buf,
buf_size,
chainConfig->chainId)) {
return false;
}

e_name_type types[] = {TN_TYPE_ACCOUNT};
e_name_source sources[] = {TN_SOURCE_ENS, TN_SOURCE_LAB, TN_SOURCE_MAB};
const s_trusted_name *trusted_name;

ui_712_set_title("To", 2);
ui_712_set_value(buf, strlen(buf));
if ((trusted_name = get_trusted_name(ARRAYLEN(types),
types,
ARRAYLEN(sources),
sources,
&calldata_info->chain_id,
calldata_info->callee)) != NULL) {
ui_712_set_value(trusted_name->name, strlen(trusted_name->name));
} else {
if (!getEthDisplayableAddress(calldata_info->callee,
buf,
buf_size,
calldata_info->chain_id)) {
return false;
}
ui_712_set_value(buf, strlen(buf));
}
return true;
}

Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
17 changes: 16 additions & 1 deletion tests/ragger/test_eip712.py
Original file line number Diff line number Diff line change
Expand Up @@ -1005,7 +1005,22 @@ def test_eip712_calldata(scenario_navigator: NavigateWithScenario):


def test_eip712_calldata_empty_send(scenario_navigator: NavigateWithScenario):
eip712_calldata_common(scenario_navigator, "safe_empty")
app_client = EthAppClient(scenario_navigator.backend)
filename = "safe_empty"

with Path(f"{eip712_json_path()}/{filename}.json").open(encoding="utf-8") as file:
json_data = json.load(file)

app_client.provide_trusted_name(TrustedName(2,
bytes.fromhex(json_data["message"]["to"][2:]),
"MAB_addr",
tn_type=TrustedNameType.ACCOUNT,
tn_source=TrustedNameSource.MULTISIG_ADDRESS_BOOK,
chain_id=json_data["domain"]["chainId"],
challenge=ResponseParser.challenge(app_client.get_challenge().data),
owner=DEVICE_ADDR,
owner_deriv_path=BIP32_PATH))
eip712_calldata_common(scenario_navigator, filename)


def test_eip712_calldata_no_param(scenario_navigator: NavigateWithScenario):
Expand Down
Loading