Skip to content
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

Jump to bottom

EIP-712 v0 friction #654

Merged
merged 2 commits into from
Sep 25, 2024
Merged

EIP-712 v0 friction #654

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0831e84
Added friction to the EIP-712 v0 flow
apaillier-ledger Sep 25, 2024
1ba1854
Fix Ragger test
apaillier-ledger Sep 25, 2024
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: 4 additions & 2 deletions src_bagl/ui_flow_signMessage712_v0.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
#include "common_712.h"
#include "uint_common.h"
#include "common_ui.h"
#include "ui_flow.h" // ux_warning_blind_signing_warn_step

void prepare_domain_hash_v0() {
array_bytes_string(strings.tmp.tmp,
Expand Down Expand Up @@ -59,8 +60,8 @@ UX_STEP_CB(
_approve_cb(),
{
&C_icon_validate_14,
"Sign",
"message",
"Accept risk",
"and sign",
});
UX_STEP_CB(
ux_sign_712_v0_flow_5_step,
Expand All @@ -74,6 +75,7 @@ UX_STEP_CB(
// clang-format on

UX_FLOW(ux_sign_712_v0_flow,
&ux_warning_blind_signing_warn_step,
&ux_sign_712_v0_flow_1_step,
&ux_sign_712_v0_flow_2_step,
&ux_sign_712_v0_flow_3_step,
Expand Down
4 changes: 4 additions & 0 deletions src_features/signMessageEIP712_v0/cmd_signMessage712.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@ uint16_t handleSignEIP712Message_v0(uint8_t p1,
reset_app_context();
}

if (!N_storage.dataAllowed) {
ui_error_blind_signing();
return APDU_RESPONSE_INVALID_DATA;
}
workBuffer = parseBip32(workBuffer, &dataLength, &tmpCtx.messageSigningContext.bip32);
if ((workBuffer == NULL) || (dataLength < (KECCAK256_HASH_BYTESIZE * 2))) {
return APDU_RESPONSE_INVALID_DATA;
Expand Down
15 changes: 8 additions & 7 deletions src_nbgl/ui_sign_712_v0.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,12 @@ void ui_sign_712_v0(void) {
pairs_list.pairs = pairs;
pairs_list.nbMaxLinesForValue = 0;

nbgl_useCaseReview(TYPE_MESSAGE,
&pairs_list,
&C_Review_64px,
TEXT_REVIEW_EIP712,
NULL,
TEXT_SIGN_EIP712,
ui_typed_message_review_choice);
nbgl_useCaseReviewBlindSigning(TYPE_TRANSACTION,
&pairs_list,
&C_Review_64px,
TEXT_REVIEW_EIP712,
NULL,
TEXT_BLIND_SIGN_EIP712,
NULL,
ui_typed_message_review_choice);
}
18 changes: 15 additions & 3 deletions tests/ragger/test_eip712.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
from ragger.backend import BackendInterface
from ragger.firmware import Firmware
from ragger.navigator import Navigator, NavInsID, NavIns
from ragger.navigator.navigation_scenario import NavigateWithScenario
from ragger.error import ExceptionRAPDU

import client.response_parser as ResponseParser
Expand Down Expand Up @@ -68,14 +67,27 @@ def get_wallet_addr(client: EthAppClient) -> bytes:
return WALLET_ADDR


def test_eip712_legacy(backend: BackendInterface, scenario_navigator: NavigateWithScenario):
def test_eip712_v0(firmware: Firmware, backend: BackendInterface, navigator: Navigator):
app_client = EthAppClient(backend)

settings_toggle(firmware, navigator, [SettingID.BLIND_SIGNING])
with open(input_files()[0], encoding="utf-8") as file:
data = json.load(file)
smsg = encode_typed_data(full_message=data)
with app_client.eip712_sign_legacy(BIP32_PATH, smsg.header, smsg.body):
scenario_navigator.review_approve(custom_screen_text="Sign", do_comparison=False)
moves = []
if firmware.is_nano:
moves += [NavInsID.RIGHT_CLICK] * 2
if firmware == Firmware.NANOS:
moves += [NavInsID.RIGHT_CLICK] * 8
else:
moves += [NavInsID.RIGHT_CLICK] * 4
moves += [NavInsID.BOTH_CLICK]
else:
moves += [NavInsID.USE_CASE_CHOICE_REJECT]
moves += [NavInsID.SWIPE_CENTER_TO_LEFT] * 2
moves += [NavInsID.USE_CASE_REVIEW_CONFIRM]
navigator.navigate(moves)

vrs = ResponseParser.signature(app_client.response().data)
recovered_addr = recover_message(data, vrs)
Expand Down
Loading