diff --git a/trezorlib/messages/Initialize.py b/trezorlib/messages/Initialize.py index 38e35ec73d..fa3453fca8 100644 --- a/trezorlib/messages/Initialize.py +++ b/trezorlib/messages/Initialize.py @@ -6,10 +6,13 @@ class Initialize(p.MessageType): MESSAGE_WIRE_TYPE = 0 FIELDS = { 1: ('state', p.BytesType, 0), + 2: ('skip_passphrase', p.BoolType, 0), } def __init__( self, - state: bytes = None + state: bytes = None, + skip_passphrase: bool = None ) -> None: self.state = state + self.skip_passphrase = skip_passphrase diff --git a/trezorlib/messages/LiskMessageSignature.py b/trezorlib/messages/LiskMessageSignature.py deleted file mode 100644 index b161458386..0000000000 --- a/trezorlib/messages/LiskMessageSignature.py +++ /dev/null @@ -1,18 +0,0 @@ -# Automatically generated by pb2py -from .. import protobuf as p - - -class LiskMessageSignature(p.MessageType): - MESSAGE_WIRE_TYPE = 119 - FIELDS = { - 1: ('address', p.UnicodeType, 0), - 2: ('signature', p.BytesType, 0), - } - - def __init__( - self, - address: str = None, - signature: bytes = None - ) -> None: - self.address = address - self.signature = signature diff --git a/trezorlib/messages/LiskSignMessage.py b/trezorlib/messages/LiskSignMessage.py deleted file mode 100644 index 4194c8a6b8..0000000000 --- a/trezorlib/messages/LiskSignMessage.py +++ /dev/null @@ -1,23 +0,0 @@ -# Automatically generated by pb2py -from .. import protobuf as p -if __debug__: - try: - from typing import List - except ImportError: - List = None - - -class LiskSignMessage(p.MessageType): - MESSAGE_WIRE_TYPE = 118 - FIELDS = { - 1: ('address_n', p.UVarintType, p.FLAG_REPEATED), - 2: ('message', p.BytesType, 0), - } - - def __init__( - self, - address_n: List[int] = None, - message: bytes = None - ) -> None: - self.address_n = address_n if address_n is not None else [] - self.message = message diff --git a/trezorlib/messages/LiskVerifyMessage.py b/trezorlib/messages/LiskVerifyMessage.py deleted file mode 100644 index 235ac3b0f9..0000000000 --- a/trezorlib/messages/LiskVerifyMessage.py +++ /dev/null @@ -1,21 +0,0 @@ -# Automatically generated by pb2py -from .. import protobuf as p - - -class LiskVerifyMessage(p.MessageType): - MESSAGE_WIRE_TYPE = 120 - FIELDS = { - 1: ('signature', p.BytesType, 0), - 2: ('public_key', p.BytesType, 0), - 3: ('message', p.BytesType, 0), - } - - def __init__( - self, - signature: bytes = None, - public_key: bytes = None, - message: bytes = None - ) -> None: - self.signature = signature - self.public_key = public_key - self.message = message diff --git a/trezorlib/messages/MessageType.py b/trezorlib/messages/MessageType.py index 2c76d2115d..66b2787581 100644 --- a/trezorlib/messages/MessageType.py +++ b/trezorlib/messages/MessageType.py @@ -88,18 +88,12 @@ LiskGetAddress = 114 LiskAddress = 115 LiskSignTx = 116 LiskSignedTx = 117 -LiskSignMessage = 118 -LiskMessageSignature = 119 -LiskVerifyMessage = 120 LiskGetPublicKey = 121 LiskPublicKey = 122 StellarGetPublicKey = 200 StellarPublicKey = 201 StellarSignTx = 202 StellarTxOpRequest = 203 -StellarSignMessage = 204 -StellarMessageSignature = 205 -StellarVerifyMessage = 206 StellarCreateAccountOp = 210 StellarPaymentOp = 211 StellarPathPaymentOp = 212 diff --git a/trezorlib/messages/StellarMessageSignature.py b/trezorlib/messages/StellarMessageSignature.py deleted file mode 100644 index 631a04109c..0000000000 --- a/trezorlib/messages/StellarMessageSignature.py +++ /dev/null @@ -1,18 +0,0 @@ -# Automatically generated by pb2py -from .. import protobuf as p - - -class StellarMessageSignature(p.MessageType): - MESSAGE_WIRE_TYPE = 205 - 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/trezorlib/messages/StellarSignMessage.py b/trezorlib/messages/StellarSignMessage.py deleted file mode 100644 index 069908c2fa..0000000000 --- a/trezorlib/messages/StellarSignMessage.py +++ /dev/null @@ -1,23 +0,0 @@ -# Automatically generated by pb2py -from .. import protobuf as p -if __debug__: - try: - from typing import List - except ImportError: - List = None - - -class StellarSignMessage(p.MessageType): - MESSAGE_WIRE_TYPE = 204 - FIELDS = { - 1: ('address_n', p.UVarintType, p.FLAG_REPEATED), - 2: ('message', p.BytesType, 0), - } - - def __init__( - self, - address_n: List[int] = None, - message: bytes = None - ) -> None: - self.address_n = address_n if address_n is not None else [] - self.message = message diff --git a/trezorlib/messages/StellarVerifyMessage.py b/trezorlib/messages/StellarVerifyMessage.py deleted file mode 100644 index 2189306d96..0000000000 --- a/trezorlib/messages/StellarVerifyMessage.py +++ /dev/null @@ -1,21 +0,0 @@ -# Automatically generated by pb2py -from .. import protobuf as p - - -class StellarVerifyMessage(p.MessageType): - MESSAGE_WIRE_TYPE = 206 - FIELDS = { - 1: ('public_key', p.BytesType, 0), - 2: ('message', p.BytesType, 0), - 3: ('signature', p.BytesType, 0), - } - - def __init__( - self, - public_key: bytes = None, - message: bytes = None, - signature: bytes = None - ) -> None: - self.public_key = public_key - self.message = message - self.signature = signature diff --git a/trezorlib/messages/TransactionType.py b/trezorlib/messages/TransactionType.py index 34f0a263ac..2d9d20b606 100644 --- a/trezorlib/messages/TransactionType.py +++ b/trezorlib/messages/TransactionType.py @@ -22,6 +22,7 @@ class TransactionType(p.MessageType): 8: ('extra_data', p.BytesType, 0), 9: ('extra_data_len', p.UVarintType, 0), 10: ('decred_expiry', p.UVarintType, 0), + 11: ('overwintered', p.BoolType, 0), } def __init__( @@ -35,7 +36,8 @@ class TransactionType(p.MessageType): outputs_cnt: int = None, extra_data: bytes = None, extra_data_len: int = None, - decred_expiry: int = None + decred_expiry: int = None, + overwintered: bool = None ) -> None: self.version = version self.inputs = inputs if inputs is not None else [] @@ -47,3 +49,4 @@ class TransactionType(p.MessageType): self.extra_data = extra_data self.extra_data_len = extra_data_len self.decred_expiry = decred_expiry + self.overwintered = overwintered diff --git a/trezorlib/messages/__init__.py b/trezorlib/messages/__init__.py index 663224076f..b1c1e8a828 100644 --- a/trezorlib/messages/__init__.py +++ b/trezorlib/messages/__init__.py @@ -96,12 +96,9 @@ from .Initialize import Initialize from .LiskAddress import LiskAddress from .LiskGetAddress import LiskGetAddress from .LiskGetPublicKey import LiskGetPublicKey -from .LiskMessageSignature import LiskMessageSignature from .LiskPublicKey import LiskPublicKey -from .LiskSignMessage import LiskSignMessage from .LiskSignTx import LiskSignTx from .LiskSignedTx import LiskSignedTx -from .LiskVerifyMessage import LiskVerifyMessage from .LoadDevice import LoadDevice from .MessageSignature import MessageSignature from .NEMAddress import NEMAddress @@ -136,16 +133,13 @@ from .StellarCreatePassiveOfferOp import StellarCreatePassiveOfferOp from .StellarGetPublicKey import StellarGetPublicKey from .StellarManageDataOp import StellarManageDataOp from .StellarManageOfferOp import StellarManageOfferOp -from .StellarMessageSignature import StellarMessageSignature from .StellarPathPaymentOp import StellarPathPaymentOp from .StellarPaymentOp import StellarPaymentOp from .StellarPublicKey import StellarPublicKey from .StellarSetOptionsOp import StellarSetOptionsOp -from .StellarSignMessage import StellarSignMessage from .StellarSignTx import StellarSignTx from .StellarSignedTx import StellarSignedTx from .StellarTxOpRequest import StellarTxOpRequest -from .StellarVerifyMessage import StellarVerifyMessage from .Success import Success from .TxAck import TxAck from .TxRequest import TxRequest diff --git a/vendor/trezor-common b/vendor/trezor-common index b91db285ba..8fc001154e 160000 --- a/vendor/trezor-common +++ b/vendor/trezor-common @@ -1 +1 @@ -Subproject commit b91db285ba8947d6c65a6a807fba87ebc1d43f5d +Subproject commit 8fc001154e49c2c1747957c4a9a1ab92dcc86edb