From 342c3646e18fcfb43644bdc14a32e733c334b7ea Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Mon, 12 Nov 2018 14:14:10 +0100 Subject: [PATCH] vendor: update trezor-common --- src/apps/common/coininfo.py | 100 ++++++++++++++++++++++++++++++++++ src/apps/ethereum/networks.py | 7 +++ src/apps/ethereum/tokens.py | 2 - vendor/trezor-common | 2 +- 4 files changed, 108 insertions(+), 3 deletions(-) diff --git a/src/apps/common/coininfo.py b/src/apps/common/coininfo.py index 419c9ce9f..fc4b434bf 100644 --- a/src/apps/common/coininfo.py +++ b/src/apps/common/coininfo.py @@ -104,6 +104,66 @@ COINS = [ decred=False, curve_name='secp256k1', ), + CoinInfo( + coin_name="Actinium", + coin_shortcut="ACM", + address_type=53, + address_type_p2sh=55, + maxfee_kb=40000000, + signed_message_header="Actinium Signed Message:\n", + xpub_magic=0x0488b21e, + xpub_magic_segwit_p2sh=0x049d7cb2, + xpub_magic_segwit_native=None, + bech32_prefix="acm", + cashaddr_prefix=None, + slip44=228, + segwit=True, + fork_id=None, + force_bip143=False, + bip115=False, + decred=False, + curve_name='secp256k1', + ), + CoinInfo( + coin_name="BitCash", + coin_shortcut="BITC", + address_type=230, + address_type_p2sh=235, + maxfee_kb=30000000, + signed_message_header="Bitcash Signed Message:\n", + xpub_magic=0x0488b21e, + xpub_magic_segwit_p2sh=None, + xpub_magic_segwit_native=None, + bech32_prefix=None, + cashaddr_prefix=None, + slip44=230, + segwit=False, + fork_id=None, + force_bip143=False, + bip115=False, + decred=False, + curve_name='secp256k1', + ), + CoinInfo( + coin_name="Bitcloud", + coin_shortcut="BTDX", + address_type=25, + address_type_p2sh=5, + maxfee_kb=1000000, + signed_message_header="Diamond Signed Message:\n", + xpub_magic=0x0488b21e, + xpub_magic_segwit_p2sh=None, + xpub_magic_segwit_native=None, + bech32_prefix=None, + cashaddr_prefix=None, + slip44=218, + segwit=False, + fork_id=None, + force_bip143=False, + bip115=False, + decred=False, + curve_name='secp256k1', + ), CoinInfo( coin_name="Bcash", coin_shortcut="BCH", @@ -224,6 +284,26 @@ COINS = [ decred=False, curve_name='secp256k1', ), + CoinInfo( + coin_name="Bitsend", + coin_shortcut="BSD", + address_type=102, + address_type_p2sh=5, + maxfee_kb=1000000, + signed_message_header="Bitsend Signed Message:\n", + xpub_magic=0x0488b21e, + xpub_magic_segwit_p2sh=0x049d7cb2, + xpub_magic_segwit_native=0x04b24746, + bech32_prefix=None, + cashaddr_prefix=None, + slip44=91, + segwit=True, + fork_id=None, + force_bip143=False, + bip115=False, + decred=False, + curve_name='secp256k1', + ), CoinInfo( coin_name="Capricoin", coin_shortcut="CPC", @@ -584,6 +664,26 @@ COINS = [ decred=False, curve_name='secp256k1', ), + CoinInfo( + coin_name="Megacoin", + coin_shortcut="MEC", + address_type=50, + address_type_p2sh=5, + maxfee_kb=1000000, + signed_message_header="MegaCoin Signed Message:\n", + xpub_magic=0x0488b21e, + xpub_magic_segwit_p2sh=0x049d7cb2, + xpub_magic_segwit_native=0x04b24746, + bech32_prefix=None, + cashaddr_prefix=None, + slip44=217, + segwit=True, + fork_id=None, + force_bip143=False, + bip115=False, + decred=False, + curve_name='secp256k1', + ), CoinInfo( coin_name="Monacoin", coin_shortcut="MONA", diff --git a/src/apps/ethereum/networks.py b/src/apps/ethereum/networks.py index f1fd674e8..f5647095f 100644 --- a/src/apps/ethereum/networks.py +++ b/src/apps/ethereum/networks.py @@ -128,6 +128,13 @@ NETWORKS = [ name="Ellaism", rskip60=False, ), + NetworkInfo( + chain_id=76, + slip44=76, + shortcut="MIX", + name="Mix", + rskip60=False, + ), NetworkInfo( chain_id=820, slip44=820, diff --git a/src/apps/ethereum/tokens.py b/src/apps/ethereum/tokens.py index 9b6d89ded..2b9e4ccb6 100644 --- a/src/apps/ethereum/tokens.py +++ b/src/apps/ethereum/tokens.py @@ -355,7 +355,6 @@ tokens = [ (1, b"\xf0\xee\x6b\x27\xb7\x59\xc9\x89\x3c\xe4\xf0\x94\xb4\x9a\xd2\x8f\xd1\x5a\x23\xe4", "ENG", 8), # eth / Enigma (1, b"\xf6\x29\xcb\xd9\x4d\x37\x91\xc9\x25\x01\x52\xbd\x8d\xfb\xdf\x38\x0e\x2a\x3b\x9c", "ENJ", 18), # eth / ENJIN (1, b"\x5b\xc7\xe5\xf0\xab\x8b\x2e\x10\xd2\xd0\xa3\xf2\x17\x39\xfc\xe6\x24\x59\xae\xf3", "ENTRP", 18), # eth / Hut34 Entropy Token - (1, b"\x86\xfa\x04\x98\x57\xe0\x20\x9a\xa7\xd9\xe6\x16\xf7\xeb\x3b\x3b\x78\xec\xfd\xb0", "EOS", 18), # eth / EOS (1, b"\x7e\x9e\x43\x1a\x0b\x8c\x4d\x53\x2c\x74\x5b\x10\x43\xc7\xfa\x29\xa4\x8d\x4f\xba", "eosDAC", 18), # eth / eosDAC (1, b"\x35\xba\xa7\x20\x38\xf1\x27\xf9\xf8\xc8\xf9\xb4\x91\x04\x9f\x64\xf3\x77\x91\x4d", "EPX", 4), # eth / ethPoker.io EPX (1, b"\x50\xee\x67\x46\x89\xd7\x5c\x0f\x88\xe8\xf8\x3c\xfe\x8c\x4b\x69\xe8\xfd\x59\x0d", "EPY", 8), # eth / EmphyCoin @@ -908,7 +907,6 @@ tokens = [ (1, b"\x30\xce\xcb\x54\x61\xa4\x49\xa9\x00\x81\xf5\xa5\xf5\x5d\xb4\xe0\x48\x39\x7b\xab", "TRCT", 8), # eth / Tracto (1, b"\x33\xf9\x0d\xee\x07\xc6\xe8\xb9\x68\x2d\xd2\x0f\x73\xe6\xc3\x58\xb2\xed\x0f\x03", "TRDT", 0), # eth / Trident Group (1, b"\xcb\x94\xbe\x6f\x13\xa1\x18\x2e\x4a\x4b\x61\x40\xcb\x7b\xf2\x02\x5d\x28\xe4\x1b", "TRST", 6), # eth / TRST - (1, b"\xf2\x30\xb7\x90\xe0\x53\x90\xfc\x82\x95\xf4\xd3\xf6\x03\x32\xc9\x3b\xed\x42\xe2", "TRX", 6), # eth / Tron Lab Token (1, b"\x6b\x87\x99\x9b\xe8\x73\x58\x06\x5b\xbd\xe4\x1e\x8a\x0f\xe0\xb7\xb1\xcd\x25\x14", "TSW", 18), # eth / TeslaWatt (1, b"\xaa\xb6\x06\x81\x78\x09\x84\x1e\x8b\x11\x68\xbe\x87\x79\xee\xaf\x67\x44\xef\x64", "TTA", 18), # eth / Tend Token (1, b"\x9c\xda\x8a\x60\xdd\x5a\xfa\x15\x6c\x95\xbd\x97\x44\x28\xd9\x1a\x08\x12\xe0\x54", "TTU", 18), # eth / TaTaTu diff --git a/vendor/trezor-common b/vendor/trezor-common index c3ba001a1..8c5317762 160000 --- a/vendor/trezor-common +++ b/vendor/trezor-common @@ -1 +1 @@ -Subproject commit c3ba001a1861598ed329e8b01a3d84d2f88cf1ca +Subproject commit 8c53177626349e801757b0a1452a50ed72c51f27