Skip to content
This repository was archived by the owner on Apr 16, 2019. It is now read-only.

ethereum: support full range 32bit chain_id #399

Merged
prusnak merged 1 commit into from
Aug 14, 2018
Merged

ethereum: support full range 32bit chain_id #399

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 firmware/ethereum.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,9 @@ static void send_signature(void)
msg_tx_request.has_data_length = false;

msg_tx_request.has_signature_v = true;
if (chain_id) {
if (chain_id > MAX_CHAIN_ID) {
msg_tx_request.signature_v = v;
} else if (chain_id) {
msg_tx_request.signature_v = v + 2 * chain_id + 35;
} else {
msg_tx_request.signature_v = v + 27;
Expand Down Expand Up @@ -464,7 +466,7 @@ void ethereum_signing_init(EthereumSignTx *msg, const HDNode *node)

/* eip-155 chain id */
if (msg->has_chain_id) {
if (msg->chain_id < 1 || msg->chain_id > MAX_CHAIN_ID) {
if (msg->chain_id < 1) {
fsm_sendFailure(Failure_FailureType_Failure_DataError, _("Chain Id out of bounds"));
ethereum_signing_abort();
return;
Expand Down