Skip to content
This repository has been archived by the owner on May 28, 2019. It is now read-only.

src/apps/ethereum: support full 32bit chain_id #311

Merged
merged 1 commit into from Aug 14, 2018
Merged

src/apps/ethereum: support full 32bit chain_id #311

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 4 additions & 2 deletions src/apps/ethereum/sign_tx.py
View file
Open in desktop
Expand Up @@ -138,7 +138,9 @@ async def send_signature(ctx, msg: EthereumSignTx, digest):

req = EthereumTxRequest()
req.signature_v = signature[0]
if msg.chain_id:
if msg.chain_id > MAX_CHAIN_ID:
req.signature_v -= 27
elif msg.chain_id:
req.signature_v += 2 * msg.chain_id + 8

req.signature_r = signature[1:33]
Expand All @@ -151,7 +153,7 @@ def check(msg: EthereumSignTx):
if msg.tx_type not in [1, 6, None]:
raise wire.DataError("tx_type out of bounds")

if msg.chain_id < 0 or msg.chain_id > MAX_CHAIN_ID:
if msg.chain_id < 0:
raise wire.DataError("chain_id out of bounds")

if msg.data_length > 0:
Expand Down