1
0
mirror of https://github.com/trezor/trezor-firmware.git synced 2024-11-05 14:59:44 +00:00

Merge pull request #200 from trezor/tsusanka/unknown-token-fix

eth: unknown token transfer is recognized and displayed as unknown
This commit is contained in:
Tomas Susanka 2018-05-11 15:33:33 +02:00 committed by GitHub
commit 376a3cbec5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 4 deletions

View File

@ -1,4 +1,5 @@
from apps.common.confirm import *
from apps.ethereum import tokens
from trezor import ui
from trezor.utils import chunks, format_amount
from trezor.messages import ButtonRequestType
@ -53,6 +54,8 @@ def split_address(address):
def format_ethereum_amount(value: int, token, chain_id: int, tx_type=None):
if token:
if token is tokens.UNKNOWN_TOKEN:
return 'Unknown token value'
suffix = token[2]
decimals = token[3]
else:

View File

@ -1,12 +1,12 @@
def token_by_chain_address(chain_id, address):
if not address:
return None
for token in tokens:
if chain_id == token[0] and address == token[1]:
return token
return None
return UNKNOWN_TOKEN
UNKNOWN_TOKEN = (None, None, None, None)
# rest of the file is generated using trezor-common/ethereum_tokens-gen.py
# DO NOT EDIT MANUALLY!
tokens = [

View File

@ -22,7 +22,7 @@ class TestEthereumTokens(unittest.TestCase):
# invalid adress, invalid chain
token = tokens.token_by_chain_address(999, b'\x00\xFF')
self.assertEqual(token, None)
self.assertIs(token, tokens.UNKNOWN_TOKEN)
if __name__ == '__main__':