diff --git a/src/trezor/messages/CardanoAddress.py b/src/trezor/messages/CardanoAddress.py new file mode 100644 index 000000000..3f0504fe6 --- /dev/null +++ b/src/trezor/messages/CardanoAddress.py @@ -0,0 +1,16 @@ +# Automatically generated by pb2py +# fmt: off +import protobuf as p + + +class CardanoAddress(p.MessageType): + MESSAGE_WIRE_TYPE = 308 + FIELDS = { + 1: ('address', p.UnicodeType, 0), + } + + def __init__( + self, + address: str = None, + ) -> None: + self.address = address diff --git a/src/trezor/messages/CardanoGetAddress.py b/src/trezor/messages/CardanoGetAddress.py new file mode 100644 index 000000000..05fc1d363 --- /dev/null +++ b/src/trezor/messages/CardanoGetAddress.py @@ -0,0 +1,24 @@ +# Automatically generated by pb2py +# fmt: off +import protobuf as p +if __debug__: + try: + from typing import List + except ImportError: + List = None # type: ignore + + +class CardanoGetAddress(p.MessageType): + MESSAGE_WIRE_TYPE = 307 + 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/CardanoGetPublicKey.py b/src/trezor/messages/CardanoGetPublicKey.py new file mode 100644 index 000000000..cb0b2bd34 --- /dev/null +++ b/src/trezor/messages/CardanoGetPublicKey.py @@ -0,0 +1,21 @@ +# Automatically generated by pb2py +# fmt: off +import protobuf as p +if __debug__: + try: + from typing import List + except ImportError: + List = None # type: ignore + + +class CardanoGetPublicKey(p.MessageType): + MESSAGE_WIRE_TYPE = 305 + FIELDS = { + 1: ('address_n', p.UVarintType, p.FLAG_REPEATED), + } + + def __init__( + self, + address_n: List[int] = None, + ) -> None: + self.address_n = address_n if address_n is not None else [] diff --git a/src/trezor/messages/CardanoMessageSignature.py b/src/trezor/messages/CardanoMessageSignature.py new file mode 100644 index 000000000..bb007fd74 --- /dev/null +++ b/src/trezor/messages/CardanoMessageSignature.py @@ -0,0 +1,19 @@ +# Automatically generated by pb2py +# fmt: off +import protobuf as p + + +class CardanoMessageSignature(p.MessageType): + MESSAGE_WIRE_TYPE = 301 + FIELDS = { + 1: ('public_key', p.BytesType, 0), + 2: ('signature', p.BytesType, 0), + } + + def __init__( + self, + public_key: bytes = None, + signature: bytes = None, + ) -> None: + self.public_key = public_key + self.signature = signature diff --git a/src/trezor/messages/CardanoPublicKey.py b/src/trezor/messages/CardanoPublicKey.py new file mode 100644 index 000000000..7695cbfda --- /dev/null +++ b/src/trezor/messages/CardanoPublicKey.py @@ -0,0 +1,23 @@ +# Automatically generated by pb2py +# fmt: off +import protobuf as p +from .HDNodeType import HDNodeType + + +class CardanoPublicKey(p.MessageType): + MESSAGE_WIRE_TYPE = 306 + FIELDS = { + 1: ('xpub', p.UnicodeType, 0), + 2: ('node', HDNodeType, 0), + 3: ('root_hd_passphrase', p.UnicodeType, 0), + } + + def __init__( + self, + xpub: str = None, + node: HDNodeType = None, + root_hd_passphrase: str = None, + ) -> None: + self.xpub = xpub + self.node = node + self.root_hd_passphrase = root_hd_passphrase diff --git a/src/trezor/messages/DecryptMessage.py b/src/trezor/messages/CardanoSignMessage.py similarity index 62% rename from src/trezor/messages/DecryptMessage.py rename to src/trezor/messages/CardanoSignMessage.py index b025ef01f..931922228 100644 --- a/src/trezor/messages/DecryptMessage.py +++ b/src/trezor/messages/CardanoSignMessage.py @@ -8,23 +8,17 @@ if __debug__: List = None # type: ignore -class DecryptMessage(p.MessageType): - MESSAGE_WIRE_TYPE = 51 +class CardanoSignMessage(p.MessageType): + MESSAGE_WIRE_TYPE = 300 FIELDS = { 1: ('address_n', p.UVarintType, p.FLAG_REPEATED), - 2: ('nonce', p.BytesType, 0), - 3: ('message', p.BytesType, 0), - 4: ('hmac', p.BytesType, 0), + 2: ('message', p.BytesType, 0), } def __init__( self, address_n: List[int] = None, - nonce: bytes = None, message: bytes = None, - hmac: bytes = None, ) -> None: self.address_n = address_n if address_n is not None else [] - self.nonce = nonce self.message = message - self.hmac = hmac diff --git a/src/trezor/messages/CardanoSignTransaction.py b/src/trezor/messages/CardanoSignTransaction.py new file mode 100644 index 000000000..48a1a9211 --- /dev/null +++ b/src/trezor/messages/CardanoSignTransaction.py @@ -0,0 +1,29 @@ +# Automatically generated by pb2py +# fmt: off +import protobuf as p +if __debug__: + try: + from typing import List + except ImportError: + List = None # type: ignore +from .CardanoTxInputType import CardanoTxInputType +from .CardanoTxOutputType import CardanoTxOutputType + + +class CardanoSignTransaction(p.MessageType): + MESSAGE_WIRE_TYPE = 303 + FIELDS = { + 1: ('inputs', CardanoTxInputType, p.FLAG_REPEATED), + 2: ('outputs', CardanoTxOutputType, p.FLAG_REPEATED), + 3: ('transactions_count', p.UVarintType, 0), + } + + def __init__( + self, + inputs: List[CardanoTxInputType] = None, + outputs: List[CardanoTxOutputType] = None, + transactions_count: int = None, + ) -> None: + self.inputs = inputs if inputs is not None else [] + self.outputs = outputs if outputs is not None else [] + self.transactions_count = transactions_count diff --git a/src/trezor/messages/CardanoSignedTransaction.py b/src/trezor/messages/CardanoSignedTransaction.py new file mode 100644 index 000000000..f56aaa5d2 --- /dev/null +++ b/src/trezor/messages/CardanoSignedTransaction.py @@ -0,0 +1,19 @@ +# Automatically generated by pb2py +# fmt: off +import protobuf as p + + +class CardanoSignedTransaction(p.MessageType): + MESSAGE_WIRE_TYPE = 310 + FIELDS = { + 1: ('tx_hash', p.BytesType, 0), + 2: ('tx_body', p.BytesType, 0), + } + + def __init__( + self, + tx_hash: bytes = None, + tx_body: bytes = None, + ) -> None: + self.tx_hash = tx_hash + self.tx_body = tx_body diff --git a/src/trezor/messages/CardanoTxAck.py b/src/trezor/messages/CardanoTxAck.py new file mode 100644 index 000000000..c565376ce --- /dev/null +++ b/src/trezor/messages/CardanoTxAck.py @@ -0,0 +1,16 @@ +# Automatically generated by pb2py +# fmt: off +import protobuf as p + + +class CardanoTxAck(p.MessageType): + MESSAGE_WIRE_TYPE = 309 + FIELDS = { + 1: ('transaction', p.BytesType, 0), + } + + def __init__( + self, + transaction: bytes = None, + ) -> None: + self.transaction = transaction diff --git a/src/trezor/messages/CardanoTxInputType.py b/src/trezor/messages/CardanoTxInputType.py new file mode 100644 index 000000000..b1c7950b7 --- /dev/null +++ b/src/trezor/messages/CardanoTxInputType.py @@ -0,0 +1,29 @@ +# Automatically generated by pb2py +# fmt: off +import protobuf as p +if __debug__: + try: + from typing import List + except ImportError: + List = None # type: ignore + + +class CardanoTxInputType(p.MessageType): + FIELDS = { + 1: ('address_n', p.UVarintType, p.FLAG_REPEATED), + 2: ('prev_hash', p.BytesType, 0), + 3: ('prev_index', p.UVarintType, 0), + 4: ('type', p.UVarintType, 0), + } + + def __init__( + self, + address_n: List[int] = None, + prev_hash: bytes = None, + prev_index: int = None, + type: int = None, + ) -> None: + self.address_n = address_n if address_n is not None else [] + self.prev_hash = prev_hash + self.prev_index = prev_index + self.type = type diff --git a/src/trezor/messages/CardanoTxOutputType.py b/src/trezor/messages/CardanoTxOutputType.py new file mode 100644 index 000000000..208f86428 --- /dev/null +++ b/src/trezor/messages/CardanoTxOutputType.py @@ -0,0 +1,26 @@ +# Automatically generated by pb2py +# fmt: off +import protobuf as p +if __debug__: + try: + from typing import List + except ImportError: + List = None # type: ignore + + +class CardanoTxOutputType(p.MessageType): + FIELDS = { + 1: ('address', p.UnicodeType, 0), + 2: ('address_n', p.UVarintType, p.FLAG_REPEATED), + 3: ('amount', p.UVarintType, 0), + } + + def __init__( + self, + address: str = None, + address_n: List[int] = None, + amount: int = None, + ) -> None: + self.address = address + self.address_n = address_n if address_n is not None else [] + self.amount = amount diff --git a/src/trezor/messages/CardanoTxRequest.py b/src/trezor/messages/CardanoTxRequest.py new file mode 100644 index 000000000..e50b62a0f --- /dev/null +++ b/src/trezor/messages/CardanoTxRequest.py @@ -0,0 +1,22 @@ +# Automatically generated by pb2py +# fmt: off +import protobuf as p + + +class CardanoTxRequest(p.MessageType): + MESSAGE_WIRE_TYPE = 304 + FIELDS = { + 1: ('tx_index', p.UVarintType, 0), + 2: ('tx_hash', p.BytesType, 0), + 3: ('tx_body', p.BytesType, 0), + } + + def __init__( + self, + tx_index: int = None, + tx_hash: bytes = None, + tx_body: bytes = None, + ) -> None: + self.tx_index = tx_index + self.tx_hash = tx_hash + self.tx_body = tx_body diff --git a/src/trezor/messages/CardanoVerifyMessage.py b/src/trezor/messages/CardanoVerifyMessage.py new file mode 100644 index 000000000..b335baac8 --- /dev/null +++ b/src/trezor/messages/CardanoVerifyMessage.py @@ -0,0 +1,22 @@ +# Automatically generated by pb2py +# fmt: off +import protobuf as p + + +class CardanoVerifyMessage(p.MessageType): + MESSAGE_WIRE_TYPE = 302 + FIELDS = { + 1: ('public_key', p.BytesType, 0), + 2: ('signature', p.BytesType, 0), + 3: ('message', p.BytesType, 0), + } + + def __init__( + self, + public_key: bytes = None, + signature: bytes = None, + message: bytes = None, + ) -> None: + self.public_key = public_key + self.signature = signature + self.message = message diff --git a/src/trezor/messages/DecryptedMessage.py b/src/trezor/messages/DecryptedMessage.py deleted file mode 100644 index 7435a2e60..000000000 --- a/src/trezor/messages/DecryptedMessage.py +++ /dev/null @@ -1,19 +0,0 @@ -# Automatically generated by pb2py -# fmt: off -import protobuf as p - - -class DecryptedMessage(p.MessageType): - MESSAGE_WIRE_TYPE = 52 - FIELDS = { - 1: ('message', p.BytesType, 0), - 2: ('address', p.UnicodeType, 0), - } - - def __init__( - self, - message: bytes = None, - address: str = None, - ) -> None: - self.message = message - self.address = address diff --git a/src/trezor/messages/EncryptMessage.py b/src/trezor/messages/EncryptMessage.py deleted file mode 100644 index 2f46de966..000000000 --- a/src/trezor/messages/EncryptMessage.py +++ /dev/null @@ -1,33 +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 EncryptMessage(p.MessageType): - MESSAGE_WIRE_TYPE = 49 - FIELDS = { - 1: ('pubkey', p.BytesType, 0), - 2: ('message', p.BytesType, 0), - 3: ('display_only', p.BoolType, 0), - 4: ('address_n', p.UVarintType, p.FLAG_REPEATED), - 5: ('coin_name', p.UnicodeType, 0), # default=Bitcoin - } - - def __init__( - self, - pubkey: bytes = None, - message: bytes = None, - display_only: bool = None, - address_n: List[int] = None, - coin_name: str = None, - ) -> None: - self.pubkey = pubkey - self.message = message - self.display_only = display_only - self.address_n = address_n if address_n is not None else [] - self.coin_name = coin_name diff --git a/src/trezor/messages/EncryptedMessage.py b/src/trezor/messages/EncryptedMessage.py deleted file mode 100644 index 8e2b1e9cb..000000000 --- a/src/trezor/messages/EncryptedMessage.py +++ /dev/null @@ -1,22 +0,0 @@ -# Automatically generated by pb2py -# fmt: off -import protobuf as p - - -class EncryptedMessage(p.MessageType): - MESSAGE_WIRE_TYPE = 50 - FIELDS = { - 1: ('nonce', p.BytesType, 0), - 2: ('message', p.BytesType, 0), - 3: ('hmac', p.BytesType, 0), - } - - def __init__( - self, - nonce: bytes = None, - message: bytes = None, - hmac: bytes = None, - ) -> None: - self.nonce = nonce - self.message = message - self.hmac = hmac diff --git a/src/trezor/messages/EstimateTxSize.py b/src/trezor/messages/EstimateTxSize.py deleted file mode 100644 index f442e9e28..000000000 --- a/src/trezor/messages/EstimateTxSize.py +++ /dev/null @@ -1,22 +0,0 @@ -# Automatically generated by pb2py -# fmt: off -import protobuf as p - - -class EstimateTxSize(p.MessageType): - MESSAGE_WIRE_TYPE = 43 - FIELDS = { - 1: ('outputs_count', p.UVarintType, 0), # required - 2: ('inputs_count', p.UVarintType, 0), # required - 3: ('coin_name', p.UnicodeType, 0), # default=Bitcoin - } - - def __init__( - self, - outputs_count: int = None, - inputs_count: int = None, - coin_name: str = None, - ) -> None: - self.outputs_count = outputs_count - self.inputs_count = inputs_count - self.coin_name = coin_name diff --git a/src/trezor/messages/MessageType.py b/src/trezor/messages/MessageType.py index 7b18f5173..583f921ad 100644 --- a/src/trezor/messages/MessageType.py +++ b/src/trezor/messages/MessageType.py @@ -6,76 +6,55 @@ Success = 2 Failure = 3 ChangePin = 4 WipeDevice = 5 -FirmwareErase = 6 -FirmwareUpload = 7 -FirmwareRequest = 8 GetEntropy = 9 Entropy = 10 -GetPublicKey = 11 -PublicKey = 12 LoadDevice = 13 ResetDevice = 14 -SignTx = 15 -SimpleSignTx = 16 Features = 17 PinMatrixRequest = 18 PinMatrixAck = 19 Cancel = 20 -TxRequest = 21 -TxAck = 22 -CipherKeyValue = 23 ClearSession = 24 ApplySettings = 25 ButtonRequest = 26 ButtonAck = 27 ApplyFlags = 28 -GetAddress = 29 -Address = 30 -SelfTest = 32 BackupDevice = 34 EntropyRequest = 35 EntropyAck = 36 -SignMessage = 38 -VerifyMessage = 39 -MessageSignature = 40 PassphraseRequest = 41 PassphraseAck = 42 PassphraseStateRequest = 77 PassphraseStateAck = 78 -EstimateTxSize = 43 -TxSize = 44 RecoveryDevice = 45 WordRequest = 46 WordAck = 47 +GetFeatures = 55 +SetU2FCounter = 63 +FirmwareErase = 6 +FirmwareUpload = 7 +FirmwareRequest = 8 +SelfTest = 32 +GetPublicKey = 11 +PublicKey = 12 +SignTx = 15 +TxRequest = 21 +TxAck = 22 +GetAddress = 29 +Address = 30 +SignMessage = 38 +VerifyMessage = 39 +MessageSignature = 40 +CipherKeyValue = 23 CipheredKeyValue = 48 -EncryptMessage = 49 -EncryptedMessage = 50 -DecryptMessage = 51 -DecryptedMessage = 52 SignIdentity = 53 SignedIdentity = 54 -GetFeatures = 55 -EthereumGetAddress = 56 -EthereumAddress = 57 -EthereumSignTx = 58 -EthereumTxRequest = 59 -EthereumTxAck = 60 GetECDHSessionKey = 61 ECDHSessionKey = 62 -SetU2FCounter = 63 -EthereumSignMessage = 64 -EthereumVerifyMessage = 65 -EthereumMessageSignature = 66 -NEMGetAddress = 67 -NEMAddress = 68 -NEMSignTx = 69 -NEMSignedTx = 70 CosiCommit = 71 CosiCommitment = 72 CosiSign = 73 CosiSignature = 74 -NEMDecryptMessage = 75 -NEMDecryptedMessage = 76 DebugLinkDecision = 100 DebugLinkGetState = 101 DebugLinkState = 102 @@ -85,6 +64,20 @@ DebugLinkMemoryRead = 110 DebugLinkMemory = 111 DebugLinkMemoryWrite = 112 DebugLinkFlashErase = 113 +EthereumGetAddress = 56 +EthereumAddress = 57 +EthereumSignTx = 58 +EthereumTxRequest = 59 +EthereumTxAck = 60 +EthereumSignMessage = 64 +EthereumVerifyMessage = 65 +EthereumMessageSignature = 66 +NEMGetAddress = 67 +NEMAddress = 68 +NEMSignTx = 69 +NEMSignedTx = 70 +NEMDecryptMessage = 75 +NEMDecryptedMessage = 76 LiskGetAddress = 114 LiskAddress = 115 LiskSignTx = 116 @@ -94,6 +87,12 @@ LiskMessageSignature = 119 LiskVerifyMessage = 120 LiskGetPublicKey = 121 LiskPublicKey = 122 +TezosGetAddress = 150 +TezosAddress = 151 +TezosSignTx = 152 +TezosSignedTx = 153 +TezosGetPublicKey = 154 +TezosPublicKey = 155 StellarGetPublicKey = 200 StellarPublicKey = 201 StellarSignTx = 202 @@ -112,3 +111,14 @@ StellarAccountMergeOp = 218 StellarManageDataOp = 220 StellarBumpSequenceOp = 221 StellarSignedTx = 230 +CardanoSignMessage = 300 +CardanoMessageSignature = 301 +CardanoVerifyMessage = 302 +CardanoSignTransaction = 303 +CardanoTxRequest = 304 +CardanoGetPublicKey = 305 +CardanoPublicKey = 306 +CardanoGetAddress = 307 +CardanoAddress = 308 +CardanoTxAck = 309 +CardanoSignedTransaction = 310 diff --git a/src/trezor/messages/SimpleSignTx.py b/src/trezor/messages/SimpleSignTx.py deleted file mode 100644 index 2a8628705..000000000 --- a/src/trezor/messages/SimpleSignTx.py +++ /dev/null @@ -1,45 +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 -from .TransactionType import TransactionType -from .TxInputType import TxInputType -from .TxOutputType import TxOutputType - - -class SimpleSignTx(p.MessageType): - MESSAGE_WIRE_TYPE = 16 - FIELDS = { - 1: ('inputs', TxInputType, p.FLAG_REPEATED), - 2: ('outputs', TxOutputType, p.FLAG_REPEATED), - 3: ('transactions', TransactionType, p.FLAG_REPEATED), - 4: ('coin_name', p.UnicodeType, 0), # default=Bitcoin - 5: ('version', p.UVarintType, 0), # default=1 - 6: ('lock_time', p.UVarintType, 0), # default=0 - 7: ('expiry', p.UVarintType, 0), - 8: ('overwintered', p.BoolType, 0), - } - - def __init__( - self, - inputs: List[TxInputType] = None, - outputs: List[TxOutputType] = None, - transactions: List[TransactionType] = None, - coin_name: str = None, - version: int = None, - lock_time: int = None, - expiry: int = None, - overwintered: bool = None, - ) -> None: - self.inputs = inputs if inputs is not None else [] - self.outputs = outputs if outputs is not None else [] - self.transactions = transactions if transactions is not None else [] - self.coin_name = coin_name - self.version = version - self.lock_time = lock_time - self.expiry = expiry - self.overwintered = overwintered diff --git a/src/trezor/messages/TezosAddress.py b/src/trezor/messages/TezosAddress.py new file mode 100644 index 000000000..2618fd0bd --- /dev/null +++ b/src/trezor/messages/TezosAddress.py @@ -0,0 +1,16 @@ +# Automatically generated by pb2py +# fmt: off +import protobuf as p + + +class TezosAddress(p.MessageType): + MESSAGE_WIRE_TYPE = 151 + FIELDS = { + 1: ('address', p.UnicodeType, 0), + } + + def __init__( + self, + address: str = None, + ) -> None: + self.address = address diff --git a/src/trezor/messages/TezosContractID.py b/src/trezor/messages/TezosContractID.py new file mode 100644 index 000000000..a6d48ca2d --- /dev/null +++ b/src/trezor/messages/TezosContractID.py @@ -0,0 +1,18 @@ +# Automatically generated by pb2py +# fmt: off +import protobuf as p + + +class TezosContractID(p.MessageType): + FIELDS = { + 1: ('tag', p.UVarintType, 0), + 2: ('hash', p.BytesType, 0), + } + + def __init__( + self, + tag: int = None, + hash: bytes = None, + ) -> None: + self.tag = tag + self.hash = hash diff --git a/src/trezor/messages/TezosContractType.py b/src/trezor/messages/TezosContractType.py new file mode 100644 index 000000000..04275b086 --- /dev/null +++ b/src/trezor/messages/TezosContractType.py @@ -0,0 +1,4 @@ +# Automatically generated by pb2py +# fmt: off +Implicit = 0 +Originated = 1 diff --git a/src/trezor/messages/TezosDelegationType.py b/src/trezor/messages/TezosDelegationType.py new file mode 100644 index 000000000..a0d43a728 --- /dev/null +++ b/src/trezor/messages/TezosDelegationType.py @@ -0,0 +1,15 @@ +# Automatically generated by pb2py +# fmt: off +import protobuf as p + + +class TezosDelegationType(p.MessageType): + FIELDS = { + 1: ('delegate', p.BytesType, 0), + } + + def __init__( + self, + delegate: bytes = None, + ) -> None: + self.delegate = delegate diff --git a/src/trezor/messages/TezosGetAddress.py b/src/trezor/messages/TezosGetAddress.py new file mode 100644 index 000000000..24a359de1 --- /dev/null +++ b/src/trezor/messages/TezosGetAddress.py @@ -0,0 +1,24 @@ +# Automatically generated by pb2py +# fmt: off +import protobuf as p +if __debug__: + try: + from typing import List + except ImportError: + List = None # type: ignore + + +class TezosGetAddress(p.MessageType): + MESSAGE_WIRE_TYPE = 150 + 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/TezosGetPublicKey.py b/src/trezor/messages/TezosGetPublicKey.py new file mode 100644 index 000000000..74efe0a75 --- /dev/null +++ b/src/trezor/messages/TezosGetPublicKey.py @@ -0,0 +1,24 @@ +# Automatically generated by pb2py +# fmt: off +import protobuf as p +if __debug__: + try: + from typing import List + except ImportError: + List = None # type: ignore + + +class TezosGetPublicKey(p.MessageType): + MESSAGE_WIRE_TYPE = 154 + 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/TezosOperationCommon.py b/src/trezor/messages/TezosOperationCommon.py new file mode 100644 index 000000000..fbce396ae --- /dev/null +++ b/src/trezor/messages/TezosOperationCommon.py @@ -0,0 +1,34 @@ +# Automatically generated by pb2py +# fmt: off +import protobuf as p +from .TezosContractID import TezosContractID + + +class TezosOperationCommon(p.MessageType): + FIELDS = { + 1: ('branch', p.BytesType, 0), + 2: ('tag', p.UVarintType, 0), + 3: ('source', TezosContractID, 0), + 4: ('fee', p.UVarintType, 0), + 5: ('counter', p.UVarintType, 0), + 6: ('gas_limit', p.UVarintType, 0), + 7: ('storage_limit', p.UVarintType, 0), + } + + def __init__( + self, + branch: bytes = None, + tag: int = None, + source: TezosContractID = None, + fee: int = None, + counter: int = None, + gas_limit: int = None, + storage_limit: int = None, + ) -> None: + self.branch = branch + self.tag = tag + self.source = source + self.fee = fee + self.counter = counter + self.gas_limit = gas_limit + self.storage_limit = storage_limit diff --git a/src/trezor/messages/TezosOperationType.py b/src/trezor/messages/TezosOperationType.py new file mode 100644 index 000000000..d84d4f3b9 --- /dev/null +++ b/src/trezor/messages/TezosOperationType.py @@ -0,0 +1,5 @@ +# Automatically generated by pb2py +# fmt: off +Transaction = 8 +Origination = 9 +Delegation = 10 diff --git a/src/trezor/messages/TezosOriginationType.py b/src/trezor/messages/TezosOriginationType.py new file mode 100644 index 000000000..854717b2f --- /dev/null +++ b/src/trezor/messages/TezosOriginationType.py @@ -0,0 +1,30 @@ +# Automatically generated by pb2py +# fmt: off +import protobuf as p + + +class TezosOriginationType(p.MessageType): + FIELDS = { + 1: ('manager_pubkey', p.BytesType, 0), + 2: ('balance', p.UVarintType, 0), + 3: ('spendable', p.BoolType, 0), + 4: ('delegatable', p.BoolType, 0), + 5: ('delegate', p.BytesType, 0), + 6: ('script', p.BytesType, 0), + } + + def __init__( + self, + manager_pubkey: bytes = None, + balance: int = None, + spendable: bool = None, + delegatable: bool = None, + delegate: bytes = None, + script: bytes = None, + ) -> None: + self.manager_pubkey = manager_pubkey + self.balance = balance + self.spendable = spendable + self.delegatable = delegatable + self.delegate = delegate + self.script = script diff --git a/src/trezor/messages/TezosPublicKey.py b/src/trezor/messages/TezosPublicKey.py new file mode 100644 index 000000000..99c4fdc5b --- /dev/null +++ b/src/trezor/messages/TezosPublicKey.py @@ -0,0 +1,16 @@ +# Automatically generated by pb2py +# fmt: off +import protobuf as p + + +class TezosPublicKey(p.MessageType): + MESSAGE_WIRE_TYPE = 155 + FIELDS = { + 1: ('public_key', p.BytesType, 0), + } + + def __init__( + self, + public_key: bytes = None, + ) -> None: + self.public_key = public_key diff --git a/src/trezor/messages/TezosSignTx.py b/src/trezor/messages/TezosSignTx.py new file mode 100644 index 000000000..c99d0f7b7 --- /dev/null +++ b/src/trezor/messages/TezosSignTx.py @@ -0,0 +1,37 @@ +# Automatically generated by pb2py +# fmt: off +import protobuf as p +if __debug__: + try: + from typing import List + except ImportError: + List = None # type: ignore +from .TezosDelegationType import TezosDelegationType +from .TezosOperationCommon import TezosOperationCommon +from .TezosOriginationType import TezosOriginationType +from .TezosTransactionType import TezosTransactionType + + +class TezosSignTx(p.MessageType): + MESSAGE_WIRE_TYPE = 152 + FIELDS = { + 1: ('address_n', p.UVarintType, p.FLAG_REPEATED), + 2: ('operation', TezosOperationCommon, 0), + 3: ('transaction', TezosTransactionType, 0), + 4: ('origination', TezosOriginationType, 0), + 5: ('delegation', TezosDelegationType, 0), + } + + def __init__( + self, + address_n: List[int] = None, + operation: TezosOperationCommon = None, + transaction: TezosTransactionType = None, + origination: TezosOriginationType = None, + delegation: TezosDelegationType = None, + ) -> None: + self.address_n = address_n if address_n is not None else [] + self.operation = operation + self.transaction = transaction + self.origination = origination + self.delegation = delegation diff --git a/src/trezor/messages/TezosSignedTx.py b/src/trezor/messages/TezosSignedTx.py new file mode 100644 index 000000000..e6dd9555c --- /dev/null +++ b/src/trezor/messages/TezosSignedTx.py @@ -0,0 +1,22 @@ +# Automatically generated by pb2py +# fmt: off +import protobuf as p + + +class TezosSignedTx(p.MessageType): + MESSAGE_WIRE_TYPE = 153 + FIELDS = { + 1: ('signature', p.BytesType, 0), + 2: ('sig_op_contents', p.BytesType, 0), + 3: ('operation_hash', p.UnicodeType, 0), + } + + def __init__( + self, + signature: bytes = None, + sig_op_contents: bytes = None, + operation_hash: str = None, + ) -> None: + self.signature = signature + self.sig_op_contents = sig_op_contents + self.operation_hash = operation_hash diff --git a/src/trezor/messages/TezosTransactionType.py b/src/trezor/messages/TezosTransactionType.py new file mode 100644 index 000000000..50add7414 --- /dev/null +++ b/src/trezor/messages/TezosTransactionType.py @@ -0,0 +1,22 @@ +# Automatically generated by pb2py +# fmt: off +import protobuf as p +from .TezosContractID import TezosContractID + + +class TezosTransactionType(p.MessageType): + FIELDS = { + 1: ('amount', p.UVarintType, 0), + 2: ('destination', TezosContractID, 0), + 3: ('parameters', p.BytesType, 0), + } + + def __init__( + self, + amount: int = None, + destination: TezosContractID = None, + parameters: bytes = None, + ) -> None: + self.amount = amount + self.destination = destination + self.parameters = parameters diff --git a/src/trezor/messages/TransactionType.py b/src/trezor/messages/TransactionType.py index 9985347df..1472c899a 100644 --- a/src/trezor/messages/TransactionType.py +++ b/src/trezor/messages/TransactionType.py @@ -16,8 +16,8 @@ class TransactionType(p.MessageType): 1: ('version', p.UVarintType, 0), 2: ('inputs', TxInputType, p.FLAG_REPEATED), 3: ('bin_outputs', TxOutputBinType, p.FLAG_REPEATED), - 5: ('outputs', TxOutputType, p.FLAG_REPEATED), 4: ('lock_time', p.UVarintType, 0), + 5: ('outputs', TxOutputType, p.FLAG_REPEATED), 6: ('inputs_cnt', p.UVarintType, 0), 7: ('outputs_cnt', p.UVarintType, 0), 8: ('extra_data', p.BytesType, 0), @@ -31,8 +31,8 @@ class TransactionType(p.MessageType): version: int = None, inputs: List[TxInputType] = None, bin_outputs: List[TxOutputBinType] = None, - outputs: List[TxOutputType] = None, lock_time: int = None, + outputs: List[TxOutputType] = None, inputs_cnt: int = None, outputs_cnt: int = None, extra_data: bytes = None, @@ -43,8 +43,8 @@ class TransactionType(p.MessageType): self.version = version self.inputs = inputs if inputs is not None else [] self.bin_outputs = bin_outputs if bin_outputs is not None else [] - self.outputs = outputs if outputs is not None else [] self.lock_time = lock_time + self.outputs = outputs if outputs is not None else [] self.inputs_cnt = inputs_cnt self.outputs_cnt = outputs_cnt self.extra_data = extra_data diff --git a/src/trezor/messages/TxSize.py b/src/trezor/messages/TxSize.py deleted file mode 100644 index ca48e2933..000000000 --- a/src/trezor/messages/TxSize.py +++ /dev/null @@ -1,16 +0,0 @@ -# Automatically generated by pb2py -# fmt: off -import protobuf as p - - -class TxSize(p.MessageType): - MESSAGE_WIRE_TYPE = 44 - FIELDS = { - 1: ('tx_size', p.UVarintType, 0), - } - - def __init__( - self, - tx_size: int = None, - ) -> None: - self.tx_size = tx_size diff --git a/tools/build_protobuf b/tools/build_protobuf index bdfe4a182..c0081a4a9 100755 --- a/tools/build_protobuf +++ b/tools/build_protobuf @@ -4,4 +4,6 @@ set -e ../vendor/trezor-common/protob/pb2py \ --no-init-py \ -o ../src/trezor/messages \ - ../vendor/trezor-common/protob/{types,messages}.proto + ../vendor/trezor-common/protob/common.proto \ + ../vendor/trezor-common/protob/messages.proto \ + ../vendor/trezor-common/protob/messages-*.proto diff --git a/vendor/trezor-common b/vendor/trezor-common index c4420e41d..1b9b7d6c8 160000 --- a/vendor/trezor-common +++ b/vendor/trezor-common @@ -1 +1 @@ -Subproject commit c4420e41d3d98368d42fa59ae3bee88599d72fec +Subproject commit 1b9b7d6c8ed44b24a7f105a83dc10ea7cc796ed9