arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2024-12-18 12:28:09 +00:00
Code Issues Releases Wiki Activity

ethereum/signing: display data fix

Browse Source
This commit is contained in:
Tomas Susanka 2018-01-04 14:08:21 +01:00 committed by Pavol Rusnak
parent 7d0cafecc3
commit aa8bb77e32
2 changed files with 16 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/apps/ethereum/layout.py
View File

@ -1,42 +1,37 @@
from apps.common.confirm import *
from trezor import wire, ui
from trezor.utils import unimport, chunks
from trezor.messages import ButtonRequestType
from trezor.ui.text import Text
from apps.common.confirm import *
from ubinascii import hexlify
from . import networks
@unimport
async def confirm_tx(ctx, to, value, chain_id, token=None):
async def confirm_tx(ctx, to, value, chain_id, token=None): # todo wording
str_to = '0x' + hexlify(to).decode() # todo use ethereum address format
content = Text('Confirm transaction', ui.ICON_RESET,
ui.BOLD, format_amount(value, token, chain_id),
ui.NORMAL, 'to',
ui.MONO, *split_address(to)) # todo no addres shown, why?
ui.MONO, *split_address(str_to))
return await confirm(ctx, content, ButtonRequestType.ConfirmOutput)
@unimport
async def confirm_fee(ctx, spending, fee, chain_id, token=None):
content = Text('Confirm transaction', ui.ICON_RESET,
async def confirm_fee(ctx, spending, gas_price, gas_limit, chain_id, token=None): # todo wording
content = Text('Confirm fee', ui.ICON_RESET,
'Sending: %s' % format_amount(spending, token, chain_id),
'Fee: %s' % format_amount(fee, token, chain_id))
'Gas: %s' % format_amount(gas_price, token, chain_id),
'Limit: %s' % format_amount(gas_limit, token, chain_id))
return await hold_to_confirm(ctx, content, ButtonRequestType.SignTx)
@unimport
async def confirm_data(ctx, data, data_total):
content = Text('Confirm data', ui.ICON_RESET,
ui.MONO, data[:16], # todo nothing displayed?
'of total: ', data_total)
return await confirm(ctx, content, ButtonRequestType.ConfirmOutput)
@unimport
async def confirm_fee(ctx, value, gas_price, gas_limit, token):
content = Text('Confirm fee', ui.ICON_RESET,
'price:', ui.MONO, gas_price, # todo wording
'limit:', ui.MONO, gas_limit,
'value: ', value)
async def confirm_data(ctx, data, data_total): # todo wording
str_data = hexlify(data[:8]).decode() + '..'
content = Text('Confirm data:', ui.ICON_RESET,
ui.MONO, str_data,
'Total: ', str(data_total) + 'B')
return await confirm(ctx, content, ButtonRequestType.ConfirmOutput)
@ -45,7 +40,7 @@ def split_address(address):
def format_amount(value, token, chain_id):
value = int.from_bytes(value, 'little')
value = int.from_bytes(value, 'big')
if token:
suffix = token.ticker
decimals = token.decimals

2
src/apps/ethereum/sign_tx.py
View File

@ -37,7 +37,7 @@ async def ethereum_sign_tx(ctx, msg):
if token is None and msg.data_length > 0:
await layout.confirm_data(ctx, msg.data_initial_chunk, data_total)
await layout.confirm_fee(ctx, msg.value, msg.gas_price, msg.gas_limit, token)
await layout.confirm_fee(ctx, msg.value, msg.gas_price, msg.gas_limit, msg.chain_id, token)
data = bytearray()
data += msg.data_initial_chunk