diff --git a/src/apps/ethereum/networks.py b/src/apps/ethereum/networks.py index dded083c77..419ff6d218 100644 --- a/src/apps/ethereum/networks.py +++ b/src/apps/ethereum/networks.py @@ -105,6 +105,13 @@ NETWORKS = [ name='Ethereum Testnet Kovan', rskip60=False, ), + NetworkInfo( + chain_id=60, + slip44=6060, + shortcut='GO', + name='GoChain', + rskip60=False, + ), NetworkInfo( chain_id=61, slip44=61, @@ -140,4 +147,18 @@ NETWORKS = [ name='EtherGem', rskip60=False, ), + NetworkInfo( + chain_id=31102, + slip44=31102, + shortcut='ESN', + name='Ethersocial Network', + rskip60=False, + ), + NetworkInfo( + chain_id=200625, + slip44=200625, + shortcut='AKA', + name='Akroma', + rskip60=False, + ), ] diff --git a/src/trezor/messages/GetPublicKey.py b/src/trezor/messages/GetPublicKey.py index eb1b696ad7..2ab36d29ad 100644 --- a/src/trezor/messages/GetPublicKey.py +++ b/src/trezor/messages/GetPublicKey.py @@ -15,6 +15,7 @@ class GetPublicKey(p.MessageType): 2: ('ecdsa_curve_name', p.UnicodeType, 0), 3: ('show_display', p.BoolType, 0), 4: ('coin_name', p.UnicodeType, 0), # default=Bitcoin + 5: ('script_type', p.UVarintType, 0), # default=SPENDADDRESS } def __init__( @@ -23,8 +24,10 @@ class GetPublicKey(p.MessageType): ecdsa_curve_name: str = None, show_display: bool = None, coin_name: str = None, + script_type: int = None, ) -> None: self.address_n = address_n if address_n is not None else [] self.ecdsa_curve_name = ecdsa_curve_name self.show_display = show_display self.coin_name = coin_name + self.script_type = script_type diff --git a/vendor/trezor-common b/vendor/trezor-common index e0108d34bf..105fbeb16d 160000 --- a/vendor/trezor-common +++ b/vendor/trezor-common @@ -1 +1 @@ -Subproject commit e0108d34bf4b741d9ddcf1e7b423e799a3a04b77 +Subproject commit 105fbeb16df2793eb2fe60251e96d273e52edc3d