arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2025-06-26 09:52:34 +00:00
Code Issues Releases Wiki Activity

tezos: remove import *

Browse Source
This commit is contained in:
Jan Pochyla 2018-11-09 13:49:04 +01:00
parent 0ff7034e37
commit c7651b3c94
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/apps/tezos/layout.py
View File

@ -3,7 +3,7 @@ from trezor.messages import ButtonRequestType
from trezor.ui.text import Text from trezor.ui.text import Text
from trezor.utils import chunks, format_amount from trezor.utils import chunks, format_amount
from apps.common.confirm import * from apps.common.confirm import require_confirm, require_hold_to_confirm
from apps.tezos.helpers import TEZOS_AMOUNT_DIVISIBILITY from apps.tezos.helpers import TEZOS_AMOUNT_DIVISIBILITY

22
src/apps/tezos/sign_tx.py
View File

@ -6,13 +6,13 @@ from trezor.messages.TezosSignedTx import TezosSignedTx
from apps.common import seed from apps.common import seed
from apps.common.writers import write_bytes, write_uint8 from apps.common.writers import write_bytes, write_uint8
from apps.tezos import layout
from apps.tezos.helpers import ( from apps.tezos.helpers import (
TEZOS_CURVE, TEZOS_CURVE,
TEZOS_ORIGINATED_ADDRESS_PREFIX, TEZOS_ORIGINATED_ADDRESS_PREFIX,
TEZOS_SIGNATURE_PREFIX, TEZOS_SIGNATURE_PREFIX,
base58_encode_check, base58_encode_check,
) )
from apps.tezos.layout import *
async def sign_tx(ctx, msg): async def sign_tx(ctx, msg):
@ -21,19 +21,21 @@ async def sign_tx(ctx, msg):
if msg.transaction is not None: if msg.transaction is not None:
to = _get_address_from_contract(msg.transaction.destination) to = _get_address_from_contract(msg.transaction.destination)
await require_confirm_tx(ctx, to, msg.transaction.amount) await layout.require_confirm_tx(ctx, to, msg.transaction.amount)
await require_confirm_fee(ctx, msg.transaction.amount, msg.transaction.fee) await layout.require_confirm_fee(
ctx, msg.transaction.amount, msg.transaction.fee
)
elif msg.origination is not None: elif msg.origination is not None:
source = _get_address_from_contract(msg.origination.source) source = _get_address_from_contract(msg.origination.source)
await require_confirm_origination(ctx, source) await layout.require_confirm_origination(ctx, source)
# if we are immediately delegating contract # if we are immediately delegating contract
if msg.origination.delegate is not None: if msg.origination.delegate is not None:
delegate = _get_address_by_tag(msg.origination.delegate) delegate = _get_address_by_tag(msg.origination.delegate)
await require_confirm_delegation_baker(ctx, delegate) await layout.require_confirm_delegation_baker(ctx, delegate)
await require_confirm_origination_fee( await layout.require_confirm_origination_fee(
ctx, msg.origination.balance, msg.origination.fee ctx, msg.origination.balance, msg.origination.fee
) )
@ -45,11 +47,13 @@ async def sign_tx(ctx, msg):
delegate = _get_address_by_tag(msg.delegation.delegate) delegate = _get_address_by_tag(msg.delegation.delegate)
if delegate is not None and source != delegate: if delegate is not None and source != delegate:
await require_confirm_delegation_baker(ctx, delegate) await layout.require_confirm_delegation_baker(ctx, delegate)
await require_confirm_set_delegate(ctx, msg.delegation.fee) await layout.require_confirm_set_delegate(ctx, msg.delegation.fee)
# if account registers itself as a delegate # if account registers itself as a delegate
else: else:
await require_confirm_register_delegate(ctx, source, msg.delegation.fee) await layout.require_confirm_register_delegate(
ctx, source, msg.delegation.fee
)
else: else:
raise wire.DataError("Invalid operation") raise wire.DataError("Invalid operation")