From 14037d0c312861dfe8de7799713877722cac99fe Mon Sep 17 00:00:00 2001 From: matejcik Date: Thu, 14 Jan 2021 12:05:22 +0100 Subject: [PATCH] chore: regenerate protobuf classes --- core/src/trezor/messages/BinanceAddress.py | 4 +-- core/src/trezor/messages/BinancePublicKey.py | 4 +-- core/src/trezor/messages/BinanceSignedTx.py | 8 ++--- core/src/trezor/messages/CardanoAddress.py | 4 +-- .../messages/CardanoAddressParametersType.py | 4 +-- .../messages/CardanoBlockchainPointerType.py | 12 +++---- core/src/trezor/messages/CardanoGetAddress.py | 18 +++++------ core/src/trezor/messages/CardanoPublicKey.py | 8 ++--- core/src/trezor/messages/CardanoSignTx.py | 14 ++++---- core/src/trezor/messages/CardanoSignedTx.py | 8 ++--- .../messages/CardanoTxCertificateType.py | 4 +-- .../src/trezor/messages/CardanoTxInputType.py | 8 ++--- .../trezor/messages/CardanoTxOutputType.py | 6 ++-- .../messages/CardanoTxWithdrawalType.py | 4 +-- core/src/trezor/messages/CipherKeyValue.py | 8 ++--- core/src/trezor/messages/CipheredKeyValue.py | 4 +-- core/src/trezor/messages/ECDHSessionKey.py | 4 +-- core/src/trezor/messages/EosActionUnknown.py | 4 +-- .../trezor/messages/EosAuthorizationKey.py | 10 +++--- core/src/trezor/messages/EosPublicKey.py | 8 ++--- core/src/trezor/messages/EosSignedTx.py | 4 +-- .../messages/EthereumMessageSignature.py | 8 ++--- core/src/trezor/messages/EthereumPublicKey.py | 8 ++--- core/src/trezor/messages/Features.py | 14 ++++---- core/src/trezor/messages/GetECDHSessionKey.py | 8 ++--- core/src/trezor/messages/LiskAddress.py | 4 +-- .../trezor/messages/LiskMessageSignature.py | 8 ++--- core/src/trezor/messages/LiskPublicKey.py | 4 +-- core/src/trezor/messages/LiskSignMessage.py | 4 +-- core/src/trezor/messages/LiskSignTx.py | 4 +-- core/src/trezor/messages/LiskSignedTx.py | 4 +-- core/src/trezor/messages/LiskVerifyMessage.py | 12 +++---- core/src/trezor/messages/MessageSignature.py | 8 ++--- core/src/trezor/messages/NEMSignedTx.py | 8 ++--- core/src/trezor/messages/Ping.py | 4 +-- core/src/trezor/messages/PublicKey.py | 8 ++--- core/src/trezor/messages/RippleAddress.py | 4 +-- core/src/trezor/messages/RipplePayment.py | 8 ++--- core/src/trezor/messages/RippleSignedTx.py | 8 ++--- core/src/trezor/messages/SignIdentity.py | 12 +++---- core/src/trezor/messages/SignedIdentity.py | 10 +++--- core/src/trezor/messages/StellarAddress.py | 4 +-- core/src/trezor/messages/StellarAssetType.py | 4 +-- core/src/trezor/messages/StellarSignedTx.py | 8 ++--- core/src/trezor/messages/Success.py | 4 +-- core/src/trezor/messages/TezosAddress.py | 4 +-- core/src/trezor/messages/TezosContractID.py | 8 ++--- core/src/trezor/messages/TezosDelegationOp.py | 24 +++++++------- .../src/trezor/messages/TezosOriginationOp.py | 32 +++++++++---------- core/src/trezor/messages/TezosPublicKey.py | 4 +-- core/src/trezor/messages/TezosRevealOp.py | 24 +++++++------- core/src/trezor/messages/TezosSignTx.py | 4 +-- core/src/trezor/messages/TezosSignedTx.py | 12 +++---- .../src/trezor/messages/TezosTransactionOp.py | 28 ++++++++-------- .../src/trezorlib/messages/BinanceAddress.py | 4 +-- .../trezorlib/messages/BinancePublicKey.py | 4 +-- .../src/trezorlib/messages/BinanceSignedTx.py | 8 ++--- .../src/trezorlib/messages/CardanoAddress.py | 4 +-- .../messages/CardanoAddressParametersType.py | 4 +-- .../messages/CardanoBlockchainPointerType.py | 12 +++---- .../trezorlib/messages/CardanoGetAddress.py | 18 +++++------ .../trezorlib/messages/CardanoPublicKey.py | 8 ++--- .../src/trezorlib/messages/CardanoSignTx.py | 14 ++++---- .../src/trezorlib/messages/CardanoSignedTx.py | 8 ++--- .../messages/CardanoTxCertificateType.py | 4 +-- .../trezorlib/messages/CardanoTxInputType.py | 8 ++--- .../trezorlib/messages/CardanoTxOutputType.py | 6 ++-- .../messages/CardanoTxWithdrawalType.py | 4 +-- .../src/trezorlib/messages/CipherKeyValue.py | 8 ++--- .../trezorlib/messages/CipheredKeyValue.py | 4 +-- .../src/trezorlib/messages/CosiSignature.py | 4 +-- .../src/trezorlib/messages/ECDHSessionKey.py | 4 +-- .../trezorlib/messages/EosActionUnknown.py | 4 +-- .../trezorlib/messages/EosAuthorizationKey.py | 10 +++--- python/src/trezorlib/messages/EosPublicKey.py | 8 ++--- python/src/trezorlib/messages/EosSignedTx.py | 4 +-- .../messages/EthereumMessageSignature.py | 8 ++--- .../trezorlib/messages/EthereumPublicKey.py | 8 ++--- python/src/trezorlib/messages/Features.py | 14 ++++---- .../trezorlib/messages/GetECDHSessionKey.py | 8 ++--- python/src/trezorlib/messages/LiskAddress.py | 4 +-- .../messages/LiskMessageSignature.py | 8 ++--- .../src/trezorlib/messages/LiskPublicKey.py | 4 +-- .../src/trezorlib/messages/LiskSignMessage.py | 4 +-- python/src/trezorlib/messages/LiskSignTx.py | 4 +-- python/src/trezorlib/messages/LiskSignedTx.py | 4 +-- .../trezorlib/messages/LiskVerifyMessage.py | 12 +++---- .../trezorlib/messages/MessageSignature.py | 8 ++--- .../trezorlib/messages/NEMDecryptedMessage.py | 4 +-- python/src/trezorlib/messages/NEMSignedTx.py | 8 ++--- python/src/trezorlib/messages/Ping.py | 4 +-- python/src/trezorlib/messages/PublicKey.py | 8 ++--- .../src/trezorlib/messages/RippleAddress.py | 4 +-- .../src/trezorlib/messages/RipplePayment.py | 8 ++--- .../src/trezorlib/messages/RippleSignedTx.py | 8 ++--- python/src/trezorlib/messages/SignIdentity.py | 12 +++---- .../src/trezorlib/messages/SignedIdentity.py | 10 +++--- .../src/trezorlib/messages/StellarAddress.py | 4 +-- .../trezorlib/messages/StellarAssetType.py | 4 +-- .../src/trezorlib/messages/StellarSignedTx.py | 8 ++--- python/src/trezorlib/messages/Success.py | 4 +-- python/src/trezorlib/messages/TezosAddress.py | 4 +-- .../src/trezorlib/messages/TezosContractID.py | 8 ++--- .../trezorlib/messages/TezosDelegationOp.py | 24 +++++++------- .../trezorlib/messages/TezosOriginationOp.py | 32 +++++++++---------- .../src/trezorlib/messages/TezosPublicKey.py | 4 +-- .../src/trezorlib/messages/TezosRevealOp.py | 24 +++++++------- python/src/trezorlib/messages/TezosSignTx.py | 4 +-- .../src/trezorlib/messages/TezosSignedTx.py | 12 +++---- .../trezorlib/messages/TezosTransactionOp.py | 28 ++++++++-------- 110 files changed, 460 insertions(+), 460 deletions(-) diff --git a/core/src/trezor/messages/BinanceAddress.py b/core/src/trezor/messages/BinanceAddress.py index 6e7ece379..70e96e22f 100644 --- a/core/src/trezor/messages/BinanceAddress.py +++ b/core/src/trezor/messages/BinanceAddress.py @@ -16,12 +16,12 @@ class BinanceAddress(p.MessageType): def __init__( self, *, - address: str = None, + address: str, ) -> None: self.address = address @classmethod def get_fields(cls) -> Dict: return { - 1: ('address', p.UnicodeType, None), + 1: ('address', p.UnicodeType, p.FLAG_REQUIRED), } diff --git a/core/src/trezor/messages/BinancePublicKey.py b/core/src/trezor/messages/BinancePublicKey.py index 321255685..1dba05d5f 100644 --- a/core/src/trezor/messages/BinancePublicKey.py +++ b/core/src/trezor/messages/BinancePublicKey.py @@ -16,12 +16,12 @@ class BinancePublicKey(p.MessageType): def __init__( self, *, - public_key: bytes = None, + public_key: bytes, ) -> None: self.public_key = public_key @classmethod def get_fields(cls) -> Dict: return { - 1: ('public_key', p.BytesType, None), + 1: ('public_key', p.BytesType, p.FLAG_REQUIRED), } diff --git a/core/src/trezor/messages/BinanceSignedTx.py b/core/src/trezor/messages/BinanceSignedTx.py index 30ce07f6f..82880ce21 100644 --- a/core/src/trezor/messages/BinanceSignedTx.py +++ b/core/src/trezor/messages/BinanceSignedTx.py @@ -16,8 +16,8 @@ class BinanceSignedTx(p.MessageType): def __init__( self, *, - signature: bytes = None, - public_key: bytes = None, + signature: bytes, + public_key: bytes, ) -> None: self.signature = signature self.public_key = public_key @@ -25,6 +25,6 @@ class BinanceSignedTx(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('signature', p.BytesType, None), - 2: ('public_key', p.BytesType, None), + 1: ('signature', p.BytesType, p.FLAG_REQUIRED), + 2: ('public_key', p.BytesType, p.FLAG_REQUIRED), } diff --git a/core/src/trezor/messages/CardanoAddress.py b/core/src/trezor/messages/CardanoAddress.py index bd4b37717..48b1ba5a9 100644 --- a/core/src/trezor/messages/CardanoAddress.py +++ b/core/src/trezor/messages/CardanoAddress.py @@ -16,12 +16,12 @@ class CardanoAddress(p.MessageType): def __init__( self, *, - address: str = None, + address: str, ) -> None: self.address = address @classmethod def get_fields(cls) -> Dict: return { - 1: ('address', p.UnicodeType, None), + 1: ('address', p.UnicodeType, p.FLAG_REQUIRED), } diff --git a/core/src/trezor/messages/CardanoAddressParametersType.py b/core/src/trezor/messages/CardanoAddressParametersType.py index 0e23d56ab..45cbd1dbf 100644 --- a/core/src/trezor/messages/CardanoAddressParametersType.py +++ b/core/src/trezor/messages/CardanoAddressParametersType.py @@ -18,9 +18,9 @@ class CardanoAddressParametersType(p.MessageType): def __init__( self, *, + address_type: EnumTypeCardanoAddressType, address_n: List[int] = None, address_n_staking: List[int] = None, - address_type: EnumTypeCardanoAddressType = None, staking_key_hash: bytes = None, certificate_pointer: CardanoBlockchainPointerType = None, ) -> None: @@ -33,7 +33,7 @@ class CardanoAddressParametersType(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('address_type', p.EnumType("CardanoAddressType", (0, 1, 2, 3, 4, 5, 6, 7, 8, 14, 15)), None), + 1: ('address_type', p.EnumType("CardanoAddressType", (0, 1, 2, 3, 4, 5, 6, 7, 8, 14, 15)), p.FLAG_REQUIRED), 2: ('address_n', p.UVarintType, p.FLAG_REPEATED), 3: ('address_n_staking', p.UVarintType, p.FLAG_REPEATED), 4: ('staking_key_hash', p.BytesType, None), diff --git a/core/src/trezor/messages/CardanoBlockchainPointerType.py b/core/src/trezor/messages/CardanoBlockchainPointerType.py index c70c2f4b0..f361afa46 100644 --- a/core/src/trezor/messages/CardanoBlockchainPointerType.py +++ b/core/src/trezor/messages/CardanoBlockchainPointerType.py @@ -15,9 +15,9 @@ class CardanoBlockchainPointerType(p.MessageType): def __init__( self, *, - block_index: int = None, - tx_index: int = None, - certificate_index: int = None, + block_index: int, + tx_index: int, + certificate_index: int, ) -> None: self.block_index = block_index self.tx_index = tx_index @@ -26,7 +26,7 @@ class CardanoBlockchainPointerType(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('block_index', p.UVarintType, None), - 2: ('tx_index', p.UVarintType, None), - 3: ('certificate_index', p.UVarintType, None), + 1: ('block_index', p.UVarintType, p.FLAG_REQUIRED), + 2: ('tx_index', p.UVarintType, p.FLAG_REQUIRED), + 3: ('certificate_index', p.UVarintType, p.FLAG_REQUIRED), } diff --git a/core/src/trezor/messages/CardanoGetAddress.py b/core/src/trezor/messages/CardanoGetAddress.py index e516b7e9f..88de813a2 100644 --- a/core/src/trezor/messages/CardanoGetAddress.py +++ b/core/src/trezor/messages/CardanoGetAddress.py @@ -18,21 +18,21 @@ class CardanoGetAddress(p.MessageType): def __init__( self, *, - show_display: bool = None, - protocol_magic: int = None, - network_id: int = None, - address_parameters: CardanoAddressParametersType = None, + protocol_magic: int, + network_id: int, + address_parameters: CardanoAddressParametersType, + show_display: bool = False, ) -> None: - self.show_display = show_display self.protocol_magic = protocol_magic self.network_id = network_id self.address_parameters = address_parameters + self.show_display = show_display @classmethod def get_fields(cls) -> Dict: return { - 2: ('show_display', p.BoolType, None), - 3: ('protocol_magic', p.UVarintType, None), - 4: ('network_id', p.UVarintType, None), - 5: ('address_parameters', CardanoAddressParametersType, None), + 2: ('show_display', p.BoolType, False), # default=false + 3: ('protocol_magic', p.UVarintType, p.FLAG_REQUIRED), + 4: ('network_id', p.UVarintType, p.FLAG_REQUIRED), + 5: ('address_parameters', CardanoAddressParametersType, p.FLAG_REQUIRED), } diff --git a/core/src/trezor/messages/CardanoPublicKey.py b/core/src/trezor/messages/CardanoPublicKey.py index d51bd33cd..baecb6058 100644 --- a/core/src/trezor/messages/CardanoPublicKey.py +++ b/core/src/trezor/messages/CardanoPublicKey.py @@ -18,8 +18,8 @@ class CardanoPublicKey(p.MessageType): def __init__( self, *, - xpub: str = None, - node: HDNodeType = None, + xpub: str, + node: HDNodeType, ) -> None: self.xpub = xpub self.node = node @@ -27,6 +27,6 @@ class CardanoPublicKey(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('xpub', p.UnicodeType, None), - 2: ('node', HDNodeType, None), + 1: ('xpub', p.UnicodeType, p.FLAG_REQUIRED), + 2: ('node', HDNodeType, p.FLAG_REQUIRED), } diff --git a/core/src/trezor/messages/CardanoSignTx.py b/core/src/trezor/messages/CardanoSignTx.py index 196e26f13..1f31d2cca 100644 --- a/core/src/trezor/messages/CardanoSignTx.py +++ b/core/src/trezor/messages/CardanoSignTx.py @@ -21,14 +21,14 @@ class CardanoSignTx(p.MessageType): def __init__( self, *, + protocol_magic: int, + fee: int, + network_id: int, inputs: List[CardanoTxInputType] = None, outputs: List[CardanoTxOutputType] = None, certificates: List[CardanoTxCertificateType] = None, withdrawals: List[CardanoTxWithdrawalType] = None, - protocol_magic: int = None, - fee: int = None, ttl: int = None, - network_id: int = None, metadata: bytes = None, validity_interval_start: int = None, ) -> None: @@ -38,8 +38,8 @@ class CardanoSignTx(p.MessageType): self.withdrawals = withdrawals if withdrawals is not None else [] self.protocol_magic = protocol_magic self.fee = fee - self.ttl = ttl self.network_id = network_id + self.ttl = ttl self.metadata = metadata self.validity_interval_start = validity_interval_start @@ -48,10 +48,10 @@ class CardanoSignTx(p.MessageType): return { 1: ('inputs', CardanoTxInputType, p.FLAG_REPEATED), 2: ('outputs', CardanoTxOutputType, p.FLAG_REPEATED), - 5: ('protocol_magic', p.UVarintType, None), - 6: ('fee', p.UVarintType, None), + 5: ('protocol_magic', p.UVarintType, p.FLAG_REQUIRED), + 6: ('fee', p.UVarintType, p.FLAG_REQUIRED), 7: ('ttl', p.UVarintType, None), - 8: ('network_id', p.UVarintType, None), + 8: ('network_id', p.UVarintType, p.FLAG_REQUIRED), 9: ('certificates', CardanoTxCertificateType, p.FLAG_REPEATED), 10: ('withdrawals', CardanoTxWithdrawalType, p.FLAG_REPEATED), 11: ('metadata', p.BytesType, None), diff --git a/core/src/trezor/messages/CardanoSignedTx.py b/core/src/trezor/messages/CardanoSignedTx.py index f4f91cc6e..3306064ae 100644 --- a/core/src/trezor/messages/CardanoSignedTx.py +++ b/core/src/trezor/messages/CardanoSignedTx.py @@ -16,8 +16,8 @@ class CardanoSignedTx(p.MessageType): def __init__( self, *, - tx_hash: bytes = None, - serialized_tx: bytes = None, + tx_hash: bytes, + serialized_tx: bytes, ) -> None: self.tx_hash = tx_hash self.serialized_tx = serialized_tx @@ -25,6 +25,6 @@ class CardanoSignedTx(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('tx_hash', p.BytesType, None), - 2: ('serialized_tx', p.BytesType, None), + 1: ('tx_hash', p.BytesType, p.FLAG_REQUIRED), + 2: ('serialized_tx', p.BytesType, p.FLAG_REQUIRED), } diff --git a/core/src/trezor/messages/CardanoTxCertificateType.py b/core/src/trezor/messages/CardanoTxCertificateType.py index 3af871263..6da24776c 100644 --- a/core/src/trezor/messages/CardanoTxCertificateType.py +++ b/core/src/trezor/messages/CardanoTxCertificateType.py @@ -18,8 +18,8 @@ class CardanoTxCertificateType(p.MessageType): def __init__( self, *, + type: EnumTypeCardanoCertificateType, path: List[int] = None, - type: EnumTypeCardanoCertificateType = None, pool: bytes = None, pool_parameters: CardanoPoolParametersType = None, ) -> None: @@ -31,7 +31,7 @@ class CardanoTxCertificateType(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('type', p.EnumType("CardanoCertificateType", (0, 1, 2, 3)), None), + 1: ('type', p.EnumType("CardanoCertificateType", (0, 1, 2, 3)), p.FLAG_REQUIRED), 2: ('path', p.UVarintType, p.FLAG_REPEATED), 3: ('pool', p.BytesType, None), 4: ('pool_parameters', CardanoPoolParametersType, None), diff --git a/core/src/trezor/messages/CardanoTxInputType.py b/core/src/trezor/messages/CardanoTxInputType.py index ee2e1cc0f..892600b59 100644 --- a/core/src/trezor/messages/CardanoTxInputType.py +++ b/core/src/trezor/messages/CardanoTxInputType.py @@ -15,9 +15,9 @@ class CardanoTxInputType(p.MessageType): def __init__( self, *, + prev_hash: bytes, + prev_index: int, address_n: List[int] = None, - prev_hash: bytes = None, - prev_index: int = None, ) -> None: self.address_n = address_n if address_n is not None else [] self.prev_hash = prev_hash @@ -27,6 +27,6 @@ class CardanoTxInputType(p.MessageType): def get_fields(cls) -> Dict: return { 1: ('address_n', p.UVarintType, p.FLAG_REPEATED), - 2: ('prev_hash', p.BytesType, None), - 3: ('prev_index', p.UVarintType, None), + 2: ('prev_hash', p.BytesType, p.FLAG_REQUIRED), + 3: ('prev_index', p.UVarintType, p.FLAG_REQUIRED), } diff --git a/core/src/trezor/messages/CardanoTxOutputType.py b/core/src/trezor/messages/CardanoTxOutputType.py index af2818eee..e588a2bf8 100644 --- a/core/src/trezor/messages/CardanoTxOutputType.py +++ b/core/src/trezor/messages/CardanoTxOutputType.py @@ -18,21 +18,21 @@ class CardanoTxOutputType(p.MessageType): def __init__( self, *, + amount: int, token_bundle: List[CardanoAssetGroupType] = None, address: str = None, - amount: int = None, address_parameters: CardanoAddressParametersType = None, ) -> None: self.token_bundle = token_bundle if token_bundle is not None else [] - self.address = address self.amount = amount + self.address = address self.address_parameters = address_parameters @classmethod def get_fields(cls) -> Dict: return { 1: ('address', p.UnicodeType, None), - 3: ('amount', p.UVarintType, None), + 3: ('amount', p.UVarintType, p.FLAG_REQUIRED), 4: ('address_parameters', CardanoAddressParametersType, None), 5: ('token_bundle', CardanoAssetGroupType, p.FLAG_REPEATED), } diff --git a/core/src/trezor/messages/CardanoTxWithdrawalType.py b/core/src/trezor/messages/CardanoTxWithdrawalType.py index a5b8a4554..98271e8d4 100644 --- a/core/src/trezor/messages/CardanoTxWithdrawalType.py +++ b/core/src/trezor/messages/CardanoTxWithdrawalType.py @@ -15,8 +15,8 @@ class CardanoTxWithdrawalType(p.MessageType): def __init__( self, *, + amount: int, path: List[int] = None, - amount: int = None, ) -> None: self.path = path if path is not None else [] self.amount = amount @@ -25,5 +25,5 @@ class CardanoTxWithdrawalType(p.MessageType): def get_fields(cls) -> Dict: return { 1: ('path', p.UVarintType, p.FLAG_REPEATED), - 2: ('amount', p.UVarintType, None), + 2: ('amount', p.UVarintType, p.FLAG_REQUIRED), } diff --git a/core/src/trezor/messages/CipherKeyValue.py b/core/src/trezor/messages/CipherKeyValue.py index 9a281188a..6bbde1f13 100644 --- a/core/src/trezor/messages/CipherKeyValue.py +++ b/core/src/trezor/messages/CipherKeyValue.py @@ -16,9 +16,9 @@ class CipherKeyValue(p.MessageType): def __init__( self, *, + key: str, + value: bytes, address_n: List[int] = None, - key: str = None, - value: bytes = None, encrypt: bool = None, ask_on_encrypt: bool = None, ask_on_decrypt: bool = None, @@ -36,8 +36,8 @@ class CipherKeyValue(p.MessageType): def get_fields(cls) -> Dict: return { 1: ('address_n', p.UVarintType, p.FLAG_REPEATED), - 2: ('key', p.UnicodeType, None), - 3: ('value', p.BytesType, None), + 2: ('key', p.UnicodeType, p.FLAG_REQUIRED), + 3: ('value', p.BytesType, p.FLAG_REQUIRED), 4: ('encrypt', p.BoolType, None), 5: ('ask_on_encrypt', p.BoolType, None), 6: ('ask_on_decrypt', p.BoolType, None), diff --git a/core/src/trezor/messages/CipheredKeyValue.py b/core/src/trezor/messages/CipheredKeyValue.py index e2a6edc70..2c5466655 100644 --- a/core/src/trezor/messages/CipheredKeyValue.py +++ b/core/src/trezor/messages/CipheredKeyValue.py @@ -16,12 +16,12 @@ class CipheredKeyValue(p.MessageType): def __init__( self, *, - value: bytes = None, + value: bytes, ) -> None: self.value = value @classmethod def get_fields(cls) -> Dict: return { - 1: ('value', p.BytesType, None), + 1: ('value', p.BytesType, p.FLAG_REQUIRED), } diff --git a/core/src/trezor/messages/ECDHSessionKey.py b/core/src/trezor/messages/ECDHSessionKey.py index 153f1aa66..bb86939c1 100644 --- a/core/src/trezor/messages/ECDHSessionKey.py +++ b/core/src/trezor/messages/ECDHSessionKey.py @@ -16,12 +16,12 @@ class ECDHSessionKey(p.MessageType): def __init__( self, *, - session_key: bytes = None, + session_key: bytes, ) -> None: self.session_key = session_key @classmethod def get_fields(cls) -> Dict: return { - 1: ('session_key', p.BytesType, None), + 1: ('session_key', p.BytesType, p.FLAG_REQUIRED), } diff --git a/core/src/trezor/messages/EosActionUnknown.py b/core/src/trezor/messages/EosActionUnknown.py index fcbf8770b..ac6af7ac6 100644 --- a/core/src/trezor/messages/EosActionUnknown.py +++ b/core/src/trezor/messages/EosActionUnknown.py @@ -15,7 +15,7 @@ class EosActionUnknown(p.MessageType): def __init__( self, *, - data_size: int = None, + data_size: int, data_chunk: bytes = None, ) -> None: self.data_size = data_size @@ -24,6 +24,6 @@ class EosActionUnknown(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('data_size', p.UVarintType, None), + 1: ('data_size', p.UVarintType, p.FLAG_REQUIRED), 2: ('data_chunk', p.BytesType, None), } diff --git a/core/src/trezor/messages/EosAuthorizationKey.py b/core/src/trezor/messages/EosAuthorizationKey.py index e8632bbf3..53833f82f 100644 --- a/core/src/trezor/messages/EosAuthorizationKey.py +++ b/core/src/trezor/messages/EosAuthorizationKey.py @@ -15,21 +15,21 @@ class EosAuthorizationKey(p.MessageType): def __init__( self, *, + type: int, + weight: int, address_n: List[int] = None, - type: int = None, key: bytes = None, - weight: int = None, ) -> None: self.address_n = address_n if address_n is not None else [] self.type = type - self.key = key self.weight = weight + self.key = key @classmethod def get_fields(cls) -> Dict: return { - 1: ('type', p.UVarintType, None), + 1: ('type', p.UVarintType, p.FLAG_REQUIRED), 2: ('key', p.BytesType, None), 3: ('address_n', p.UVarintType, p.FLAG_REPEATED), - 4: ('weight', p.UVarintType, None), + 4: ('weight', p.UVarintType, p.FLAG_REQUIRED), } diff --git a/core/src/trezor/messages/EosPublicKey.py b/core/src/trezor/messages/EosPublicKey.py index 9608dd86b..89217c094 100644 --- a/core/src/trezor/messages/EosPublicKey.py +++ b/core/src/trezor/messages/EosPublicKey.py @@ -16,8 +16,8 @@ class EosPublicKey(p.MessageType): def __init__( self, *, - wif_public_key: str = None, - raw_public_key: bytes = None, + wif_public_key: str, + raw_public_key: bytes, ) -> None: self.wif_public_key = wif_public_key self.raw_public_key = raw_public_key @@ -25,6 +25,6 @@ class EosPublicKey(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('wif_public_key', p.UnicodeType, None), - 2: ('raw_public_key', p.BytesType, None), + 1: ('wif_public_key', p.UnicodeType, p.FLAG_REQUIRED), + 2: ('raw_public_key', p.BytesType, p.FLAG_REQUIRED), } diff --git a/core/src/trezor/messages/EosSignedTx.py b/core/src/trezor/messages/EosSignedTx.py index 14cb91896..815cf1452 100644 --- a/core/src/trezor/messages/EosSignedTx.py +++ b/core/src/trezor/messages/EosSignedTx.py @@ -16,12 +16,12 @@ class EosSignedTx(p.MessageType): def __init__( self, *, - signature: str = None, + signature: str, ) -> None: self.signature = signature @classmethod def get_fields(cls) -> Dict: return { - 1: ('signature', p.UnicodeType, None), + 1: ('signature', p.UnicodeType, p.FLAG_REQUIRED), } diff --git a/core/src/trezor/messages/EthereumMessageSignature.py b/core/src/trezor/messages/EthereumMessageSignature.py index c965f9835..1de4b0544 100644 --- a/core/src/trezor/messages/EthereumMessageSignature.py +++ b/core/src/trezor/messages/EthereumMessageSignature.py @@ -16,8 +16,8 @@ class EthereumMessageSignature(p.MessageType): def __init__( self, *, - signature: bytes = None, - address: str = None, + signature: bytes, + address: str, ) -> None: self.signature = signature self.address = address @@ -25,6 +25,6 @@ class EthereumMessageSignature(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 2: ('signature', p.BytesType, None), - 3: ('address', p.UnicodeType, None), + 2: ('signature', p.BytesType, p.FLAG_REQUIRED), + 3: ('address', p.UnicodeType, p.FLAG_REQUIRED), } diff --git a/core/src/trezor/messages/EthereumPublicKey.py b/core/src/trezor/messages/EthereumPublicKey.py index d632ea79d..55828dda5 100644 --- a/core/src/trezor/messages/EthereumPublicKey.py +++ b/core/src/trezor/messages/EthereumPublicKey.py @@ -18,8 +18,8 @@ class EthereumPublicKey(p.MessageType): def __init__( self, *, - node: HDNodeType = None, - xpub: str = None, + node: HDNodeType, + xpub: str, ) -> None: self.node = node self.xpub = xpub @@ -27,6 +27,6 @@ class EthereumPublicKey(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('node', HDNodeType, None), - 2: ('xpub', p.UnicodeType, None), + 1: ('node', HDNodeType, p.FLAG_REQUIRED), + 2: ('xpub', p.UnicodeType, p.FLAG_REQUIRED), } diff --git a/core/src/trezor/messages/Features.py b/core/src/trezor/messages/Features.py index 8e9f9950d..82aa6f16d 100644 --- a/core/src/trezor/messages/Features.py +++ b/core/src/trezor/messages/Features.py @@ -19,11 +19,11 @@ class Features(p.MessageType): def __init__( self, *, + major_version: int, + minor_version: int, + patch_version: int, capabilities: List[EnumTypeCapability] = None, vendor: str = None, - major_version: int = None, - minor_version: int = None, - patch_version: int = None, bootloader_mode: bool = None, device_id: str = None, pin_protection: bool = None, @@ -59,10 +59,10 @@ class Features(p.MessageType): experimental_features: bool = None, ) -> None: self.capabilities = capabilities if capabilities is not None else [] - self.vendor = vendor self.major_version = major_version self.minor_version = minor_version self.patch_version = patch_version + self.vendor = vendor self.bootloader_mode = bootloader_mode self.device_id = device_id self.pin_protection = pin_protection @@ -101,9 +101,9 @@ class Features(p.MessageType): def get_fields(cls) -> Dict: return { 1: ('vendor', p.UnicodeType, None), - 2: ('major_version', p.UVarintType, None), - 3: ('minor_version', p.UVarintType, None), - 4: ('patch_version', p.UVarintType, None), + 2: ('major_version', p.UVarintType, p.FLAG_REQUIRED), + 3: ('minor_version', p.UVarintType, p.FLAG_REQUIRED), + 4: ('patch_version', p.UVarintType, p.FLAG_REQUIRED), 5: ('bootloader_mode', p.BoolType, None), 6: ('device_id', p.UnicodeType, None), 7: ('pin_protection', p.BoolType, None), diff --git a/core/src/trezor/messages/GetECDHSessionKey.py b/core/src/trezor/messages/GetECDHSessionKey.py index 0fc696718..ed5e95059 100644 --- a/core/src/trezor/messages/GetECDHSessionKey.py +++ b/core/src/trezor/messages/GetECDHSessionKey.py @@ -18,8 +18,8 @@ class GetECDHSessionKey(p.MessageType): def __init__( self, *, - identity: IdentityType = None, - peer_public_key: bytes = None, + identity: IdentityType, + peer_public_key: bytes, ecdsa_curve_name: str = None, ) -> None: self.identity = identity @@ -29,7 +29,7 @@ class GetECDHSessionKey(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('identity', IdentityType, None), - 2: ('peer_public_key', p.BytesType, None), + 1: ('identity', IdentityType, p.FLAG_REQUIRED), + 2: ('peer_public_key', p.BytesType, p.FLAG_REQUIRED), 3: ('ecdsa_curve_name', p.UnicodeType, None), } diff --git a/core/src/trezor/messages/LiskAddress.py b/core/src/trezor/messages/LiskAddress.py index bec470045..a0e0684e9 100644 --- a/core/src/trezor/messages/LiskAddress.py +++ b/core/src/trezor/messages/LiskAddress.py @@ -16,12 +16,12 @@ class LiskAddress(p.MessageType): def __init__( self, *, - address: str = None, + address: str, ) -> None: self.address = address @classmethod def get_fields(cls) -> Dict: return { - 1: ('address', p.UnicodeType, None), + 1: ('address', p.UnicodeType, p.FLAG_REQUIRED), } diff --git a/core/src/trezor/messages/LiskMessageSignature.py b/core/src/trezor/messages/LiskMessageSignature.py index ead5a00ab..2daff6b73 100644 --- a/core/src/trezor/messages/LiskMessageSignature.py +++ b/core/src/trezor/messages/LiskMessageSignature.py @@ -16,8 +16,8 @@ class LiskMessageSignature(p.MessageType): def __init__( self, *, - public_key: bytes = None, - signature: bytes = None, + public_key: bytes, + signature: bytes, ) -> None: self.public_key = public_key self.signature = signature @@ -25,6 +25,6 @@ class LiskMessageSignature(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('public_key', p.BytesType, None), - 2: ('signature', p.BytesType, None), + 1: ('public_key', p.BytesType, p.FLAG_REQUIRED), + 2: ('signature', p.BytesType, p.FLAG_REQUIRED), } diff --git a/core/src/trezor/messages/LiskPublicKey.py b/core/src/trezor/messages/LiskPublicKey.py index fb1695bbe..d8ac90aae 100644 --- a/core/src/trezor/messages/LiskPublicKey.py +++ b/core/src/trezor/messages/LiskPublicKey.py @@ -16,12 +16,12 @@ class LiskPublicKey(p.MessageType): def __init__( self, *, - public_key: bytes = None, + public_key: bytes, ) -> None: self.public_key = public_key @classmethod def get_fields(cls) -> Dict: return { - 1: ('public_key', p.BytesType, None), + 1: ('public_key', p.BytesType, p.FLAG_REQUIRED), } diff --git a/core/src/trezor/messages/LiskSignMessage.py b/core/src/trezor/messages/LiskSignMessage.py index 6c0a7bae9..d00fab484 100644 --- a/core/src/trezor/messages/LiskSignMessage.py +++ b/core/src/trezor/messages/LiskSignMessage.py @@ -16,8 +16,8 @@ class LiskSignMessage(p.MessageType): def __init__( self, *, + message: bytes, address_n: List[int] = None, - message: bytes = None, ) -> None: self.address_n = address_n if address_n is not None else [] self.message = message @@ -26,5 +26,5 @@ class LiskSignMessage(p.MessageType): def get_fields(cls) -> Dict: return { 1: ('address_n', p.UVarintType, p.FLAG_REPEATED), - 2: ('message', p.BytesType, None), + 2: ('message', p.BytesType, p.FLAG_REQUIRED), } diff --git a/core/src/trezor/messages/LiskSignTx.py b/core/src/trezor/messages/LiskSignTx.py index 11545ee19..01a69ac0b 100644 --- a/core/src/trezor/messages/LiskSignTx.py +++ b/core/src/trezor/messages/LiskSignTx.py @@ -18,8 +18,8 @@ class LiskSignTx(p.MessageType): def __init__( self, *, + transaction: LiskTransactionCommon, address_n: List[int] = None, - transaction: LiskTransactionCommon = None, ) -> None: self.address_n = address_n if address_n is not None else [] self.transaction = transaction @@ -28,5 +28,5 @@ class LiskSignTx(p.MessageType): def get_fields(cls) -> Dict: return { 1: ('address_n', p.UVarintType, p.FLAG_REPEATED), - 2: ('transaction', LiskTransactionCommon, None), + 2: ('transaction', LiskTransactionCommon, p.FLAG_REQUIRED), } diff --git a/core/src/trezor/messages/LiskSignedTx.py b/core/src/trezor/messages/LiskSignedTx.py index 45bbb836e..c0956b3a5 100644 --- a/core/src/trezor/messages/LiskSignedTx.py +++ b/core/src/trezor/messages/LiskSignedTx.py @@ -16,12 +16,12 @@ class LiskSignedTx(p.MessageType): def __init__( self, *, - signature: bytes = None, + signature: bytes, ) -> None: self.signature = signature @classmethod def get_fields(cls) -> Dict: return { - 1: ('signature', p.BytesType, None), + 1: ('signature', p.BytesType, p.FLAG_REQUIRED), } diff --git a/core/src/trezor/messages/LiskVerifyMessage.py b/core/src/trezor/messages/LiskVerifyMessage.py index 1b91c9d4e..c69e41faf 100644 --- a/core/src/trezor/messages/LiskVerifyMessage.py +++ b/core/src/trezor/messages/LiskVerifyMessage.py @@ -16,9 +16,9 @@ class LiskVerifyMessage(p.MessageType): def __init__( self, *, - public_key: bytes = None, - signature: bytes = None, - message: bytes = None, + public_key: bytes, + signature: bytes, + message: bytes, ) -> None: self.public_key = public_key self.signature = signature @@ -27,7 +27,7 @@ class LiskVerifyMessage(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('public_key', p.BytesType, None), - 2: ('signature', p.BytesType, None), - 3: ('message', p.BytesType, None), + 1: ('public_key', p.BytesType, p.FLAG_REQUIRED), + 2: ('signature', p.BytesType, p.FLAG_REQUIRED), + 3: ('message', p.BytesType, p.FLAG_REQUIRED), } diff --git a/core/src/trezor/messages/MessageSignature.py b/core/src/trezor/messages/MessageSignature.py index 9fde379b7..8fc3643cb 100644 --- a/core/src/trezor/messages/MessageSignature.py +++ b/core/src/trezor/messages/MessageSignature.py @@ -16,8 +16,8 @@ class MessageSignature(p.MessageType): def __init__( self, *, - address: str = None, - signature: bytes = None, + address: str, + signature: bytes, ) -> None: self.address = address self.signature = signature @@ -25,6 +25,6 @@ class MessageSignature(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('address', p.UnicodeType, None), - 2: ('signature', p.BytesType, None), + 1: ('address', p.UnicodeType, p.FLAG_REQUIRED), + 2: ('signature', p.BytesType, p.FLAG_REQUIRED), } diff --git a/core/src/trezor/messages/NEMSignedTx.py b/core/src/trezor/messages/NEMSignedTx.py index f9de268e5..c242db0d8 100644 --- a/core/src/trezor/messages/NEMSignedTx.py +++ b/core/src/trezor/messages/NEMSignedTx.py @@ -16,8 +16,8 @@ class NEMSignedTx(p.MessageType): def __init__( self, *, - data: bytes = None, - signature: bytes = None, + data: bytes, + signature: bytes, ) -> None: self.data = data self.signature = signature @@ -25,6 +25,6 @@ class NEMSignedTx(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('data', p.BytesType, None), - 2: ('signature', p.BytesType, None), + 1: ('data', p.BytesType, p.FLAG_REQUIRED), + 2: ('signature', p.BytesType, p.FLAG_REQUIRED), } diff --git a/core/src/trezor/messages/Ping.py b/core/src/trezor/messages/Ping.py index 1eea229dc..b087488a8 100644 --- a/core/src/trezor/messages/Ping.py +++ b/core/src/trezor/messages/Ping.py @@ -16,7 +16,7 @@ class Ping(p.MessageType): def __init__( self, *, - message: str = None, + message: str = "", button_protection: bool = None, ) -> None: self.message = message @@ -25,6 +25,6 @@ class Ping(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('message', p.UnicodeType, None), + 1: ('message', p.UnicodeType, ""), # default= 2: ('button_protection', p.BoolType, None), } diff --git a/core/src/trezor/messages/PublicKey.py b/core/src/trezor/messages/PublicKey.py index 05387cac8..d093f12dc 100644 --- a/core/src/trezor/messages/PublicKey.py +++ b/core/src/trezor/messages/PublicKey.py @@ -18,8 +18,8 @@ class PublicKey(p.MessageType): def __init__( self, *, - node: HDNodeType = None, - xpub: str = None, + node: HDNodeType, + xpub: str, root_fingerprint: int = None, ) -> None: self.node = node @@ -29,7 +29,7 @@ class PublicKey(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('node', HDNodeType, None), - 2: ('xpub', p.UnicodeType, None), + 1: ('node', HDNodeType, p.FLAG_REQUIRED), + 2: ('xpub', p.UnicodeType, p.FLAG_REQUIRED), 3: ('root_fingerprint', p.UVarintType, None), } diff --git a/core/src/trezor/messages/RippleAddress.py b/core/src/trezor/messages/RippleAddress.py index 833daadff..798c78402 100644 --- a/core/src/trezor/messages/RippleAddress.py +++ b/core/src/trezor/messages/RippleAddress.py @@ -16,12 +16,12 @@ class RippleAddress(p.MessageType): def __init__( self, *, - address: str = None, + address: str, ) -> None: self.address = address @classmethod def get_fields(cls) -> Dict: return { - 1: ('address', p.UnicodeType, None), + 1: ('address', p.UnicodeType, p.FLAG_REQUIRED), } diff --git a/core/src/trezor/messages/RipplePayment.py b/core/src/trezor/messages/RipplePayment.py index 9e7675da0..a8890ee5e 100644 --- a/core/src/trezor/messages/RipplePayment.py +++ b/core/src/trezor/messages/RipplePayment.py @@ -15,8 +15,8 @@ class RipplePayment(p.MessageType): def __init__( self, *, - amount: int = None, - destination: str = None, + amount: int, + destination: str, destination_tag: int = None, ) -> None: self.amount = amount @@ -26,7 +26,7 @@ class RipplePayment(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('amount', p.UVarintType, None), - 2: ('destination', p.UnicodeType, None), + 1: ('amount', p.UVarintType, p.FLAG_REQUIRED), + 2: ('destination', p.UnicodeType, p.FLAG_REQUIRED), 3: ('destination_tag', p.UVarintType, None), } diff --git a/core/src/trezor/messages/RippleSignedTx.py b/core/src/trezor/messages/RippleSignedTx.py index 78c807f9f..8534b1e1c 100644 --- a/core/src/trezor/messages/RippleSignedTx.py +++ b/core/src/trezor/messages/RippleSignedTx.py @@ -16,8 +16,8 @@ class RippleSignedTx(p.MessageType): def __init__( self, *, - signature: bytes = None, - serialized_tx: bytes = None, + signature: bytes, + serialized_tx: bytes, ) -> None: self.signature = signature self.serialized_tx = serialized_tx @@ -25,6 +25,6 @@ class RippleSignedTx(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('signature', p.BytesType, None), - 2: ('serialized_tx', p.BytesType, None), + 1: ('signature', p.BytesType, p.FLAG_REQUIRED), + 2: ('serialized_tx', p.BytesType, p.FLAG_REQUIRED), } diff --git a/core/src/trezor/messages/SignIdentity.py b/core/src/trezor/messages/SignIdentity.py index 5a8d4cfed..95b4d352d 100644 --- a/core/src/trezor/messages/SignIdentity.py +++ b/core/src/trezor/messages/SignIdentity.py @@ -18,9 +18,9 @@ class SignIdentity(p.MessageType): def __init__( self, *, - identity: IdentityType = None, - challenge_hidden: bytes = None, - challenge_visual: str = None, + identity: IdentityType, + challenge_hidden: bytes = b"", + challenge_visual: str = "", ecdsa_curve_name: str = None, ) -> None: self.identity = identity @@ -31,8 +31,8 @@ class SignIdentity(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('identity', IdentityType, None), - 2: ('challenge_hidden', p.BytesType, None), - 3: ('challenge_visual', p.UnicodeType, None), + 1: ('identity', IdentityType, p.FLAG_REQUIRED), + 2: ('challenge_hidden', p.BytesType, b""), # default= + 3: ('challenge_visual', p.UnicodeType, ""), # default= 4: ('ecdsa_curve_name', p.UnicodeType, None), } diff --git a/core/src/trezor/messages/SignedIdentity.py b/core/src/trezor/messages/SignedIdentity.py index 05098b511..6ad53c091 100644 --- a/core/src/trezor/messages/SignedIdentity.py +++ b/core/src/trezor/messages/SignedIdentity.py @@ -16,18 +16,18 @@ class SignedIdentity(p.MessageType): def __init__( self, *, + public_key: bytes, + signature: bytes, address: str = None, - public_key: bytes = None, - signature: bytes = None, ) -> None: - self.address = address self.public_key = public_key self.signature = signature + self.address = address @classmethod def get_fields(cls) -> Dict: return { 1: ('address', p.UnicodeType, None), - 2: ('public_key', p.BytesType, None), - 3: ('signature', p.BytesType, None), + 2: ('public_key', p.BytesType, p.FLAG_REQUIRED), + 3: ('signature', p.BytesType, p.FLAG_REQUIRED), } diff --git a/core/src/trezor/messages/StellarAddress.py b/core/src/trezor/messages/StellarAddress.py index 908090529..47f756fcb 100644 --- a/core/src/trezor/messages/StellarAddress.py +++ b/core/src/trezor/messages/StellarAddress.py @@ -16,12 +16,12 @@ class StellarAddress(p.MessageType): def __init__( self, *, - address: str = None, + address: str, ) -> None: self.address = address @classmethod def get_fields(cls) -> Dict: return { - 1: ('address', p.UnicodeType, None), + 1: ('address', p.UnicodeType, p.FLAG_REQUIRED), } diff --git a/core/src/trezor/messages/StellarAssetType.py b/core/src/trezor/messages/StellarAssetType.py index dca1afcc2..0a2046835 100644 --- a/core/src/trezor/messages/StellarAssetType.py +++ b/core/src/trezor/messages/StellarAssetType.py @@ -15,7 +15,7 @@ class StellarAssetType(p.MessageType): def __init__( self, *, - type: int = None, + type: int, code: str = None, issuer: str = None, ) -> None: @@ -26,7 +26,7 @@ class StellarAssetType(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('type', p.UVarintType, None), + 1: ('type', p.UVarintType, p.FLAG_REQUIRED), 2: ('code', p.UnicodeType, None), 3: ('issuer', p.UnicodeType, None), } diff --git a/core/src/trezor/messages/StellarSignedTx.py b/core/src/trezor/messages/StellarSignedTx.py index f77a63eba..d089a2cba 100644 --- a/core/src/trezor/messages/StellarSignedTx.py +++ b/core/src/trezor/messages/StellarSignedTx.py @@ -16,8 +16,8 @@ class StellarSignedTx(p.MessageType): def __init__( self, *, - public_key: bytes = None, - signature: bytes = None, + public_key: bytes, + signature: bytes, ) -> None: self.public_key = public_key self.signature = signature @@ -25,6 +25,6 @@ class StellarSignedTx(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('public_key', p.BytesType, None), - 2: ('signature', p.BytesType, None), + 1: ('public_key', p.BytesType, p.FLAG_REQUIRED), + 2: ('signature', p.BytesType, p.FLAG_REQUIRED), } diff --git a/core/src/trezor/messages/Success.py b/core/src/trezor/messages/Success.py index 8692b013d..b8632fd88 100644 --- a/core/src/trezor/messages/Success.py +++ b/core/src/trezor/messages/Success.py @@ -16,12 +16,12 @@ class Success(p.MessageType): def __init__( self, *, - message: str = None, + message: str = "", ) -> None: self.message = message @classmethod def get_fields(cls) -> Dict: return { - 1: ('message', p.UnicodeType, None), + 1: ('message', p.UnicodeType, ""), # default= } diff --git a/core/src/trezor/messages/TezosAddress.py b/core/src/trezor/messages/TezosAddress.py index fda7fa22f..a87807be9 100644 --- a/core/src/trezor/messages/TezosAddress.py +++ b/core/src/trezor/messages/TezosAddress.py @@ -16,12 +16,12 @@ class TezosAddress(p.MessageType): def __init__( self, *, - address: str = None, + address: str, ) -> None: self.address = address @classmethod def get_fields(cls) -> Dict: return { - 1: ('address', p.UnicodeType, None), + 1: ('address', p.UnicodeType, p.FLAG_REQUIRED), } diff --git a/core/src/trezor/messages/TezosContractID.py b/core/src/trezor/messages/TezosContractID.py index b531ec631..39d512324 100644 --- a/core/src/trezor/messages/TezosContractID.py +++ b/core/src/trezor/messages/TezosContractID.py @@ -16,8 +16,8 @@ class TezosContractID(p.MessageType): def __init__( self, *, - tag: EnumTypeTezosContractType = None, - hash: bytes = None, + tag: EnumTypeTezosContractType, + hash: bytes, ) -> None: self.tag = tag self.hash = hash @@ -25,6 +25,6 @@ class TezosContractID(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('tag', p.EnumType("TezosContractType", (0, 1)), None), - 2: ('hash', p.BytesType, None), + 1: ('tag', p.EnumType("TezosContractType", (0, 1)), p.FLAG_REQUIRED), + 2: ('hash', p.BytesType, p.FLAG_REQUIRED), } diff --git a/core/src/trezor/messages/TezosDelegationOp.py b/core/src/trezor/messages/TezosDelegationOp.py index 9fd725a8d..6b96990d6 100644 --- a/core/src/trezor/messages/TezosDelegationOp.py +++ b/core/src/trezor/messages/TezosDelegationOp.py @@ -15,12 +15,12 @@ class TezosDelegationOp(p.MessageType): def __init__( self, *, - source: bytes = None, - fee: int = None, - counter: int = None, - gas_limit: int = None, - storage_limit: int = None, - delegate: bytes = None, + source: bytes, + fee: int, + counter: int, + gas_limit: int, + storage_limit: int, + delegate: bytes, ) -> None: self.source = source self.fee = fee @@ -32,10 +32,10 @@ class TezosDelegationOp(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 7: ('source', p.BytesType, None), - 2: ('fee', p.UVarintType, None), - 3: ('counter', p.UVarintType, None), - 4: ('gas_limit', p.UVarintType, None), - 5: ('storage_limit', p.UVarintType, None), - 6: ('delegate', p.BytesType, None), + 7: ('source', p.BytesType, p.FLAG_REQUIRED), + 2: ('fee', p.UVarintType, p.FLAG_REQUIRED), + 3: ('counter', p.UVarintType, p.FLAG_REQUIRED), + 4: ('gas_limit', p.UVarintType, p.FLAG_REQUIRED), + 5: ('storage_limit', p.UVarintType, p.FLAG_REQUIRED), + 6: ('delegate', p.BytesType, p.FLAG_REQUIRED), } diff --git a/core/src/trezor/messages/TezosOriginationOp.py b/core/src/trezor/messages/TezosOriginationOp.py index 01dbebafd..163ace15a 100644 --- a/core/src/trezor/messages/TezosOriginationOp.py +++ b/core/src/trezor/messages/TezosOriginationOp.py @@ -15,42 +15,42 @@ class TezosOriginationOp(p.MessageType): def __init__( self, *, - source: bytes = None, - fee: int = None, - counter: int = None, - gas_limit: int = None, - storage_limit: int = None, + source: bytes, + fee: int, + counter: int, + gas_limit: int, + storage_limit: int, + balance: int, + script: bytes, manager_pubkey: bytes = None, - balance: int = None, spendable: bool = None, delegatable: bool = None, delegate: bytes = None, - script: bytes = None, ) -> None: self.source = source self.fee = fee self.counter = counter self.gas_limit = gas_limit self.storage_limit = storage_limit - self.manager_pubkey = manager_pubkey self.balance = balance + self.script = script + self.manager_pubkey = manager_pubkey self.spendable = spendable self.delegatable = delegatable self.delegate = delegate - self.script = script @classmethod def get_fields(cls) -> Dict: return { - 12: ('source', p.BytesType, None), - 2: ('fee', p.UVarintType, None), - 3: ('counter', p.UVarintType, None), - 4: ('gas_limit', p.UVarintType, None), - 5: ('storage_limit', p.UVarintType, None), + 12: ('source', p.BytesType, p.FLAG_REQUIRED), + 2: ('fee', p.UVarintType, p.FLAG_REQUIRED), + 3: ('counter', p.UVarintType, p.FLAG_REQUIRED), + 4: ('gas_limit', p.UVarintType, p.FLAG_REQUIRED), + 5: ('storage_limit', p.UVarintType, p.FLAG_REQUIRED), 6: ('manager_pubkey', p.BytesType, None), - 7: ('balance', p.UVarintType, None), + 7: ('balance', p.UVarintType, p.FLAG_REQUIRED), 8: ('spendable', p.BoolType, None), 9: ('delegatable', p.BoolType, None), 10: ('delegate', p.BytesType, None), - 11: ('script', p.BytesType, None), + 11: ('script', p.BytesType, p.FLAG_REQUIRED), } diff --git a/core/src/trezor/messages/TezosPublicKey.py b/core/src/trezor/messages/TezosPublicKey.py index 1afb9aeea..29062176f 100644 --- a/core/src/trezor/messages/TezosPublicKey.py +++ b/core/src/trezor/messages/TezosPublicKey.py @@ -16,12 +16,12 @@ class TezosPublicKey(p.MessageType): def __init__( self, *, - public_key: str = None, + public_key: str, ) -> None: self.public_key = public_key @classmethod def get_fields(cls) -> Dict: return { - 1: ('public_key', p.UnicodeType, None), + 1: ('public_key', p.UnicodeType, p.FLAG_REQUIRED), } diff --git a/core/src/trezor/messages/TezosRevealOp.py b/core/src/trezor/messages/TezosRevealOp.py index d00762a82..89f9c0053 100644 --- a/core/src/trezor/messages/TezosRevealOp.py +++ b/core/src/trezor/messages/TezosRevealOp.py @@ -15,12 +15,12 @@ class TezosRevealOp(p.MessageType): def __init__( self, *, - source: bytes = None, - fee: int = None, - counter: int = None, - gas_limit: int = None, - storage_limit: int = None, - public_key: bytes = None, + source: bytes, + fee: int, + counter: int, + gas_limit: int, + storage_limit: int, + public_key: bytes, ) -> None: self.source = source self.fee = fee @@ -32,10 +32,10 @@ class TezosRevealOp(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 7: ('source', p.BytesType, None), - 2: ('fee', p.UVarintType, None), - 3: ('counter', p.UVarintType, None), - 4: ('gas_limit', p.UVarintType, None), - 5: ('storage_limit', p.UVarintType, None), - 6: ('public_key', p.BytesType, None), + 7: ('source', p.BytesType, p.FLAG_REQUIRED), + 2: ('fee', p.UVarintType, p.FLAG_REQUIRED), + 3: ('counter', p.UVarintType, p.FLAG_REQUIRED), + 4: ('gas_limit', p.UVarintType, p.FLAG_REQUIRED), + 5: ('storage_limit', p.UVarintType, p.FLAG_REQUIRED), + 6: ('public_key', p.BytesType, p.FLAG_REQUIRED), } diff --git a/core/src/trezor/messages/TezosSignTx.py b/core/src/trezor/messages/TezosSignTx.py index bc95d8a0f..6aaa143b9 100644 --- a/core/src/trezor/messages/TezosSignTx.py +++ b/core/src/trezor/messages/TezosSignTx.py @@ -23,8 +23,8 @@ class TezosSignTx(p.MessageType): def __init__( self, *, + branch: bytes, address_n: List[int] = None, - branch: bytes = None, reveal: TezosRevealOp = None, transaction: TezosTransactionOp = None, origination: TezosOriginationOp = None, @@ -45,7 +45,7 @@ class TezosSignTx(p.MessageType): def get_fields(cls) -> Dict: return { 1: ('address_n', p.UVarintType, p.FLAG_REPEATED), - 2: ('branch', p.BytesType, None), + 2: ('branch', p.BytesType, p.FLAG_REQUIRED), 3: ('reveal', TezosRevealOp, None), 4: ('transaction', TezosTransactionOp, None), 5: ('origination', TezosOriginationOp, None), diff --git a/core/src/trezor/messages/TezosSignedTx.py b/core/src/trezor/messages/TezosSignedTx.py index 036cd6197..5ccaa0f8d 100644 --- a/core/src/trezor/messages/TezosSignedTx.py +++ b/core/src/trezor/messages/TezosSignedTx.py @@ -16,9 +16,9 @@ class TezosSignedTx(p.MessageType): def __init__( self, *, - signature: str = None, - sig_op_contents: bytes = None, - operation_hash: str = None, + signature: str, + sig_op_contents: bytes, + operation_hash: str, ) -> None: self.signature = signature self.sig_op_contents = sig_op_contents @@ -27,7 +27,7 @@ class TezosSignedTx(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('signature', p.UnicodeType, None), - 2: ('sig_op_contents', p.BytesType, None), - 3: ('operation_hash', p.UnicodeType, None), + 1: ('signature', p.UnicodeType, p.FLAG_REQUIRED), + 2: ('sig_op_contents', p.BytesType, p.FLAG_REQUIRED), + 3: ('operation_hash', p.UnicodeType, p.FLAG_REQUIRED), } diff --git a/core/src/trezor/messages/TezosTransactionOp.py b/core/src/trezor/messages/TezosTransactionOp.py index 98612cd09..f91b9823b 100644 --- a/core/src/trezor/messages/TezosTransactionOp.py +++ b/core/src/trezor/messages/TezosTransactionOp.py @@ -18,13 +18,13 @@ class TezosTransactionOp(p.MessageType): def __init__( self, *, - source: bytes = None, - fee: int = None, - counter: int = None, - gas_limit: int = None, - storage_limit: int = None, - amount: int = None, - destination: TezosContractID = None, + source: bytes, + fee: int, + counter: int, + gas_limit: int, + storage_limit: int, + amount: int, + destination: TezosContractID, parameters: bytes = None, parameters_manager: TezosParametersManager = None, ) -> None: @@ -41,13 +41,13 @@ class TezosTransactionOp(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 9: ('source', p.BytesType, None), - 2: ('fee', p.UVarintType, None), - 3: ('counter', p.UVarintType, None), - 4: ('gas_limit', p.UVarintType, None), - 5: ('storage_limit', p.UVarintType, None), - 6: ('amount', p.UVarintType, None), - 7: ('destination', TezosContractID, None), + 9: ('source', p.BytesType, p.FLAG_REQUIRED), + 2: ('fee', p.UVarintType, p.FLAG_REQUIRED), + 3: ('counter', p.UVarintType, p.FLAG_REQUIRED), + 4: ('gas_limit', p.UVarintType, p.FLAG_REQUIRED), + 5: ('storage_limit', p.UVarintType, p.FLAG_REQUIRED), + 6: ('amount', p.UVarintType, p.FLAG_REQUIRED), + 7: ('destination', TezosContractID, p.FLAG_REQUIRED), 8: ('parameters', p.BytesType, None), 10: ('parameters_manager', TezosParametersManager, None), } diff --git a/python/src/trezorlib/messages/BinanceAddress.py b/python/src/trezorlib/messages/BinanceAddress.py index 5bca344e2..3f2108cf5 100644 --- a/python/src/trezorlib/messages/BinanceAddress.py +++ b/python/src/trezorlib/messages/BinanceAddress.py @@ -16,12 +16,12 @@ class BinanceAddress(p.MessageType): def __init__( self, *, - address: str = None, + address: str, ) -> None: self.address = address @classmethod def get_fields(cls) -> Dict: return { - 1: ('address', p.UnicodeType, None), + 1: ('address', p.UnicodeType, p.FLAG_REQUIRED), } diff --git a/python/src/trezorlib/messages/BinancePublicKey.py b/python/src/trezorlib/messages/BinancePublicKey.py index 5009374c3..48d9dff13 100644 --- a/python/src/trezorlib/messages/BinancePublicKey.py +++ b/python/src/trezorlib/messages/BinancePublicKey.py @@ -16,12 +16,12 @@ class BinancePublicKey(p.MessageType): def __init__( self, *, - public_key: bytes = None, + public_key: bytes, ) -> None: self.public_key = public_key @classmethod def get_fields(cls) -> Dict: return { - 1: ('public_key', p.BytesType, None), + 1: ('public_key', p.BytesType, p.FLAG_REQUIRED), } diff --git a/python/src/trezorlib/messages/BinanceSignedTx.py b/python/src/trezorlib/messages/BinanceSignedTx.py index 846f7aca8..f236c6dc6 100644 --- a/python/src/trezorlib/messages/BinanceSignedTx.py +++ b/python/src/trezorlib/messages/BinanceSignedTx.py @@ -16,8 +16,8 @@ class BinanceSignedTx(p.MessageType): def __init__( self, *, - signature: bytes = None, - public_key: bytes = None, + signature: bytes, + public_key: bytes, ) -> None: self.signature = signature self.public_key = public_key @@ -25,6 +25,6 @@ class BinanceSignedTx(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('signature', p.BytesType, None), - 2: ('public_key', p.BytesType, None), + 1: ('signature', p.BytesType, p.FLAG_REQUIRED), + 2: ('public_key', p.BytesType, p.FLAG_REQUIRED), } diff --git a/python/src/trezorlib/messages/CardanoAddress.py b/python/src/trezorlib/messages/CardanoAddress.py index 56defb88c..52e96c52f 100644 --- a/python/src/trezorlib/messages/CardanoAddress.py +++ b/python/src/trezorlib/messages/CardanoAddress.py @@ -16,12 +16,12 @@ class CardanoAddress(p.MessageType): def __init__( self, *, - address: str = None, + address: str, ) -> None: self.address = address @classmethod def get_fields(cls) -> Dict: return { - 1: ('address', p.UnicodeType, None), + 1: ('address', p.UnicodeType, p.FLAG_REQUIRED), } diff --git a/python/src/trezorlib/messages/CardanoAddressParametersType.py b/python/src/trezorlib/messages/CardanoAddressParametersType.py index 62fbb22b4..3261ed03a 100644 --- a/python/src/trezorlib/messages/CardanoAddressParametersType.py +++ b/python/src/trezorlib/messages/CardanoAddressParametersType.py @@ -18,9 +18,9 @@ class CardanoAddressParametersType(p.MessageType): def __init__( self, *, + address_type: EnumTypeCardanoAddressType, address_n: List[int] = None, address_n_staking: List[int] = None, - address_type: EnumTypeCardanoAddressType = None, staking_key_hash: bytes = None, certificate_pointer: CardanoBlockchainPointerType = None, ) -> None: @@ -33,7 +33,7 @@ class CardanoAddressParametersType(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('address_type', p.EnumType("CardanoAddressType", (0, 1, 2, 3, 4, 5, 6, 7, 8, 14, 15)), None), + 1: ('address_type', p.EnumType("CardanoAddressType", (0, 1, 2, 3, 4, 5, 6, 7, 8, 14, 15)), p.FLAG_REQUIRED), 2: ('address_n', p.UVarintType, p.FLAG_REPEATED), 3: ('address_n_staking', p.UVarintType, p.FLAG_REPEATED), 4: ('staking_key_hash', p.BytesType, None), diff --git a/python/src/trezorlib/messages/CardanoBlockchainPointerType.py b/python/src/trezorlib/messages/CardanoBlockchainPointerType.py index 721646f12..908a98ee9 100644 --- a/python/src/trezorlib/messages/CardanoBlockchainPointerType.py +++ b/python/src/trezorlib/messages/CardanoBlockchainPointerType.py @@ -15,9 +15,9 @@ class CardanoBlockchainPointerType(p.MessageType): def __init__( self, *, - block_index: int = None, - tx_index: int = None, - certificate_index: int = None, + block_index: int, + tx_index: int, + certificate_index: int, ) -> None: self.block_index = block_index self.tx_index = tx_index @@ -26,7 +26,7 @@ class CardanoBlockchainPointerType(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('block_index', p.UVarintType, None), - 2: ('tx_index', p.UVarintType, None), - 3: ('certificate_index', p.UVarintType, None), + 1: ('block_index', p.UVarintType, p.FLAG_REQUIRED), + 2: ('tx_index', p.UVarintType, p.FLAG_REQUIRED), + 3: ('certificate_index', p.UVarintType, p.FLAG_REQUIRED), } diff --git a/python/src/trezorlib/messages/CardanoGetAddress.py b/python/src/trezorlib/messages/CardanoGetAddress.py index 0c0192ea8..273ec68ce 100644 --- a/python/src/trezorlib/messages/CardanoGetAddress.py +++ b/python/src/trezorlib/messages/CardanoGetAddress.py @@ -18,21 +18,21 @@ class CardanoGetAddress(p.MessageType): def __init__( self, *, - show_display: bool = None, - protocol_magic: int = None, - network_id: int = None, - address_parameters: CardanoAddressParametersType = None, + protocol_magic: int, + network_id: int, + address_parameters: CardanoAddressParametersType, + show_display: bool = False, ) -> None: - self.show_display = show_display self.protocol_magic = protocol_magic self.network_id = network_id self.address_parameters = address_parameters + self.show_display = show_display @classmethod def get_fields(cls) -> Dict: return { - 2: ('show_display', p.BoolType, None), - 3: ('protocol_magic', p.UVarintType, None), - 4: ('network_id', p.UVarintType, None), - 5: ('address_parameters', CardanoAddressParametersType, None), + 2: ('show_display', p.BoolType, False), # default=false + 3: ('protocol_magic', p.UVarintType, p.FLAG_REQUIRED), + 4: ('network_id', p.UVarintType, p.FLAG_REQUIRED), + 5: ('address_parameters', CardanoAddressParametersType, p.FLAG_REQUIRED), } diff --git a/python/src/trezorlib/messages/CardanoPublicKey.py b/python/src/trezorlib/messages/CardanoPublicKey.py index bc908adb4..d0f12b31b 100644 --- a/python/src/trezorlib/messages/CardanoPublicKey.py +++ b/python/src/trezorlib/messages/CardanoPublicKey.py @@ -18,8 +18,8 @@ class CardanoPublicKey(p.MessageType): def __init__( self, *, - xpub: str = None, - node: HDNodeType = None, + xpub: str, + node: HDNodeType, ) -> None: self.xpub = xpub self.node = node @@ -27,6 +27,6 @@ class CardanoPublicKey(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('xpub', p.UnicodeType, None), - 2: ('node', HDNodeType, None), + 1: ('xpub', p.UnicodeType, p.FLAG_REQUIRED), + 2: ('node', HDNodeType, p.FLAG_REQUIRED), } diff --git a/python/src/trezorlib/messages/CardanoSignTx.py b/python/src/trezorlib/messages/CardanoSignTx.py index 2c6fb5a98..a82fb78b8 100644 --- a/python/src/trezorlib/messages/CardanoSignTx.py +++ b/python/src/trezorlib/messages/CardanoSignTx.py @@ -21,14 +21,14 @@ class CardanoSignTx(p.MessageType): def __init__( self, *, + protocol_magic: int, + fee: int, + network_id: int, inputs: List[CardanoTxInputType] = None, outputs: List[CardanoTxOutputType] = None, certificates: List[CardanoTxCertificateType] = None, withdrawals: List[CardanoTxWithdrawalType] = None, - protocol_magic: int = None, - fee: int = None, ttl: int = None, - network_id: int = None, metadata: bytes = None, validity_interval_start: int = None, ) -> None: @@ -38,8 +38,8 @@ class CardanoSignTx(p.MessageType): self.withdrawals = withdrawals if withdrawals is not None else [] self.protocol_magic = protocol_magic self.fee = fee - self.ttl = ttl self.network_id = network_id + self.ttl = ttl self.metadata = metadata self.validity_interval_start = validity_interval_start @@ -48,10 +48,10 @@ class CardanoSignTx(p.MessageType): return { 1: ('inputs', CardanoTxInputType, p.FLAG_REPEATED), 2: ('outputs', CardanoTxOutputType, p.FLAG_REPEATED), - 5: ('protocol_magic', p.UVarintType, None), - 6: ('fee', p.UVarintType, None), + 5: ('protocol_magic', p.UVarintType, p.FLAG_REQUIRED), + 6: ('fee', p.UVarintType, p.FLAG_REQUIRED), 7: ('ttl', p.UVarintType, None), - 8: ('network_id', p.UVarintType, None), + 8: ('network_id', p.UVarintType, p.FLAG_REQUIRED), 9: ('certificates', CardanoTxCertificateType, p.FLAG_REPEATED), 10: ('withdrawals', CardanoTxWithdrawalType, p.FLAG_REPEATED), 11: ('metadata', p.BytesType, None), diff --git a/python/src/trezorlib/messages/CardanoSignedTx.py b/python/src/trezorlib/messages/CardanoSignedTx.py index 5dd8f77b3..3f6d29060 100644 --- a/python/src/trezorlib/messages/CardanoSignedTx.py +++ b/python/src/trezorlib/messages/CardanoSignedTx.py @@ -16,8 +16,8 @@ class CardanoSignedTx(p.MessageType): def __init__( self, *, - tx_hash: bytes = None, - serialized_tx: bytes = None, + tx_hash: bytes, + serialized_tx: bytes, ) -> None: self.tx_hash = tx_hash self.serialized_tx = serialized_tx @@ -25,6 +25,6 @@ class CardanoSignedTx(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('tx_hash', p.BytesType, None), - 2: ('serialized_tx', p.BytesType, None), + 1: ('tx_hash', p.BytesType, p.FLAG_REQUIRED), + 2: ('serialized_tx', p.BytesType, p.FLAG_REQUIRED), } diff --git a/python/src/trezorlib/messages/CardanoTxCertificateType.py b/python/src/trezorlib/messages/CardanoTxCertificateType.py index bc4ef8808..9a31ca942 100644 --- a/python/src/trezorlib/messages/CardanoTxCertificateType.py +++ b/python/src/trezorlib/messages/CardanoTxCertificateType.py @@ -18,8 +18,8 @@ class CardanoTxCertificateType(p.MessageType): def __init__( self, *, + type: EnumTypeCardanoCertificateType, path: List[int] = None, - type: EnumTypeCardanoCertificateType = None, pool: bytes = None, pool_parameters: CardanoPoolParametersType = None, ) -> None: @@ -31,7 +31,7 @@ class CardanoTxCertificateType(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('type', p.EnumType("CardanoCertificateType", (0, 1, 2, 3)), None), + 1: ('type', p.EnumType("CardanoCertificateType", (0, 1, 2, 3)), p.FLAG_REQUIRED), 2: ('path', p.UVarintType, p.FLAG_REPEATED), 3: ('pool', p.BytesType, None), 4: ('pool_parameters', CardanoPoolParametersType, None), diff --git a/python/src/trezorlib/messages/CardanoTxInputType.py b/python/src/trezorlib/messages/CardanoTxInputType.py index 9eb4c3152..7e0424ff9 100644 --- a/python/src/trezorlib/messages/CardanoTxInputType.py +++ b/python/src/trezorlib/messages/CardanoTxInputType.py @@ -15,9 +15,9 @@ class CardanoTxInputType(p.MessageType): def __init__( self, *, + prev_hash: bytes, + prev_index: int, address_n: List[int] = None, - prev_hash: bytes = None, - prev_index: int = None, ) -> None: self.address_n = address_n if address_n is not None else [] self.prev_hash = prev_hash @@ -27,6 +27,6 @@ class CardanoTxInputType(p.MessageType): def get_fields(cls) -> Dict: return { 1: ('address_n', p.UVarintType, p.FLAG_REPEATED), - 2: ('prev_hash', p.BytesType, None), - 3: ('prev_index', p.UVarintType, None), + 2: ('prev_hash', p.BytesType, p.FLAG_REQUIRED), + 3: ('prev_index', p.UVarintType, p.FLAG_REQUIRED), } diff --git a/python/src/trezorlib/messages/CardanoTxOutputType.py b/python/src/trezorlib/messages/CardanoTxOutputType.py index c7f81fbcf..15f739e94 100644 --- a/python/src/trezorlib/messages/CardanoTxOutputType.py +++ b/python/src/trezorlib/messages/CardanoTxOutputType.py @@ -18,21 +18,21 @@ class CardanoTxOutputType(p.MessageType): def __init__( self, *, + amount: int, token_bundle: List[CardanoAssetGroupType] = None, address: str = None, - amount: int = None, address_parameters: CardanoAddressParametersType = None, ) -> None: self.token_bundle = token_bundle if token_bundle is not None else [] - self.address = address self.amount = amount + self.address = address self.address_parameters = address_parameters @classmethod def get_fields(cls) -> Dict: return { 1: ('address', p.UnicodeType, None), - 3: ('amount', p.UVarintType, None), + 3: ('amount', p.UVarintType, p.FLAG_REQUIRED), 4: ('address_parameters', CardanoAddressParametersType, None), 5: ('token_bundle', CardanoAssetGroupType, p.FLAG_REPEATED), } diff --git a/python/src/trezorlib/messages/CardanoTxWithdrawalType.py b/python/src/trezorlib/messages/CardanoTxWithdrawalType.py index 053f60362..114e89730 100644 --- a/python/src/trezorlib/messages/CardanoTxWithdrawalType.py +++ b/python/src/trezorlib/messages/CardanoTxWithdrawalType.py @@ -15,8 +15,8 @@ class CardanoTxWithdrawalType(p.MessageType): def __init__( self, *, + amount: int, path: List[int] = None, - amount: int = None, ) -> None: self.path = path if path is not None else [] self.amount = amount @@ -25,5 +25,5 @@ class CardanoTxWithdrawalType(p.MessageType): def get_fields(cls) -> Dict: return { 1: ('path', p.UVarintType, p.FLAG_REPEATED), - 2: ('amount', p.UVarintType, None), + 2: ('amount', p.UVarintType, p.FLAG_REQUIRED), } diff --git a/python/src/trezorlib/messages/CipherKeyValue.py b/python/src/trezorlib/messages/CipherKeyValue.py index db06401f8..c0123478b 100644 --- a/python/src/trezorlib/messages/CipherKeyValue.py +++ b/python/src/trezorlib/messages/CipherKeyValue.py @@ -16,9 +16,9 @@ class CipherKeyValue(p.MessageType): def __init__( self, *, + key: str, + value: bytes, address_n: List[int] = None, - key: str = None, - value: bytes = None, encrypt: bool = None, ask_on_encrypt: bool = None, ask_on_decrypt: bool = None, @@ -36,8 +36,8 @@ class CipherKeyValue(p.MessageType): def get_fields(cls) -> Dict: return { 1: ('address_n', p.UVarintType, p.FLAG_REPEATED), - 2: ('key', p.UnicodeType, None), - 3: ('value', p.BytesType, None), + 2: ('key', p.UnicodeType, p.FLAG_REQUIRED), + 3: ('value', p.BytesType, p.FLAG_REQUIRED), 4: ('encrypt', p.BoolType, None), 5: ('ask_on_encrypt', p.BoolType, None), 6: ('ask_on_decrypt', p.BoolType, None), diff --git a/python/src/trezorlib/messages/CipheredKeyValue.py b/python/src/trezorlib/messages/CipheredKeyValue.py index 3837d1ba2..b7016a059 100644 --- a/python/src/trezorlib/messages/CipheredKeyValue.py +++ b/python/src/trezorlib/messages/CipheredKeyValue.py @@ -16,12 +16,12 @@ class CipheredKeyValue(p.MessageType): def __init__( self, *, - value: bytes = None, + value: bytes, ) -> None: self.value = value @classmethod def get_fields(cls) -> Dict: return { - 1: ('value', p.BytesType, None), + 1: ('value', p.BytesType, p.FLAG_REQUIRED), } diff --git a/python/src/trezorlib/messages/CosiSignature.py b/python/src/trezorlib/messages/CosiSignature.py index ad8caa03a..5b76661c5 100644 --- a/python/src/trezorlib/messages/CosiSignature.py +++ b/python/src/trezorlib/messages/CosiSignature.py @@ -16,12 +16,12 @@ class CosiSignature(p.MessageType): def __init__( self, *, - signature: bytes = None, + signature: bytes, ) -> None: self.signature = signature @classmethod def get_fields(cls) -> Dict: return { - 1: ('signature', p.BytesType, None), + 1: ('signature', p.BytesType, p.FLAG_REQUIRED), } diff --git a/python/src/trezorlib/messages/ECDHSessionKey.py b/python/src/trezorlib/messages/ECDHSessionKey.py index 930932de0..b7bca33b6 100644 --- a/python/src/trezorlib/messages/ECDHSessionKey.py +++ b/python/src/trezorlib/messages/ECDHSessionKey.py @@ -16,12 +16,12 @@ class ECDHSessionKey(p.MessageType): def __init__( self, *, - session_key: bytes = None, + session_key: bytes, ) -> None: self.session_key = session_key @classmethod def get_fields(cls) -> Dict: return { - 1: ('session_key', p.BytesType, None), + 1: ('session_key', p.BytesType, p.FLAG_REQUIRED), } diff --git a/python/src/trezorlib/messages/EosActionUnknown.py b/python/src/trezorlib/messages/EosActionUnknown.py index ae10cc9c1..0cdb21125 100644 --- a/python/src/trezorlib/messages/EosActionUnknown.py +++ b/python/src/trezorlib/messages/EosActionUnknown.py @@ -15,7 +15,7 @@ class EosActionUnknown(p.MessageType): def __init__( self, *, - data_size: int = None, + data_size: int, data_chunk: bytes = None, ) -> None: self.data_size = data_size @@ -24,6 +24,6 @@ class EosActionUnknown(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('data_size', p.UVarintType, None), + 1: ('data_size', p.UVarintType, p.FLAG_REQUIRED), 2: ('data_chunk', p.BytesType, None), } diff --git a/python/src/trezorlib/messages/EosAuthorizationKey.py b/python/src/trezorlib/messages/EosAuthorizationKey.py index 2defc7716..32e7d5fad 100644 --- a/python/src/trezorlib/messages/EosAuthorizationKey.py +++ b/python/src/trezorlib/messages/EosAuthorizationKey.py @@ -15,21 +15,21 @@ class EosAuthorizationKey(p.MessageType): def __init__( self, *, + type: int, + weight: int, address_n: List[int] = None, - type: int = None, key: bytes = None, - weight: int = None, ) -> None: self.address_n = address_n if address_n is not None else [] self.type = type - self.key = key self.weight = weight + self.key = key @classmethod def get_fields(cls) -> Dict: return { - 1: ('type', p.UVarintType, None), + 1: ('type', p.UVarintType, p.FLAG_REQUIRED), 2: ('key', p.BytesType, None), 3: ('address_n', p.UVarintType, p.FLAG_REPEATED), - 4: ('weight', p.UVarintType, None), + 4: ('weight', p.UVarintType, p.FLAG_REQUIRED), } diff --git a/python/src/trezorlib/messages/EosPublicKey.py b/python/src/trezorlib/messages/EosPublicKey.py index fc34368c0..8d9640d14 100644 --- a/python/src/trezorlib/messages/EosPublicKey.py +++ b/python/src/trezorlib/messages/EosPublicKey.py @@ -16,8 +16,8 @@ class EosPublicKey(p.MessageType): def __init__( self, *, - wif_public_key: str = None, - raw_public_key: bytes = None, + wif_public_key: str, + raw_public_key: bytes, ) -> None: self.wif_public_key = wif_public_key self.raw_public_key = raw_public_key @@ -25,6 +25,6 @@ class EosPublicKey(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('wif_public_key', p.UnicodeType, None), - 2: ('raw_public_key', p.BytesType, None), + 1: ('wif_public_key', p.UnicodeType, p.FLAG_REQUIRED), + 2: ('raw_public_key', p.BytesType, p.FLAG_REQUIRED), } diff --git a/python/src/trezorlib/messages/EosSignedTx.py b/python/src/trezorlib/messages/EosSignedTx.py index 1bd8bc848..e0b87a3f9 100644 --- a/python/src/trezorlib/messages/EosSignedTx.py +++ b/python/src/trezorlib/messages/EosSignedTx.py @@ -16,12 +16,12 @@ class EosSignedTx(p.MessageType): def __init__( self, *, - signature: str = None, + signature: str, ) -> None: self.signature = signature @classmethod def get_fields(cls) -> Dict: return { - 1: ('signature', p.UnicodeType, None), + 1: ('signature', p.UnicodeType, p.FLAG_REQUIRED), } diff --git a/python/src/trezorlib/messages/EthereumMessageSignature.py b/python/src/trezorlib/messages/EthereumMessageSignature.py index cc16507f8..1c074f5ce 100644 --- a/python/src/trezorlib/messages/EthereumMessageSignature.py +++ b/python/src/trezorlib/messages/EthereumMessageSignature.py @@ -16,8 +16,8 @@ class EthereumMessageSignature(p.MessageType): def __init__( self, *, - signature: bytes = None, - address: str = None, + signature: bytes, + address: str, ) -> None: self.signature = signature self.address = address @@ -25,6 +25,6 @@ class EthereumMessageSignature(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 2: ('signature', p.BytesType, None), - 3: ('address', p.UnicodeType, None), + 2: ('signature', p.BytesType, p.FLAG_REQUIRED), + 3: ('address', p.UnicodeType, p.FLAG_REQUIRED), } diff --git a/python/src/trezorlib/messages/EthereumPublicKey.py b/python/src/trezorlib/messages/EthereumPublicKey.py index d3d96c5ec..c6078d3a3 100644 --- a/python/src/trezorlib/messages/EthereumPublicKey.py +++ b/python/src/trezorlib/messages/EthereumPublicKey.py @@ -18,8 +18,8 @@ class EthereumPublicKey(p.MessageType): def __init__( self, *, - node: HDNodeType = None, - xpub: str = None, + node: HDNodeType, + xpub: str, ) -> None: self.node = node self.xpub = xpub @@ -27,6 +27,6 @@ class EthereumPublicKey(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('node', HDNodeType, None), - 2: ('xpub', p.UnicodeType, None), + 1: ('node', HDNodeType, p.FLAG_REQUIRED), + 2: ('xpub', p.UnicodeType, p.FLAG_REQUIRED), } diff --git a/python/src/trezorlib/messages/Features.py b/python/src/trezorlib/messages/Features.py index 1e8d08085..cbb9e6cf3 100644 --- a/python/src/trezorlib/messages/Features.py +++ b/python/src/trezorlib/messages/Features.py @@ -19,11 +19,11 @@ class Features(p.MessageType): def __init__( self, *, + major_version: int, + minor_version: int, + patch_version: int, capabilities: List[EnumTypeCapability] = None, vendor: str = None, - major_version: int = None, - minor_version: int = None, - patch_version: int = None, bootloader_mode: bool = None, device_id: str = None, pin_protection: bool = None, @@ -59,10 +59,10 @@ class Features(p.MessageType): experimental_features: bool = None, ) -> None: self.capabilities = capabilities if capabilities is not None else [] - self.vendor = vendor self.major_version = major_version self.minor_version = minor_version self.patch_version = patch_version + self.vendor = vendor self.bootloader_mode = bootloader_mode self.device_id = device_id self.pin_protection = pin_protection @@ -101,9 +101,9 @@ class Features(p.MessageType): def get_fields(cls) -> Dict: return { 1: ('vendor', p.UnicodeType, None), - 2: ('major_version', p.UVarintType, None), - 3: ('minor_version', p.UVarintType, None), - 4: ('patch_version', p.UVarintType, None), + 2: ('major_version', p.UVarintType, p.FLAG_REQUIRED), + 3: ('minor_version', p.UVarintType, p.FLAG_REQUIRED), + 4: ('patch_version', p.UVarintType, p.FLAG_REQUIRED), 5: ('bootloader_mode', p.BoolType, None), 6: ('device_id', p.UnicodeType, None), 7: ('pin_protection', p.BoolType, None), diff --git a/python/src/trezorlib/messages/GetECDHSessionKey.py b/python/src/trezorlib/messages/GetECDHSessionKey.py index 46b9b3165..269376ee7 100644 --- a/python/src/trezorlib/messages/GetECDHSessionKey.py +++ b/python/src/trezorlib/messages/GetECDHSessionKey.py @@ -18,8 +18,8 @@ class GetECDHSessionKey(p.MessageType): def __init__( self, *, - identity: IdentityType = None, - peer_public_key: bytes = None, + identity: IdentityType, + peer_public_key: bytes, ecdsa_curve_name: str = None, ) -> None: self.identity = identity @@ -29,7 +29,7 @@ class GetECDHSessionKey(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('identity', IdentityType, None), - 2: ('peer_public_key', p.BytesType, None), + 1: ('identity', IdentityType, p.FLAG_REQUIRED), + 2: ('peer_public_key', p.BytesType, p.FLAG_REQUIRED), 3: ('ecdsa_curve_name', p.UnicodeType, None), } diff --git a/python/src/trezorlib/messages/LiskAddress.py b/python/src/trezorlib/messages/LiskAddress.py index 16c427129..f66f62d8b 100644 --- a/python/src/trezorlib/messages/LiskAddress.py +++ b/python/src/trezorlib/messages/LiskAddress.py @@ -16,12 +16,12 @@ class LiskAddress(p.MessageType): def __init__( self, *, - address: str = None, + address: str, ) -> None: self.address = address @classmethod def get_fields(cls) -> Dict: return { - 1: ('address', p.UnicodeType, None), + 1: ('address', p.UnicodeType, p.FLAG_REQUIRED), } diff --git a/python/src/trezorlib/messages/LiskMessageSignature.py b/python/src/trezorlib/messages/LiskMessageSignature.py index 948befadf..e35fd2e91 100644 --- a/python/src/trezorlib/messages/LiskMessageSignature.py +++ b/python/src/trezorlib/messages/LiskMessageSignature.py @@ -16,8 +16,8 @@ class LiskMessageSignature(p.MessageType): def __init__( self, *, - public_key: bytes = None, - signature: bytes = None, + public_key: bytes, + signature: bytes, ) -> None: self.public_key = public_key self.signature = signature @@ -25,6 +25,6 @@ class LiskMessageSignature(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('public_key', p.BytesType, None), - 2: ('signature', p.BytesType, None), + 1: ('public_key', p.BytesType, p.FLAG_REQUIRED), + 2: ('signature', p.BytesType, p.FLAG_REQUIRED), } diff --git a/python/src/trezorlib/messages/LiskPublicKey.py b/python/src/trezorlib/messages/LiskPublicKey.py index 13981de15..14ec3dc46 100644 --- a/python/src/trezorlib/messages/LiskPublicKey.py +++ b/python/src/trezorlib/messages/LiskPublicKey.py @@ -16,12 +16,12 @@ class LiskPublicKey(p.MessageType): def __init__( self, *, - public_key: bytes = None, + public_key: bytes, ) -> None: self.public_key = public_key @classmethod def get_fields(cls) -> Dict: return { - 1: ('public_key', p.BytesType, None), + 1: ('public_key', p.BytesType, p.FLAG_REQUIRED), } diff --git a/python/src/trezorlib/messages/LiskSignMessage.py b/python/src/trezorlib/messages/LiskSignMessage.py index ba7de53df..3b7545249 100644 --- a/python/src/trezorlib/messages/LiskSignMessage.py +++ b/python/src/trezorlib/messages/LiskSignMessage.py @@ -16,8 +16,8 @@ class LiskSignMessage(p.MessageType): def __init__( self, *, + message: bytes, address_n: List[int] = None, - message: bytes = None, ) -> None: self.address_n = address_n if address_n is not None else [] self.message = message @@ -26,5 +26,5 @@ class LiskSignMessage(p.MessageType): def get_fields(cls) -> Dict: return { 1: ('address_n', p.UVarintType, p.FLAG_REPEATED), - 2: ('message', p.BytesType, None), + 2: ('message', p.BytesType, p.FLAG_REQUIRED), } diff --git a/python/src/trezorlib/messages/LiskSignTx.py b/python/src/trezorlib/messages/LiskSignTx.py index 3548f95f5..a90d247fc 100644 --- a/python/src/trezorlib/messages/LiskSignTx.py +++ b/python/src/trezorlib/messages/LiskSignTx.py @@ -18,8 +18,8 @@ class LiskSignTx(p.MessageType): def __init__( self, *, + transaction: LiskTransactionCommon, address_n: List[int] = None, - transaction: LiskTransactionCommon = None, ) -> None: self.address_n = address_n if address_n is not None else [] self.transaction = transaction @@ -28,5 +28,5 @@ class LiskSignTx(p.MessageType): def get_fields(cls) -> Dict: return { 1: ('address_n', p.UVarintType, p.FLAG_REPEATED), - 2: ('transaction', LiskTransactionCommon, None), + 2: ('transaction', LiskTransactionCommon, p.FLAG_REQUIRED), } diff --git a/python/src/trezorlib/messages/LiskSignedTx.py b/python/src/trezorlib/messages/LiskSignedTx.py index 4b978ec6f..9ffb664ed 100644 --- a/python/src/trezorlib/messages/LiskSignedTx.py +++ b/python/src/trezorlib/messages/LiskSignedTx.py @@ -16,12 +16,12 @@ class LiskSignedTx(p.MessageType): def __init__( self, *, - signature: bytes = None, + signature: bytes, ) -> None: self.signature = signature @classmethod def get_fields(cls) -> Dict: return { - 1: ('signature', p.BytesType, None), + 1: ('signature', p.BytesType, p.FLAG_REQUIRED), } diff --git a/python/src/trezorlib/messages/LiskVerifyMessage.py b/python/src/trezorlib/messages/LiskVerifyMessage.py index cfa65c45d..f65ac768c 100644 --- a/python/src/trezorlib/messages/LiskVerifyMessage.py +++ b/python/src/trezorlib/messages/LiskVerifyMessage.py @@ -16,9 +16,9 @@ class LiskVerifyMessage(p.MessageType): def __init__( self, *, - public_key: bytes = None, - signature: bytes = None, - message: bytes = None, + public_key: bytes, + signature: bytes, + message: bytes, ) -> None: self.public_key = public_key self.signature = signature @@ -27,7 +27,7 @@ class LiskVerifyMessage(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('public_key', p.BytesType, None), - 2: ('signature', p.BytesType, None), - 3: ('message', p.BytesType, None), + 1: ('public_key', p.BytesType, p.FLAG_REQUIRED), + 2: ('signature', p.BytesType, p.FLAG_REQUIRED), + 3: ('message', p.BytesType, p.FLAG_REQUIRED), } diff --git a/python/src/trezorlib/messages/MessageSignature.py b/python/src/trezorlib/messages/MessageSignature.py index c995a011d..e72088ee0 100644 --- a/python/src/trezorlib/messages/MessageSignature.py +++ b/python/src/trezorlib/messages/MessageSignature.py @@ -16,8 +16,8 @@ class MessageSignature(p.MessageType): def __init__( self, *, - address: str = None, - signature: bytes = None, + address: str, + signature: bytes, ) -> None: self.address = address self.signature = signature @@ -25,6 +25,6 @@ class MessageSignature(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('address', p.UnicodeType, None), - 2: ('signature', p.BytesType, None), + 1: ('address', p.UnicodeType, p.FLAG_REQUIRED), + 2: ('signature', p.BytesType, p.FLAG_REQUIRED), } diff --git a/python/src/trezorlib/messages/NEMDecryptedMessage.py b/python/src/trezorlib/messages/NEMDecryptedMessage.py index f55476d3c..a4a0644d5 100644 --- a/python/src/trezorlib/messages/NEMDecryptedMessage.py +++ b/python/src/trezorlib/messages/NEMDecryptedMessage.py @@ -16,12 +16,12 @@ class NEMDecryptedMessage(p.MessageType): def __init__( self, *, - payload: bytes = None, + payload: bytes, ) -> None: self.payload = payload @classmethod def get_fields(cls) -> Dict: return { - 1: ('payload', p.BytesType, None), + 1: ('payload', p.BytesType, p.FLAG_REQUIRED), } diff --git a/python/src/trezorlib/messages/NEMSignedTx.py b/python/src/trezorlib/messages/NEMSignedTx.py index 007e850c9..166e8622d 100644 --- a/python/src/trezorlib/messages/NEMSignedTx.py +++ b/python/src/trezorlib/messages/NEMSignedTx.py @@ -16,8 +16,8 @@ class NEMSignedTx(p.MessageType): def __init__( self, *, - data: bytes = None, - signature: bytes = None, + data: bytes, + signature: bytes, ) -> None: self.data = data self.signature = signature @@ -25,6 +25,6 @@ class NEMSignedTx(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('data', p.BytesType, None), - 2: ('signature', p.BytesType, None), + 1: ('data', p.BytesType, p.FLAG_REQUIRED), + 2: ('signature', p.BytesType, p.FLAG_REQUIRED), } diff --git a/python/src/trezorlib/messages/Ping.py b/python/src/trezorlib/messages/Ping.py index 2f3f77632..387037fa5 100644 --- a/python/src/trezorlib/messages/Ping.py +++ b/python/src/trezorlib/messages/Ping.py @@ -16,7 +16,7 @@ class Ping(p.MessageType): def __init__( self, *, - message: str = None, + message: str = "", button_protection: bool = None, ) -> None: self.message = message @@ -25,6 +25,6 @@ class Ping(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('message', p.UnicodeType, None), + 1: ('message', p.UnicodeType, ""), # default= 2: ('button_protection', p.BoolType, None), } diff --git a/python/src/trezorlib/messages/PublicKey.py b/python/src/trezorlib/messages/PublicKey.py index 09294b904..a7faa75bf 100644 --- a/python/src/trezorlib/messages/PublicKey.py +++ b/python/src/trezorlib/messages/PublicKey.py @@ -18,8 +18,8 @@ class PublicKey(p.MessageType): def __init__( self, *, - node: HDNodeType = None, - xpub: str = None, + node: HDNodeType, + xpub: str, root_fingerprint: int = None, ) -> None: self.node = node @@ -29,7 +29,7 @@ class PublicKey(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('node', HDNodeType, None), - 2: ('xpub', p.UnicodeType, None), + 1: ('node', HDNodeType, p.FLAG_REQUIRED), + 2: ('xpub', p.UnicodeType, p.FLAG_REQUIRED), 3: ('root_fingerprint', p.UVarintType, None), } diff --git a/python/src/trezorlib/messages/RippleAddress.py b/python/src/trezorlib/messages/RippleAddress.py index e4ef3e4ef..88172e66a 100644 --- a/python/src/trezorlib/messages/RippleAddress.py +++ b/python/src/trezorlib/messages/RippleAddress.py @@ -16,12 +16,12 @@ class RippleAddress(p.MessageType): def __init__( self, *, - address: str = None, + address: str, ) -> None: self.address = address @classmethod def get_fields(cls) -> Dict: return { - 1: ('address', p.UnicodeType, None), + 1: ('address', p.UnicodeType, p.FLAG_REQUIRED), } diff --git a/python/src/trezorlib/messages/RipplePayment.py b/python/src/trezorlib/messages/RipplePayment.py index 1197d4fd8..c7960168c 100644 --- a/python/src/trezorlib/messages/RipplePayment.py +++ b/python/src/trezorlib/messages/RipplePayment.py @@ -15,8 +15,8 @@ class RipplePayment(p.MessageType): def __init__( self, *, - amount: int = None, - destination: str = None, + amount: int, + destination: str, destination_tag: int = None, ) -> None: self.amount = amount @@ -26,7 +26,7 @@ class RipplePayment(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('amount', p.UVarintType, None), - 2: ('destination', p.UnicodeType, None), + 1: ('amount', p.UVarintType, p.FLAG_REQUIRED), + 2: ('destination', p.UnicodeType, p.FLAG_REQUIRED), 3: ('destination_tag', p.UVarintType, None), } diff --git a/python/src/trezorlib/messages/RippleSignedTx.py b/python/src/trezorlib/messages/RippleSignedTx.py index 133807594..c3c1580c0 100644 --- a/python/src/trezorlib/messages/RippleSignedTx.py +++ b/python/src/trezorlib/messages/RippleSignedTx.py @@ -16,8 +16,8 @@ class RippleSignedTx(p.MessageType): def __init__( self, *, - signature: bytes = None, - serialized_tx: bytes = None, + signature: bytes, + serialized_tx: bytes, ) -> None: self.signature = signature self.serialized_tx = serialized_tx @@ -25,6 +25,6 @@ class RippleSignedTx(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('signature', p.BytesType, None), - 2: ('serialized_tx', p.BytesType, None), + 1: ('signature', p.BytesType, p.FLAG_REQUIRED), + 2: ('serialized_tx', p.BytesType, p.FLAG_REQUIRED), } diff --git a/python/src/trezorlib/messages/SignIdentity.py b/python/src/trezorlib/messages/SignIdentity.py index 4b02b41ac..0d7711dd3 100644 --- a/python/src/trezorlib/messages/SignIdentity.py +++ b/python/src/trezorlib/messages/SignIdentity.py @@ -18,9 +18,9 @@ class SignIdentity(p.MessageType): def __init__( self, *, - identity: IdentityType = None, - challenge_hidden: bytes = None, - challenge_visual: str = None, + identity: IdentityType, + challenge_hidden: bytes = b"", + challenge_visual: str = "", ecdsa_curve_name: str = None, ) -> None: self.identity = identity @@ -31,8 +31,8 @@ class SignIdentity(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('identity', IdentityType, None), - 2: ('challenge_hidden', p.BytesType, None), - 3: ('challenge_visual', p.UnicodeType, None), + 1: ('identity', IdentityType, p.FLAG_REQUIRED), + 2: ('challenge_hidden', p.BytesType, b""), # default= + 3: ('challenge_visual', p.UnicodeType, ""), # default= 4: ('ecdsa_curve_name', p.UnicodeType, None), } diff --git a/python/src/trezorlib/messages/SignedIdentity.py b/python/src/trezorlib/messages/SignedIdentity.py index f69cbe2d4..139ea1239 100644 --- a/python/src/trezorlib/messages/SignedIdentity.py +++ b/python/src/trezorlib/messages/SignedIdentity.py @@ -16,18 +16,18 @@ class SignedIdentity(p.MessageType): def __init__( self, *, + public_key: bytes, + signature: bytes, address: str = None, - public_key: bytes = None, - signature: bytes = None, ) -> None: - self.address = address self.public_key = public_key self.signature = signature + self.address = address @classmethod def get_fields(cls) -> Dict: return { 1: ('address', p.UnicodeType, None), - 2: ('public_key', p.BytesType, None), - 3: ('signature', p.BytesType, None), + 2: ('public_key', p.BytesType, p.FLAG_REQUIRED), + 3: ('signature', p.BytesType, p.FLAG_REQUIRED), } diff --git a/python/src/trezorlib/messages/StellarAddress.py b/python/src/trezorlib/messages/StellarAddress.py index 1aecd88a2..2e625b1e6 100644 --- a/python/src/trezorlib/messages/StellarAddress.py +++ b/python/src/trezorlib/messages/StellarAddress.py @@ -16,12 +16,12 @@ class StellarAddress(p.MessageType): def __init__( self, *, - address: str = None, + address: str, ) -> None: self.address = address @classmethod def get_fields(cls) -> Dict: return { - 1: ('address', p.UnicodeType, None), + 1: ('address', p.UnicodeType, p.FLAG_REQUIRED), } diff --git a/python/src/trezorlib/messages/StellarAssetType.py b/python/src/trezorlib/messages/StellarAssetType.py index 5021e4d44..2c0cc4d38 100644 --- a/python/src/trezorlib/messages/StellarAssetType.py +++ b/python/src/trezorlib/messages/StellarAssetType.py @@ -15,7 +15,7 @@ class StellarAssetType(p.MessageType): def __init__( self, *, - type: int = None, + type: int, code: str = None, issuer: str = None, ) -> None: @@ -26,7 +26,7 @@ class StellarAssetType(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('type', p.UVarintType, None), + 1: ('type', p.UVarintType, p.FLAG_REQUIRED), 2: ('code', p.UnicodeType, None), 3: ('issuer', p.UnicodeType, None), } diff --git a/python/src/trezorlib/messages/StellarSignedTx.py b/python/src/trezorlib/messages/StellarSignedTx.py index c53879bcc..e8bf48d95 100644 --- a/python/src/trezorlib/messages/StellarSignedTx.py +++ b/python/src/trezorlib/messages/StellarSignedTx.py @@ -16,8 +16,8 @@ class StellarSignedTx(p.MessageType): def __init__( self, *, - public_key: bytes = None, - signature: bytes = None, + public_key: bytes, + signature: bytes, ) -> None: self.public_key = public_key self.signature = signature @@ -25,6 +25,6 @@ class StellarSignedTx(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('public_key', p.BytesType, None), - 2: ('signature', p.BytesType, None), + 1: ('public_key', p.BytesType, p.FLAG_REQUIRED), + 2: ('signature', p.BytesType, p.FLAG_REQUIRED), } diff --git a/python/src/trezorlib/messages/Success.py b/python/src/trezorlib/messages/Success.py index d1f58141d..f4375b73e 100644 --- a/python/src/trezorlib/messages/Success.py +++ b/python/src/trezorlib/messages/Success.py @@ -16,12 +16,12 @@ class Success(p.MessageType): def __init__( self, *, - message: str = None, + message: str = "", ) -> None: self.message = message @classmethod def get_fields(cls) -> Dict: return { - 1: ('message', p.UnicodeType, None), + 1: ('message', p.UnicodeType, ""), # default= } diff --git a/python/src/trezorlib/messages/TezosAddress.py b/python/src/trezorlib/messages/TezosAddress.py index 9bc8deb50..d81a9e7c4 100644 --- a/python/src/trezorlib/messages/TezosAddress.py +++ b/python/src/trezorlib/messages/TezosAddress.py @@ -16,12 +16,12 @@ class TezosAddress(p.MessageType): def __init__( self, *, - address: str = None, + address: str, ) -> None: self.address = address @classmethod def get_fields(cls) -> Dict: return { - 1: ('address', p.UnicodeType, None), + 1: ('address', p.UnicodeType, p.FLAG_REQUIRED), } diff --git a/python/src/trezorlib/messages/TezosContractID.py b/python/src/trezorlib/messages/TezosContractID.py index cf337e0d0..33bb62249 100644 --- a/python/src/trezorlib/messages/TezosContractID.py +++ b/python/src/trezorlib/messages/TezosContractID.py @@ -16,8 +16,8 @@ class TezosContractID(p.MessageType): def __init__( self, *, - tag: EnumTypeTezosContractType = None, - hash: bytes = None, + tag: EnumTypeTezosContractType, + hash: bytes, ) -> None: self.tag = tag self.hash = hash @@ -25,6 +25,6 @@ class TezosContractID(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('tag', p.EnumType("TezosContractType", (0, 1)), None), - 2: ('hash', p.BytesType, None), + 1: ('tag', p.EnumType("TezosContractType", (0, 1)), p.FLAG_REQUIRED), + 2: ('hash', p.BytesType, p.FLAG_REQUIRED), } diff --git a/python/src/trezorlib/messages/TezosDelegationOp.py b/python/src/trezorlib/messages/TezosDelegationOp.py index c3eb310c4..872cd695d 100644 --- a/python/src/trezorlib/messages/TezosDelegationOp.py +++ b/python/src/trezorlib/messages/TezosDelegationOp.py @@ -15,12 +15,12 @@ class TezosDelegationOp(p.MessageType): def __init__( self, *, - source: bytes = None, - fee: int = None, - counter: int = None, - gas_limit: int = None, - storage_limit: int = None, - delegate: bytes = None, + source: bytes, + fee: int, + counter: int, + gas_limit: int, + storage_limit: int, + delegate: bytes, ) -> None: self.source = source self.fee = fee @@ -32,10 +32,10 @@ class TezosDelegationOp(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 7: ('source', p.BytesType, None), - 2: ('fee', p.UVarintType, None), - 3: ('counter', p.UVarintType, None), - 4: ('gas_limit', p.UVarintType, None), - 5: ('storage_limit', p.UVarintType, None), - 6: ('delegate', p.BytesType, None), + 7: ('source', p.BytesType, p.FLAG_REQUIRED), + 2: ('fee', p.UVarintType, p.FLAG_REQUIRED), + 3: ('counter', p.UVarintType, p.FLAG_REQUIRED), + 4: ('gas_limit', p.UVarintType, p.FLAG_REQUIRED), + 5: ('storage_limit', p.UVarintType, p.FLAG_REQUIRED), + 6: ('delegate', p.BytesType, p.FLAG_REQUIRED), } diff --git a/python/src/trezorlib/messages/TezosOriginationOp.py b/python/src/trezorlib/messages/TezosOriginationOp.py index c09d97dfc..6d73a8fde 100644 --- a/python/src/trezorlib/messages/TezosOriginationOp.py +++ b/python/src/trezorlib/messages/TezosOriginationOp.py @@ -15,42 +15,42 @@ class TezosOriginationOp(p.MessageType): def __init__( self, *, - source: bytes = None, - fee: int = None, - counter: int = None, - gas_limit: int = None, - storage_limit: int = None, + source: bytes, + fee: int, + counter: int, + gas_limit: int, + storage_limit: int, + balance: int, + script: bytes, manager_pubkey: bytes = None, - balance: int = None, spendable: bool = None, delegatable: bool = None, delegate: bytes = None, - script: bytes = None, ) -> None: self.source = source self.fee = fee self.counter = counter self.gas_limit = gas_limit self.storage_limit = storage_limit - self.manager_pubkey = manager_pubkey self.balance = balance + self.script = script + self.manager_pubkey = manager_pubkey self.spendable = spendable self.delegatable = delegatable self.delegate = delegate - self.script = script @classmethod def get_fields(cls) -> Dict: return { - 12: ('source', p.BytesType, None), - 2: ('fee', p.UVarintType, None), - 3: ('counter', p.UVarintType, None), - 4: ('gas_limit', p.UVarintType, None), - 5: ('storage_limit', p.UVarintType, None), + 12: ('source', p.BytesType, p.FLAG_REQUIRED), + 2: ('fee', p.UVarintType, p.FLAG_REQUIRED), + 3: ('counter', p.UVarintType, p.FLAG_REQUIRED), + 4: ('gas_limit', p.UVarintType, p.FLAG_REQUIRED), + 5: ('storage_limit', p.UVarintType, p.FLAG_REQUIRED), 6: ('manager_pubkey', p.BytesType, None), - 7: ('balance', p.UVarintType, None), + 7: ('balance', p.UVarintType, p.FLAG_REQUIRED), 8: ('spendable', p.BoolType, None), 9: ('delegatable', p.BoolType, None), 10: ('delegate', p.BytesType, None), - 11: ('script', p.BytesType, None), + 11: ('script', p.BytesType, p.FLAG_REQUIRED), } diff --git a/python/src/trezorlib/messages/TezosPublicKey.py b/python/src/trezorlib/messages/TezosPublicKey.py index 2bae655d5..25efa72fa 100644 --- a/python/src/trezorlib/messages/TezosPublicKey.py +++ b/python/src/trezorlib/messages/TezosPublicKey.py @@ -16,12 +16,12 @@ class TezosPublicKey(p.MessageType): def __init__( self, *, - public_key: str = None, + public_key: str, ) -> None: self.public_key = public_key @classmethod def get_fields(cls) -> Dict: return { - 1: ('public_key', p.UnicodeType, None), + 1: ('public_key', p.UnicodeType, p.FLAG_REQUIRED), } diff --git a/python/src/trezorlib/messages/TezosRevealOp.py b/python/src/trezorlib/messages/TezosRevealOp.py index 78c5e036b..77169104f 100644 --- a/python/src/trezorlib/messages/TezosRevealOp.py +++ b/python/src/trezorlib/messages/TezosRevealOp.py @@ -15,12 +15,12 @@ class TezosRevealOp(p.MessageType): def __init__( self, *, - source: bytes = None, - fee: int = None, - counter: int = None, - gas_limit: int = None, - storage_limit: int = None, - public_key: bytes = None, + source: bytes, + fee: int, + counter: int, + gas_limit: int, + storage_limit: int, + public_key: bytes, ) -> None: self.source = source self.fee = fee @@ -32,10 +32,10 @@ class TezosRevealOp(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 7: ('source', p.BytesType, None), - 2: ('fee', p.UVarintType, None), - 3: ('counter', p.UVarintType, None), - 4: ('gas_limit', p.UVarintType, None), - 5: ('storage_limit', p.UVarintType, None), - 6: ('public_key', p.BytesType, None), + 7: ('source', p.BytesType, p.FLAG_REQUIRED), + 2: ('fee', p.UVarintType, p.FLAG_REQUIRED), + 3: ('counter', p.UVarintType, p.FLAG_REQUIRED), + 4: ('gas_limit', p.UVarintType, p.FLAG_REQUIRED), + 5: ('storage_limit', p.UVarintType, p.FLAG_REQUIRED), + 6: ('public_key', p.BytesType, p.FLAG_REQUIRED), } diff --git a/python/src/trezorlib/messages/TezosSignTx.py b/python/src/trezorlib/messages/TezosSignTx.py index a86f4c928..14e62a2cf 100644 --- a/python/src/trezorlib/messages/TezosSignTx.py +++ b/python/src/trezorlib/messages/TezosSignTx.py @@ -23,8 +23,8 @@ class TezosSignTx(p.MessageType): def __init__( self, *, + branch: bytes, address_n: List[int] = None, - branch: bytes = None, reveal: TezosRevealOp = None, transaction: TezosTransactionOp = None, origination: TezosOriginationOp = None, @@ -45,7 +45,7 @@ class TezosSignTx(p.MessageType): def get_fields(cls) -> Dict: return { 1: ('address_n', p.UVarintType, p.FLAG_REPEATED), - 2: ('branch', p.BytesType, None), + 2: ('branch', p.BytesType, p.FLAG_REQUIRED), 3: ('reveal', TezosRevealOp, None), 4: ('transaction', TezosTransactionOp, None), 5: ('origination', TezosOriginationOp, None), diff --git a/python/src/trezorlib/messages/TezosSignedTx.py b/python/src/trezorlib/messages/TezosSignedTx.py index dbf5724be..4534f033c 100644 --- a/python/src/trezorlib/messages/TezosSignedTx.py +++ b/python/src/trezorlib/messages/TezosSignedTx.py @@ -16,9 +16,9 @@ class TezosSignedTx(p.MessageType): def __init__( self, *, - signature: str = None, - sig_op_contents: bytes = None, - operation_hash: str = None, + signature: str, + sig_op_contents: bytes, + operation_hash: str, ) -> None: self.signature = signature self.sig_op_contents = sig_op_contents @@ -27,7 +27,7 @@ class TezosSignedTx(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('signature', p.UnicodeType, None), - 2: ('sig_op_contents', p.BytesType, None), - 3: ('operation_hash', p.UnicodeType, None), + 1: ('signature', p.UnicodeType, p.FLAG_REQUIRED), + 2: ('sig_op_contents', p.BytesType, p.FLAG_REQUIRED), + 3: ('operation_hash', p.UnicodeType, p.FLAG_REQUIRED), } diff --git a/python/src/trezorlib/messages/TezosTransactionOp.py b/python/src/trezorlib/messages/TezosTransactionOp.py index dc0c13405..db259795e 100644 --- a/python/src/trezorlib/messages/TezosTransactionOp.py +++ b/python/src/trezorlib/messages/TezosTransactionOp.py @@ -18,13 +18,13 @@ class TezosTransactionOp(p.MessageType): def __init__( self, *, - source: bytes = None, - fee: int = None, - counter: int = None, - gas_limit: int = None, - storage_limit: int = None, - amount: int = None, - destination: TezosContractID = None, + source: bytes, + fee: int, + counter: int, + gas_limit: int, + storage_limit: int, + amount: int, + destination: TezosContractID, parameters: bytes = None, parameters_manager: TezosParametersManager = None, ) -> None: @@ -41,13 +41,13 @@ class TezosTransactionOp(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 9: ('source', p.BytesType, None), - 2: ('fee', p.UVarintType, None), - 3: ('counter', p.UVarintType, None), - 4: ('gas_limit', p.UVarintType, None), - 5: ('storage_limit', p.UVarintType, None), - 6: ('amount', p.UVarintType, None), - 7: ('destination', TezosContractID, None), + 9: ('source', p.BytesType, p.FLAG_REQUIRED), + 2: ('fee', p.UVarintType, p.FLAG_REQUIRED), + 3: ('counter', p.UVarintType, p.FLAG_REQUIRED), + 4: ('gas_limit', p.UVarintType, p.FLAG_REQUIRED), + 5: ('storage_limit', p.UVarintType, p.FLAG_REQUIRED), + 6: ('amount', p.UVarintType, p.FLAG_REQUIRED), + 7: ('destination', TezosContractID, p.FLAG_REQUIRED), 8: ('parameters', p.BytesType, None), 10: ('parameters_manager', TezosParametersManager, None), }