From 0323355299a45263cd1fda9e8a703aafc1afcd14 Mon Sep 17 00:00:00 2001 From: Tomas Susanka Date: Tue, 21 Aug 2018 14:32:37 +0200 Subject: [PATCH] vendor: trezor-common update; protobuf: regen --- ...anoSignTransaction.py => CardanoSignTx.py} | 2 +- ...ignedTransaction.py => CardanoSignedTx.py} | 2 +- src/trezor/messages/MessageType.py | 6 ++--- src/trezor/messages/StellarGetPublicKey.py | 25 ------------------- src/trezor/messages/StellarPublicKey.py | 16 ------------ vendor/trezor-common | 2 +- 6 files changed, 5 insertions(+), 48 deletions(-) rename src/trezor/messages/{CardanoSignTransaction.py => CardanoSignTx.py} (95%) rename src/trezor/messages/{CardanoSignedTransaction.py => CardanoSignedTx.py} (88%) delete mode 100644 src/trezor/messages/StellarGetPublicKey.py delete mode 100644 src/trezor/messages/StellarPublicKey.py diff --git a/src/trezor/messages/CardanoSignTransaction.py b/src/trezor/messages/CardanoSignTx.py similarity index 95% rename from src/trezor/messages/CardanoSignTransaction.py rename to src/trezor/messages/CardanoSignTx.py index e901de2d00..6c48ec4f0c 100644 --- a/src/trezor/messages/CardanoSignTransaction.py +++ b/src/trezor/messages/CardanoSignTx.py @@ -12,7 +12,7 @@ if __debug__: List = None # type: ignore -class CardanoSignTransaction(p.MessageType): +class CardanoSignTx(p.MessageType): MESSAGE_WIRE_TYPE = 303 FIELDS = { 1: ('inputs', CardanoTxInputType, p.FLAG_REPEATED), diff --git a/src/trezor/messages/CardanoSignedTransaction.py b/src/trezor/messages/CardanoSignedTx.py similarity index 88% rename from src/trezor/messages/CardanoSignedTransaction.py rename to src/trezor/messages/CardanoSignedTx.py index f56aaa5d22..ff06a4182d 100644 --- a/src/trezor/messages/CardanoSignedTransaction.py +++ b/src/trezor/messages/CardanoSignedTx.py @@ -3,7 +3,7 @@ import protobuf as p -class CardanoSignedTransaction(p.MessageType): +class CardanoSignedTx(p.MessageType): MESSAGE_WIRE_TYPE = 310 FIELDS = { 1: ('tx_hash', p.BytesType, 0), diff --git a/src/trezor/messages/MessageType.py b/src/trezor/messages/MessageType.py index c07d8eaeb7..62760f011b 100644 --- a/src/trezor/messages/MessageType.py +++ b/src/trezor/messages/MessageType.py @@ -93,8 +93,6 @@ TezosSignTx = 152 TezosSignedTx = 153 TezosGetPublicKey = 154 TezosPublicKey = 155 -StellarGetPublicKey = 200 -StellarPublicKey = 201 StellarSignTx = 202 StellarTxOpRequest = 203 StellarGetAddress = 207 @@ -114,14 +112,14 @@ StellarSignedTx = 230 CardanoSignMessage = 300 CardanoMessageSignature = 301 CardanoVerifyMessage = 302 -CardanoSignTransaction = 303 +CardanoSignTx = 303 CardanoTxRequest = 304 CardanoGetPublicKey = 305 CardanoPublicKey = 306 CardanoGetAddress = 307 CardanoAddress = 308 CardanoTxAck = 309 -CardanoSignedTransaction = 310 +CardanoSignedTx = 310 OntologyGetAddress = 350 OntologyAddress = 351 OntologyGetPublicKey = 352 diff --git a/src/trezor/messages/StellarGetPublicKey.py b/src/trezor/messages/StellarGetPublicKey.py deleted file mode 100644 index b788b5a826..0000000000 --- a/src/trezor/messages/StellarGetPublicKey.py +++ /dev/null @@ -1,25 +0,0 @@ -# Automatically generated by pb2py -# fmt: off -import protobuf as p - -if __debug__: - try: - from typing import List - except ImportError: - List = None # type: ignore - - -class StellarGetPublicKey(p.MessageType): - MESSAGE_WIRE_TYPE = 200 - FIELDS = { - 1: ('address_n', p.UVarintType, p.FLAG_REPEATED), - 2: ('show_display', p.BoolType, 0), - } - - def __init__( - self, - address_n: List[int] = None, - show_display: bool = None, - ) -> None: - self.address_n = address_n if address_n is not None else [] - self.show_display = show_display diff --git a/src/trezor/messages/StellarPublicKey.py b/src/trezor/messages/StellarPublicKey.py deleted file mode 100644 index 43a55bc4a7..0000000000 --- a/src/trezor/messages/StellarPublicKey.py +++ /dev/null @@ -1,16 +0,0 @@ -# Automatically generated by pb2py -# fmt: off -import protobuf as p - - -class StellarPublicKey(p.MessageType): - MESSAGE_WIRE_TYPE = 201 - FIELDS = { - 1: ('public_key', p.BytesType, 0), - } - - def __init__( - self, - public_key: bytes = None, - ) -> None: - self.public_key = public_key diff --git a/vendor/trezor-common b/vendor/trezor-common index 564310d34d..3167bd63e3 160000 --- a/vendor/trezor-common +++ b/vendor/trezor-common @@ -1 +1 @@ -Subproject commit 564310d34d799f88f391573fd43eeea3d95a43c3 +Subproject commit 3167bd63e389f1c27fe6ae07f1b87b5fbb889a61