diff --git a/core/src/trezor/messages/Address.py b/core/src/trezor/messages/Address.py index 7d0571449..61c664cf1 100644 --- a/core/src/trezor/messages/Address.py +++ b/core/src/trezor/messages/Address.py @@ -15,12 +15,13 @@ class Address(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, 0), # required + 1: ('address', p.UnicodeType, p.FLAG_REQUIRED), } diff --git a/core/src/trezor/messages/ApplyFlags.py b/core/src/trezor/messages/ApplyFlags.py index 376b3d61c..298e0926d 100644 --- a/core/src/trezor/messages/ApplyFlags.py +++ b/core/src/trezor/messages/ApplyFlags.py @@ -15,6 +15,7 @@ class ApplyFlags(p.MessageType): def __init__( self, + *, flags: int = None, ) -> None: self.flags = flags @@ -22,5 +23,5 @@ class ApplyFlags(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('flags', p.UVarintType, 0), + 1: ('flags', p.UVarintType, None), } diff --git a/core/src/trezor/messages/ApplySettings.py b/core/src/trezor/messages/ApplySettings.py index 882d3162d..c9c446523 100644 --- a/core/src/trezor/messages/ApplySettings.py +++ b/core/src/trezor/messages/ApplySettings.py @@ -16,6 +16,7 @@ class ApplySettings(p.MessageType): def __init__( self, + *, language: str = None, label: str = None, use_passphrase: bool = None, @@ -37,12 +38,12 @@ class ApplySettings(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('language', p.UnicodeType, 0), - 2: ('label', p.UnicodeType, 0), - 3: ('use_passphrase', p.BoolType, 0), - 4: ('homescreen', p.BytesType, 0), - 6: ('auto_lock_delay_ms', p.UVarintType, 0), - 7: ('display_rotation', p.UVarintType, 0), - 8: ('passphrase_always_on_device', p.BoolType, 0), - 9: ('safety_checks', p.EnumType("SafetyCheckLevel", (0, 1, 2)), 0), + 1: ('language', p.UnicodeType, None), + 2: ('label', p.UnicodeType, None), + 3: ('use_passphrase', p.BoolType, None), + 4: ('homescreen', p.BytesType, None), + 6: ('auto_lock_delay_ms', p.UVarintType, None), + 7: ('display_rotation', p.UVarintType, None), + 8: ('passphrase_always_on_device', p.BoolType, None), + 9: ('safety_checks', p.EnumType("SafetyCheckLevel", (0, 1, 2)), None), } diff --git a/core/src/trezor/messages/AuthorizeCoinJoin.py b/core/src/trezor/messages/AuthorizeCoinJoin.py index e59dd6d15..d0c0995ef 100644 --- a/core/src/trezor/messages/AuthorizeCoinJoin.py +++ b/core/src/trezor/messages/AuthorizeCoinJoin.py @@ -16,27 +16,28 @@ class AuthorizeCoinJoin(p.MessageType): def __init__( self, - coordinator: str = None, - max_total_fee: int = None, - fee_per_anonymity: int = None, + *, + coordinator: str, + max_total_fee: int, address_n: List[int] = None, - coin_name: str = None, - script_type: EnumTypeInputScriptType = None, + fee_per_anonymity: int = None, + coin_name: str = "Bitcoin", + script_type: EnumTypeInputScriptType = 0, ) -> None: + self.address_n = address_n if address_n is not None else [] self.coordinator = coordinator self.max_total_fee = max_total_fee self.fee_per_anonymity = fee_per_anonymity - self.address_n = address_n if address_n is not None else [] self.coin_name = coin_name self.script_type = script_type @classmethod def get_fields(cls) -> Dict: return { - 1: ('coordinator', p.UnicodeType, 0), # required - 2: ('max_total_fee', p.UVarintType, 0), # required - 3: ('fee_per_anonymity', p.UVarintType, 0), + 1: ('coordinator', p.UnicodeType, p.FLAG_REQUIRED), + 2: ('max_total_fee', p.UVarintType, p.FLAG_REQUIRED), + 3: ('fee_per_anonymity', p.UVarintType, None), 4: ('address_n', p.UVarintType, p.FLAG_REPEATED), - 5: ('coin_name', p.UnicodeType, 0), # default=Bitcoin + 5: ('coin_name', p.UnicodeType, "Bitcoin"), # default=Bitcoin 6: ('script_type', p.EnumType("InputScriptType", (0, 1, 2, 3, 4)), 0), # default=SPENDADDRESS } diff --git a/core/src/trezor/messages/BinanceAddress.py b/core/src/trezor/messages/BinanceAddress.py index da5e914d8..6e7ece379 100644 --- a/core/src/trezor/messages/BinanceAddress.py +++ b/core/src/trezor/messages/BinanceAddress.py @@ -15,6 +15,7 @@ class BinanceAddress(p.MessageType): def __init__( self, + *, address: str = None, ) -> None: self.address = address @@ -22,5 +23,5 @@ class BinanceAddress(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('address', p.UnicodeType, 0), + 1: ('address', p.UnicodeType, None), } diff --git a/core/src/trezor/messages/BinanceCancelMsg.py b/core/src/trezor/messages/BinanceCancelMsg.py index ba2ec4a91..c45d98b5c 100644 --- a/core/src/trezor/messages/BinanceCancelMsg.py +++ b/core/src/trezor/messages/BinanceCancelMsg.py @@ -15,6 +15,7 @@ class BinanceCancelMsg(p.MessageType): def __init__( self, + *, refid: str = None, sender: str = None, symbol: str = None, @@ -26,7 +27,7 @@ class BinanceCancelMsg(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('refid', p.UnicodeType, 0), - 2: ('sender', p.UnicodeType, 0), - 3: ('symbol', p.UnicodeType, 0), + 1: ('refid', p.UnicodeType, None), + 2: ('sender', p.UnicodeType, None), + 3: ('symbol', p.UnicodeType, None), } diff --git a/core/src/trezor/messages/BinanceCoin.py b/core/src/trezor/messages/BinanceCoin.py index 3416723ed..a7787122c 100644 --- a/core/src/trezor/messages/BinanceCoin.py +++ b/core/src/trezor/messages/BinanceCoin.py @@ -14,6 +14,7 @@ class BinanceCoin(p.MessageType): def __init__( self, + *, amount: int = None, denom: str = None, ) -> None: @@ -23,6 +24,6 @@ class BinanceCoin(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('amount', p.SVarintType, 0), - 2: ('denom', p.UnicodeType, 0), + 1: ('amount', p.SVarintType, None), + 2: ('denom', p.UnicodeType, None), } diff --git a/core/src/trezor/messages/BinanceGetAddress.py b/core/src/trezor/messages/BinanceGetAddress.py index 4559e1622..c28627066 100644 --- a/core/src/trezor/messages/BinanceGetAddress.py +++ b/core/src/trezor/messages/BinanceGetAddress.py @@ -15,6 +15,7 @@ class BinanceGetAddress(p.MessageType): def __init__( self, + *, address_n: List[int] = None, show_display: bool = None, ) -> None: @@ -25,5 +26,5 @@ class BinanceGetAddress(p.MessageType): def get_fields(cls) -> Dict: return { 1: ('address_n', p.UVarintType, p.FLAG_REPEATED), - 2: ('show_display', p.BoolType, 0), + 2: ('show_display', p.BoolType, None), } diff --git a/core/src/trezor/messages/BinanceGetPublicKey.py b/core/src/trezor/messages/BinanceGetPublicKey.py index 6febfe150..bee1e9f8c 100644 --- a/core/src/trezor/messages/BinanceGetPublicKey.py +++ b/core/src/trezor/messages/BinanceGetPublicKey.py @@ -15,6 +15,7 @@ class BinanceGetPublicKey(p.MessageType): def __init__( self, + *, address_n: List[int] = None, show_display: bool = None, ) -> None: @@ -25,5 +26,5 @@ class BinanceGetPublicKey(p.MessageType): def get_fields(cls) -> Dict: return { 1: ('address_n', p.UVarintType, p.FLAG_REPEATED), - 2: ('show_display', p.BoolType, 0), + 2: ('show_display', p.BoolType, None), } diff --git a/core/src/trezor/messages/BinanceInputOutput.py b/core/src/trezor/messages/BinanceInputOutput.py index 4544a5fec..6e309e8aa 100644 --- a/core/src/trezor/messages/BinanceInputOutput.py +++ b/core/src/trezor/messages/BinanceInputOutput.py @@ -16,15 +16,16 @@ class BinanceInputOutput(p.MessageType): def __init__( self, - address: str = None, + *, coins: List[BinanceCoin] = None, + address: str = None, ) -> None: - self.address = address self.coins = coins if coins is not None else [] + self.address = address @classmethod def get_fields(cls) -> Dict: return { - 1: ('address', p.UnicodeType, 0), + 1: ('address', p.UnicodeType, None), 2: ('coins', BinanceCoin, p.FLAG_REPEATED), } diff --git a/core/src/trezor/messages/BinanceOrderMsg.py b/core/src/trezor/messages/BinanceOrderMsg.py index 0ba752249..d5005154d 100644 --- a/core/src/trezor/messages/BinanceOrderMsg.py +++ b/core/src/trezor/messages/BinanceOrderMsg.py @@ -18,6 +18,7 @@ class BinanceOrderMsg(p.MessageType): def __init__( self, + *, id: str = None, ordertype: EnumTypeBinanceOrderType = None, price: int = None, @@ -39,12 +40,12 @@ class BinanceOrderMsg(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('id', p.UnicodeType, 0), - 2: ('ordertype', p.EnumType("BinanceOrderType", (0, 1, 2, 3)), 0), - 3: ('price', p.SVarintType, 0), - 4: ('quantity', p.SVarintType, 0), - 5: ('sender', p.UnicodeType, 0), - 6: ('side', p.EnumType("BinanceOrderSide", (0, 1, 2)), 0), - 7: ('symbol', p.UnicodeType, 0), - 8: ('timeinforce', p.EnumType("BinanceTimeInForce", (0, 1, 2, 3)), 0), + 1: ('id', p.UnicodeType, None), + 2: ('ordertype', p.EnumType("BinanceOrderType", (0, 1, 2, 3)), None), + 3: ('price', p.SVarintType, None), + 4: ('quantity', p.SVarintType, None), + 5: ('sender', p.UnicodeType, None), + 6: ('side', p.EnumType("BinanceOrderSide", (0, 1, 2)), None), + 7: ('symbol', p.UnicodeType, None), + 8: ('timeinforce', p.EnumType("BinanceTimeInForce", (0, 1, 2, 3)), None), } diff --git a/core/src/trezor/messages/BinancePublicKey.py b/core/src/trezor/messages/BinancePublicKey.py index 6a6860844..321255685 100644 --- a/core/src/trezor/messages/BinancePublicKey.py +++ b/core/src/trezor/messages/BinancePublicKey.py @@ -15,6 +15,7 @@ class BinancePublicKey(p.MessageType): def __init__( self, + *, public_key: bytes = None, ) -> None: self.public_key = public_key @@ -22,5 +23,5 @@ class BinancePublicKey(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('public_key', p.BytesType, 0), + 1: ('public_key', p.BytesType, None), } diff --git a/core/src/trezor/messages/BinanceSignTx.py b/core/src/trezor/messages/BinanceSignTx.py index 5e3bcdf0c..e542b58bf 100644 --- a/core/src/trezor/messages/BinanceSignTx.py +++ b/core/src/trezor/messages/BinanceSignTx.py @@ -15,6 +15,7 @@ class BinanceSignTx(p.MessageType): def __init__( self, + *, address_n: List[int] = None, msg_count: int = None, account_number: int = None, @@ -35,10 +36,10 @@ class BinanceSignTx(p.MessageType): def get_fields(cls) -> Dict: return { 1: ('address_n', p.UVarintType, p.FLAG_REPEATED), - 2: ('msg_count', p.UVarintType, 0), - 3: ('account_number', p.SVarintType, 0), - 4: ('chain_id', p.UnicodeType, 0), - 5: ('memo', p.UnicodeType, 0), - 6: ('sequence', p.SVarintType, 0), - 7: ('source', p.SVarintType, 0), + 2: ('msg_count', p.UVarintType, None), + 3: ('account_number', p.SVarintType, None), + 4: ('chain_id', p.UnicodeType, None), + 5: ('memo', p.UnicodeType, None), + 6: ('sequence', p.SVarintType, None), + 7: ('source', p.SVarintType, None), } diff --git a/core/src/trezor/messages/BinanceSignedTx.py b/core/src/trezor/messages/BinanceSignedTx.py index 5e1c5cb24..30ce07f6f 100644 --- a/core/src/trezor/messages/BinanceSignedTx.py +++ b/core/src/trezor/messages/BinanceSignedTx.py @@ -15,6 +15,7 @@ class BinanceSignedTx(p.MessageType): def __init__( self, + *, signature: bytes = None, public_key: bytes = None, ) -> None: @@ -24,6 +25,6 @@ class BinanceSignedTx(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('signature', p.BytesType, 0), - 2: ('public_key', p.BytesType, 0), + 1: ('signature', p.BytesType, None), + 2: ('public_key', p.BytesType, None), } diff --git a/core/src/trezor/messages/BinanceTransferMsg.py b/core/src/trezor/messages/BinanceTransferMsg.py index 17e65a605..83b34d594 100644 --- a/core/src/trezor/messages/BinanceTransferMsg.py +++ b/core/src/trezor/messages/BinanceTransferMsg.py @@ -17,6 +17,7 @@ class BinanceTransferMsg(p.MessageType): def __init__( self, + *, inputs: List[BinanceInputOutput] = None, outputs: List[BinanceInputOutput] = None, ) -> None: diff --git a/core/src/trezor/messages/ButtonRequest.py b/core/src/trezor/messages/ButtonRequest.py index 2855f9417..b3f79b555 100644 --- a/core/src/trezor/messages/ButtonRequest.py +++ b/core/src/trezor/messages/ButtonRequest.py @@ -16,6 +16,7 @@ class ButtonRequest(p.MessageType): def __init__( self, + *, code: EnumTypeButtonRequestType = None, ) -> None: self.code = code @@ -23,5 +24,5 @@ class ButtonRequest(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('code', p.EnumType("ButtonRequestType", (1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20)), 0), + 1: ('code', p.EnumType("ButtonRequestType", (1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20)), None), } diff --git a/core/src/trezor/messages/CardanoAddress.py b/core/src/trezor/messages/CardanoAddress.py index 172f7a8d9..bd4b37717 100644 --- a/core/src/trezor/messages/CardanoAddress.py +++ b/core/src/trezor/messages/CardanoAddress.py @@ -15,6 +15,7 @@ class CardanoAddress(p.MessageType): def __init__( self, + *, address: str = None, ) -> None: self.address = address @@ -22,5 +23,5 @@ class CardanoAddress(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('address', p.UnicodeType, 0), + 1: ('address', p.UnicodeType, None), } diff --git a/core/src/trezor/messages/CardanoAddressParametersType.py b/core/src/trezor/messages/CardanoAddressParametersType.py index ae6f4c84a..0e23d56ab 100644 --- a/core/src/trezor/messages/CardanoAddressParametersType.py +++ b/core/src/trezor/messages/CardanoAddressParametersType.py @@ -17,24 +17,25 @@ class CardanoAddressParametersType(p.MessageType): def __init__( self, - address_type: EnumTypeCardanoAddressType = None, + *, 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: - self.address_type = address_type self.address_n = address_n if address_n is not None else [] self.address_n_staking = address_n_staking if address_n_staking is not None else [] + self.address_type = address_type self.staking_key_hash = staking_key_hash self.certificate_pointer = certificate_pointer @classmethod def get_fields(cls) -> Dict: return { - 1: ('address_type', p.EnumType("CardanoAddressType", (0, 1, 2, 3, 4, 5, 6, 7, 8, 14, 15)), 0), + 1: ('address_type', p.EnumType("CardanoAddressType", (0, 1, 2, 3, 4, 5, 6, 7, 8, 14, 15)), None), 2: ('address_n', p.UVarintType, p.FLAG_REPEATED), 3: ('address_n_staking', p.UVarintType, p.FLAG_REPEATED), - 4: ('staking_key_hash', p.BytesType, 0), - 5: ('certificate_pointer', CardanoBlockchainPointerType, 0), + 4: ('staking_key_hash', p.BytesType, None), + 5: ('certificate_pointer', CardanoBlockchainPointerType, None), } diff --git a/core/src/trezor/messages/CardanoBlockchainPointerType.py b/core/src/trezor/messages/CardanoBlockchainPointerType.py index bd55a83f4..c70c2f4b0 100644 --- a/core/src/trezor/messages/CardanoBlockchainPointerType.py +++ b/core/src/trezor/messages/CardanoBlockchainPointerType.py @@ -14,6 +14,7 @@ class CardanoBlockchainPointerType(p.MessageType): def __init__( self, + *, block_index: int = None, tx_index: int = None, certificate_index: int = None, @@ -25,7 +26,7 @@ class CardanoBlockchainPointerType(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('block_index', p.UVarintType, 0), - 2: ('tx_index', p.UVarintType, 0), - 3: ('certificate_index', p.UVarintType, 0), + 1: ('block_index', p.UVarintType, None), + 2: ('tx_index', p.UVarintType, None), + 3: ('certificate_index', p.UVarintType, None), } diff --git a/core/src/trezor/messages/CardanoGetAddress.py b/core/src/trezor/messages/CardanoGetAddress.py index 1db3e45e4..e516b7e9f 100644 --- a/core/src/trezor/messages/CardanoGetAddress.py +++ b/core/src/trezor/messages/CardanoGetAddress.py @@ -17,6 +17,7 @@ class CardanoGetAddress(p.MessageType): def __init__( self, + *, show_display: bool = None, protocol_magic: int = None, network_id: int = None, @@ -30,8 +31,8 @@ class CardanoGetAddress(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 2: ('show_display', p.BoolType, 0), - 3: ('protocol_magic', p.UVarintType, 0), - 4: ('network_id', p.UVarintType, 0), - 5: ('address_parameters', CardanoAddressParametersType, 0), + 2: ('show_display', p.BoolType, None), + 3: ('protocol_magic', p.UVarintType, None), + 4: ('network_id', p.UVarintType, None), + 5: ('address_parameters', CardanoAddressParametersType, None), } diff --git a/core/src/trezor/messages/CardanoGetPublicKey.py b/core/src/trezor/messages/CardanoGetPublicKey.py index cb3464681..9670ab927 100644 --- a/core/src/trezor/messages/CardanoGetPublicKey.py +++ b/core/src/trezor/messages/CardanoGetPublicKey.py @@ -15,6 +15,7 @@ class CardanoGetPublicKey(p.MessageType): def __init__( self, + *, address_n: List[int] = None, show_display: bool = None, ) -> None: @@ -25,5 +26,5 @@ class CardanoGetPublicKey(p.MessageType): def get_fields(cls) -> Dict: return { 1: ('address_n', p.UVarintType, p.FLAG_REPEATED), - 2: ('show_display', p.BoolType, 0), + 2: ('show_display', p.BoolType, None), } diff --git a/core/src/trezor/messages/CardanoPublicKey.py b/core/src/trezor/messages/CardanoPublicKey.py index 904945596..d51bd33cd 100644 --- a/core/src/trezor/messages/CardanoPublicKey.py +++ b/core/src/trezor/messages/CardanoPublicKey.py @@ -17,6 +17,7 @@ class CardanoPublicKey(p.MessageType): def __init__( self, + *, xpub: str = None, node: HDNodeType = None, ) -> None: @@ -26,6 +27,6 @@ class CardanoPublicKey(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('xpub', p.UnicodeType, 0), - 2: ('node', HDNodeType, 0), + 1: ('xpub', p.UnicodeType, None), + 2: ('node', HDNodeType, None), } diff --git a/core/src/trezor/messages/CardanoSignTx.py b/core/src/trezor/messages/CardanoSignTx.py index 09f8528d4..57fc76cce 100644 --- a/core/src/trezor/messages/CardanoSignTx.py +++ b/core/src/trezor/messages/CardanoSignTx.py @@ -20,24 +20,25 @@ class CardanoSignTx(p.MessageType): def __init__( self, + *, 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, - certificates: List[CardanoTxCertificateType] = None, - withdrawals: List[CardanoTxWithdrawalType] = None, metadata: bytes = None, ) -> None: self.inputs = inputs if inputs is not None else [] self.outputs = outputs if outputs is not None else [] + self.certificates = certificates if certificates is not None else [] + 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.certificates = certificates if certificates is not None else [] - self.withdrawals = withdrawals if withdrawals is not None else [] self.metadata = metadata @classmethod @@ -45,11 +46,11 @@ class CardanoSignTx(p.MessageType): return { 1: ('inputs', CardanoTxInputType, p.FLAG_REPEATED), 2: ('outputs', CardanoTxOutputType, p.FLAG_REPEATED), - 5: ('protocol_magic', p.UVarintType, 0), - 6: ('fee', p.UVarintType, 0), - 7: ('ttl', p.UVarintType, 0), - 8: ('network_id', p.UVarintType, 0), + 5: ('protocol_magic', p.UVarintType, None), + 6: ('fee', p.UVarintType, None), + 7: ('ttl', p.UVarintType, None), + 8: ('network_id', p.UVarintType, None), 9: ('certificates', CardanoTxCertificateType, p.FLAG_REPEATED), 10: ('withdrawals', CardanoTxWithdrawalType, p.FLAG_REPEATED), - 11: ('metadata', p.BytesType, 0), + 11: ('metadata', p.BytesType, None), } diff --git a/core/src/trezor/messages/CardanoSignedTx.py b/core/src/trezor/messages/CardanoSignedTx.py index 00ce12f3b..f4f91cc6e 100644 --- a/core/src/trezor/messages/CardanoSignedTx.py +++ b/core/src/trezor/messages/CardanoSignedTx.py @@ -15,6 +15,7 @@ class CardanoSignedTx(p.MessageType): def __init__( self, + *, tx_hash: bytes = None, serialized_tx: bytes = None, ) -> None: @@ -24,6 +25,6 @@ class CardanoSignedTx(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('tx_hash', p.BytesType, 0), - 2: ('serialized_tx', p.BytesType, 0), + 1: ('tx_hash', p.BytesType, None), + 2: ('serialized_tx', p.BytesType, None), } diff --git a/core/src/trezor/messages/CardanoTxCertificateType.py b/core/src/trezor/messages/CardanoTxCertificateType.py index 2f097a078..b817f0e52 100644 --- a/core/src/trezor/messages/CardanoTxCertificateType.py +++ b/core/src/trezor/messages/CardanoTxCertificateType.py @@ -15,18 +15,19 @@ class CardanoTxCertificateType(p.MessageType): def __init__( self, - type: EnumTypeCardanoCertificateType = None, + *, path: List[int] = None, + type: EnumTypeCardanoCertificateType = None, pool: bytes = None, ) -> None: - self.type = type self.path = path if path is not None else [] + self.type = type self.pool = pool @classmethod def get_fields(cls) -> Dict: return { - 1: ('type', p.EnumType("CardanoCertificateType", (0, 1, 2)), 0), + 1: ('type', p.EnumType("CardanoCertificateType", (0, 1, 2)), None), 2: ('path', p.UVarintType, p.FLAG_REPEATED), - 3: ('pool', p.BytesType, 0), + 3: ('pool', p.BytesType, None), } diff --git a/core/src/trezor/messages/CardanoTxInputType.py b/core/src/trezor/messages/CardanoTxInputType.py index 829949f9e..ee2e1cc0f 100644 --- a/core/src/trezor/messages/CardanoTxInputType.py +++ b/core/src/trezor/messages/CardanoTxInputType.py @@ -14,6 +14,7 @@ class CardanoTxInputType(p.MessageType): def __init__( self, + *, address_n: List[int] = None, prev_hash: bytes = None, prev_index: int = None, @@ -26,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, 0), - 3: ('prev_index', p.UVarintType, 0), + 2: ('prev_hash', p.BytesType, None), + 3: ('prev_index', p.UVarintType, None), } diff --git a/core/src/trezor/messages/CardanoTxOutputType.py b/core/src/trezor/messages/CardanoTxOutputType.py index 2837881c5..f9c534375 100644 --- a/core/src/trezor/messages/CardanoTxOutputType.py +++ b/core/src/trezor/messages/CardanoTxOutputType.py @@ -16,6 +16,7 @@ class CardanoTxOutputType(p.MessageType): def __init__( self, + *, address: str = None, amount: int = None, address_parameters: CardanoAddressParametersType = None, @@ -27,7 +28,7 @@ class CardanoTxOutputType(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('address', p.UnicodeType, 0), - 3: ('amount', p.UVarintType, 0), - 4: ('address_parameters', CardanoAddressParametersType, 0), + 1: ('address', p.UnicodeType, None), + 3: ('amount', p.UVarintType, None), + 4: ('address_parameters', CardanoAddressParametersType, None), } diff --git a/core/src/trezor/messages/CardanoTxWithdrawalType.py b/core/src/trezor/messages/CardanoTxWithdrawalType.py index d7d7c5211..a5b8a4554 100644 --- a/core/src/trezor/messages/CardanoTxWithdrawalType.py +++ b/core/src/trezor/messages/CardanoTxWithdrawalType.py @@ -14,6 +14,7 @@ class CardanoTxWithdrawalType(p.MessageType): def __init__( self, + *, path: List[int] = None, amount: int = None, ) -> None: @@ -24,5 +25,5 @@ class CardanoTxWithdrawalType(p.MessageType): def get_fields(cls) -> Dict: return { 1: ('path', p.UVarintType, p.FLAG_REPEATED), - 2: ('amount', p.UVarintType, 0), + 2: ('amount', p.UVarintType, None), } diff --git a/core/src/trezor/messages/ChangePin.py b/core/src/trezor/messages/ChangePin.py index 1248b9505..e085980db 100644 --- a/core/src/trezor/messages/ChangePin.py +++ b/core/src/trezor/messages/ChangePin.py @@ -15,6 +15,7 @@ class ChangePin(p.MessageType): def __init__( self, + *, remove: bool = None, ) -> None: self.remove = remove @@ -22,5 +23,5 @@ class ChangePin(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('remove', p.BoolType, 0), + 1: ('remove', p.BoolType, None), } diff --git a/core/src/trezor/messages/ChangeWipeCode.py b/core/src/trezor/messages/ChangeWipeCode.py index 0d1285fc4..16de08d86 100644 --- a/core/src/trezor/messages/ChangeWipeCode.py +++ b/core/src/trezor/messages/ChangeWipeCode.py @@ -15,6 +15,7 @@ class ChangeWipeCode(p.MessageType): def __init__( self, + *, remove: bool = None, ) -> None: self.remove = remove @@ -22,5 +23,5 @@ class ChangeWipeCode(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('remove', p.BoolType, 0), + 1: ('remove', p.BoolType, None), } diff --git a/core/src/trezor/messages/CipherKeyValue.py b/core/src/trezor/messages/CipherKeyValue.py index 504e3343e..9a281188a 100644 --- a/core/src/trezor/messages/CipherKeyValue.py +++ b/core/src/trezor/messages/CipherKeyValue.py @@ -15,6 +15,7 @@ class CipherKeyValue(p.MessageType): def __init__( self, + *, address_n: List[int] = None, key: str = None, value: bytes = None, @@ -35,10 +36,10 @@ class CipherKeyValue(p.MessageType): def get_fields(cls) -> Dict: return { 1: ('address_n', p.UVarintType, p.FLAG_REPEATED), - 2: ('key', p.UnicodeType, 0), - 3: ('value', p.BytesType, 0), - 4: ('encrypt', p.BoolType, 0), - 5: ('ask_on_encrypt', p.BoolType, 0), - 6: ('ask_on_decrypt', p.BoolType, 0), - 7: ('iv', p.BytesType, 0), + 2: ('key', p.UnicodeType, None), + 3: ('value', p.BytesType, None), + 4: ('encrypt', p.BoolType, None), + 5: ('ask_on_encrypt', p.BoolType, None), + 6: ('ask_on_decrypt', p.BoolType, None), + 7: ('iv', p.BytesType, None), } diff --git a/core/src/trezor/messages/CipheredKeyValue.py b/core/src/trezor/messages/CipheredKeyValue.py index f24f39792..e2a6edc70 100644 --- a/core/src/trezor/messages/CipheredKeyValue.py +++ b/core/src/trezor/messages/CipheredKeyValue.py @@ -15,6 +15,7 @@ class CipheredKeyValue(p.MessageType): def __init__( self, + *, value: bytes = None, ) -> None: self.value = value @@ -22,5 +23,5 @@ class CipheredKeyValue(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('value', p.BytesType, 0), + 1: ('value', p.BytesType, None), } diff --git a/core/src/trezor/messages/DebugLinkDecision.py b/core/src/trezor/messages/DebugLinkDecision.py index 715269cc3..aaf534df9 100644 --- a/core/src/trezor/messages/DebugLinkDecision.py +++ b/core/src/trezor/messages/DebugLinkDecision.py @@ -16,6 +16,7 @@ class DebugLinkDecision(p.MessageType): def __init__( self, + *, yes_no: bool = None, swipe: EnumTypeDebugSwipeDirection = None, input: str = None, @@ -33,10 +34,10 @@ class DebugLinkDecision(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('yes_no', p.BoolType, 0), - 2: ('swipe', p.EnumType("DebugSwipeDirection", (0, 1, 2, 3)), 0), - 3: ('input', p.UnicodeType, 0), - 4: ('x', p.UVarintType, 0), - 5: ('y', p.UVarintType, 0), - 6: ('wait', p.BoolType, 0), + 1: ('yes_no', p.BoolType, None), + 2: ('swipe', p.EnumType("DebugSwipeDirection", (0, 1, 2, 3)), None), + 3: ('input', p.UnicodeType, None), + 4: ('x', p.UVarintType, None), + 5: ('y', p.UVarintType, None), + 6: ('wait', p.BoolType, None), } diff --git a/core/src/trezor/messages/DebugLinkEraseSdCard.py b/core/src/trezor/messages/DebugLinkEraseSdCard.py index 58a090d26..d920b0103 100644 --- a/core/src/trezor/messages/DebugLinkEraseSdCard.py +++ b/core/src/trezor/messages/DebugLinkEraseSdCard.py @@ -15,6 +15,7 @@ class DebugLinkEraseSdCard(p.MessageType): def __init__( self, + *, format: bool = None, ) -> None: self.format = format @@ -22,5 +23,5 @@ class DebugLinkEraseSdCard(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('format', p.BoolType, 0), + 1: ('format', p.BoolType, None), } diff --git a/core/src/trezor/messages/DebugLinkGetState.py b/core/src/trezor/messages/DebugLinkGetState.py index 0eb5d7278..780bde309 100644 --- a/core/src/trezor/messages/DebugLinkGetState.py +++ b/core/src/trezor/messages/DebugLinkGetState.py @@ -15,6 +15,7 @@ class DebugLinkGetState(p.MessageType): def __init__( self, + *, wait_word_list: bool = None, wait_word_pos: bool = None, wait_layout: bool = None, @@ -26,7 +27,7 @@ class DebugLinkGetState(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('wait_word_list', p.BoolType, 0), - 2: ('wait_word_pos', p.BoolType, 0), - 3: ('wait_layout', p.BoolType, 0), + 1: ('wait_word_list', p.BoolType, None), + 2: ('wait_word_pos', p.BoolType, None), + 3: ('wait_layout', p.BoolType, None), } diff --git a/core/src/trezor/messages/DebugLinkLayout.py b/core/src/trezor/messages/DebugLinkLayout.py index 8fca66cd2..abb0f695d 100644 --- a/core/src/trezor/messages/DebugLinkLayout.py +++ b/core/src/trezor/messages/DebugLinkLayout.py @@ -15,6 +15,7 @@ class DebugLinkLayout(p.MessageType): def __init__( self, + *, lines: List[str] = None, ) -> None: self.lines = lines if lines is not None else [] diff --git a/core/src/trezor/messages/DebugLinkRecordScreen.py b/core/src/trezor/messages/DebugLinkRecordScreen.py index a1d72c45a..15021f4c7 100644 --- a/core/src/trezor/messages/DebugLinkRecordScreen.py +++ b/core/src/trezor/messages/DebugLinkRecordScreen.py @@ -15,6 +15,7 @@ class DebugLinkRecordScreen(p.MessageType): def __init__( self, + *, target_directory: str = None, ) -> None: self.target_directory = target_directory @@ -22,5 +23,5 @@ class DebugLinkRecordScreen(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('target_directory', p.UnicodeType, 0), + 1: ('target_directory', p.UnicodeType, None), } diff --git a/core/src/trezor/messages/DebugLinkReseedRandom.py b/core/src/trezor/messages/DebugLinkReseedRandom.py index 0ffaf6d46..bf94bd06e 100644 --- a/core/src/trezor/messages/DebugLinkReseedRandom.py +++ b/core/src/trezor/messages/DebugLinkReseedRandom.py @@ -15,6 +15,7 @@ class DebugLinkReseedRandom(p.MessageType): def __init__( self, + *, value: int = None, ) -> None: self.value = value @@ -22,5 +23,5 @@ class DebugLinkReseedRandom(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('value', p.UVarintType, 0), + 1: ('value', p.UVarintType, None), } diff --git a/core/src/trezor/messages/DebugLinkShowText.py b/core/src/trezor/messages/DebugLinkShowText.py index 00a3a3f2f..9098e247b 100644 --- a/core/src/trezor/messages/DebugLinkShowText.py +++ b/core/src/trezor/messages/DebugLinkShowText.py @@ -17,21 +17,22 @@ class DebugLinkShowText(p.MessageType): def __init__( self, - header_text: str = None, + *, body_text: List[DebugLinkShowTextItem] = None, + header_text: str = None, header_icon: str = None, icon_color: str = None, ) -> None: - self.header_text = header_text self.body_text = body_text if body_text is not None else [] + self.header_text = header_text self.header_icon = header_icon self.icon_color = icon_color @classmethod def get_fields(cls) -> Dict: return { - 1: ('header_text', p.UnicodeType, 0), + 1: ('header_text', p.UnicodeType, None), 2: ('body_text', DebugLinkShowTextItem, p.FLAG_REPEATED), - 3: ('header_icon', p.UnicodeType, 0), - 4: ('icon_color', p.UnicodeType, 0), + 3: ('header_icon', p.UnicodeType, None), + 4: ('icon_color', p.UnicodeType, None), } diff --git a/core/src/trezor/messages/DebugLinkShowTextItem.py b/core/src/trezor/messages/DebugLinkShowTextItem.py index 6211e7d27..bd714f515 100644 --- a/core/src/trezor/messages/DebugLinkShowTextItem.py +++ b/core/src/trezor/messages/DebugLinkShowTextItem.py @@ -15,6 +15,7 @@ class DebugLinkShowTextItem(p.MessageType): def __init__( self, + *, style: EnumTypeDebugLinkShowTextStyle = None, content: str = None, ) -> None: @@ -24,6 +25,6 @@ class DebugLinkShowTextItem(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('style', p.EnumType("DebugLinkShowTextStyle", (0, 1, 2, 4, 5, 6)), 0), - 2: ('content', p.UnicodeType, 0), + 1: ('style', p.EnumType("DebugLinkShowTextStyle", (0, 1, 2, 4, 5, 6)), None), + 2: ('content', p.UnicodeType, None), } diff --git a/core/src/trezor/messages/DebugLinkState.py b/core/src/trezor/messages/DebugLinkState.py index 2c7a17fcf..4d373cce0 100644 --- a/core/src/trezor/messages/DebugLinkState.py +++ b/core/src/trezor/messages/DebugLinkState.py @@ -17,6 +17,8 @@ class DebugLinkState(p.MessageType): def __init__( self, + *, + layout_lines: List[str] = None, layout: bytes = None, pin: str = None, matrix: str = None, @@ -29,8 +31,8 @@ class DebugLinkState(p.MessageType): recovery_word_pos: int = None, reset_word_pos: int = None, mnemonic_type: int = None, - layout_lines: List[str] = None, ) -> None: + self.layout_lines = layout_lines if layout_lines is not None else [] self.layout = layout self.pin = pin self.matrix = matrix @@ -43,22 +45,21 @@ class DebugLinkState(p.MessageType): self.recovery_word_pos = recovery_word_pos self.reset_word_pos = reset_word_pos self.mnemonic_type = mnemonic_type - self.layout_lines = layout_lines if layout_lines is not None else [] @classmethod def get_fields(cls) -> Dict: return { - 1: ('layout', p.BytesType, 0), - 2: ('pin', p.UnicodeType, 0), - 3: ('matrix', p.UnicodeType, 0), - 4: ('mnemonic_secret', p.BytesType, 0), - 5: ('node', HDNodeType, 0), - 6: ('passphrase_protection', p.BoolType, 0), - 7: ('reset_word', p.UnicodeType, 0), - 8: ('reset_entropy', p.BytesType, 0), - 9: ('recovery_fake_word', p.UnicodeType, 0), - 10: ('recovery_word_pos', p.UVarintType, 0), - 11: ('reset_word_pos', p.UVarintType, 0), - 12: ('mnemonic_type', p.UVarintType, 0), + 1: ('layout', p.BytesType, None), + 2: ('pin', p.UnicodeType, None), + 3: ('matrix', p.UnicodeType, None), + 4: ('mnemonic_secret', p.BytesType, None), + 5: ('node', HDNodeType, None), + 6: ('passphrase_protection', p.BoolType, None), + 7: ('reset_word', p.UnicodeType, None), + 8: ('reset_entropy', p.BytesType, None), + 9: ('recovery_fake_word', p.UnicodeType, None), + 10: ('recovery_word_pos', p.UVarintType, None), + 11: ('reset_word_pos', p.UVarintType, None), + 12: ('mnemonic_type', p.UVarintType, None), 13: ('layout_lines', p.UnicodeType, p.FLAG_REPEATED), } diff --git a/core/src/trezor/messages/DebugLinkWatchLayout.py b/core/src/trezor/messages/DebugLinkWatchLayout.py index 27ff8254d..74bc91c9c 100644 --- a/core/src/trezor/messages/DebugLinkWatchLayout.py +++ b/core/src/trezor/messages/DebugLinkWatchLayout.py @@ -15,6 +15,7 @@ class DebugLinkWatchLayout(p.MessageType): def __init__( self, + *, watch: bool = None, ) -> None: self.watch = watch @@ -22,5 +23,5 @@ class DebugLinkWatchLayout(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('watch', p.BoolType, 0), + 1: ('watch', p.BoolType, None), } diff --git a/core/src/trezor/messages/DebugMoneroDiagAck.py b/core/src/trezor/messages/DebugMoneroDiagAck.py index f34b701ad..54b7ad2d5 100644 --- a/core/src/trezor/messages/DebugMoneroDiagAck.py +++ b/core/src/trezor/messages/DebugMoneroDiagAck.py @@ -15,27 +15,28 @@ class DebugMoneroDiagAck(p.MessageType): def __init__( self, + *, + pd: List[int] = None, ins: int = None, p1: int = None, p2: int = None, - pd: List[int] = None, data1: bytes = None, data2: bytes = None, ) -> None: + self.pd = pd if pd is not None else [] self.ins = ins self.p1 = p1 self.p2 = p2 - self.pd = pd if pd is not None else [] self.data1 = data1 self.data2 = data2 @classmethod def get_fields(cls) -> Dict: return { - 1: ('ins', p.UVarintType, 0), - 2: ('p1', p.UVarintType, 0), - 3: ('p2', p.UVarintType, 0), + 1: ('ins', p.UVarintType, None), + 2: ('p1', p.UVarintType, None), + 3: ('p2', p.UVarintType, None), 4: ('pd', p.UVarintType, p.FLAG_REPEATED), - 5: ('data1', p.BytesType, 0), - 6: ('data2', p.BytesType, 0), + 5: ('data1', p.BytesType, None), + 6: ('data2', p.BytesType, None), } diff --git a/core/src/trezor/messages/DebugMoneroDiagRequest.py b/core/src/trezor/messages/DebugMoneroDiagRequest.py index b935ce03d..34dded1c7 100644 --- a/core/src/trezor/messages/DebugMoneroDiagRequest.py +++ b/core/src/trezor/messages/DebugMoneroDiagRequest.py @@ -15,27 +15,28 @@ class DebugMoneroDiagRequest(p.MessageType): def __init__( self, + *, + pd: List[int] = None, ins: int = None, p1: int = None, p2: int = None, - pd: List[int] = None, data1: bytes = None, data2: bytes = None, ) -> None: + self.pd = pd if pd is not None else [] self.ins = ins self.p1 = p1 self.p2 = p2 - self.pd = pd if pd is not None else [] self.data1 = data1 self.data2 = data2 @classmethod def get_fields(cls) -> Dict: return { - 1: ('ins', p.UVarintType, 0), - 2: ('p1', p.UVarintType, 0), - 3: ('p2', p.UVarintType, 0), + 1: ('ins', p.UVarintType, None), + 2: ('p1', p.UVarintType, None), + 3: ('p2', p.UVarintType, None), 4: ('pd', p.UVarintType, p.FLAG_REPEATED), - 5: ('data1', p.BytesType, 0), - 6: ('data2', p.BytesType, 0), + 5: ('data1', p.BytesType, None), + 6: ('data2', p.BytesType, None), } diff --git a/core/src/trezor/messages/Deprecated_PassphraseStateRequest.py b/core/src/trezor/messages/Deprecated_PassphraseStateRequest.py index 3699eab13..ad73b1c56 100644 --- a/core/src/trezor/messages/Deprecated_PassphraseStateRequest.py +++ b/core/src/trezor/messages/Deprecated_PassphraseStateRequest.py @@ -15,6 +15,7 @@ class Deprecated_PassphraseStateRequest(p.MessageType): def __init__( self, + *, state: bytes = None, ) -> None: self.state = state @@ -22,5 +23,5 @@ class Deprecated_PassphraseStateRequest(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('state', p.BytesType, 0), + 1: ('state', p.BytesType, None), } diff --git a/core/src/trezor/messages/ECDHSessionKey.py b/core/src/trezor/messages/ECDHSessionKey.py index 4c9785891..153f1aa66 100644 --- a/core/src/trezor/messages/ECDHSessionKey.py +++ b/core/src/trezor/messages/ECDHSessionKey.py @@ -15,6 +15,7 @@ class ECDHSessionKey(p.MessageType): def __init__( self, + *, session_key: bytes = None, ) -> None: self.session_key = session_key @@ -22,5 +23,5 @@ class ECDHSessionKey(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('session_key', p.BytesType, 0), + 1: ('session_key', p.BytesType, None), } diff --git a/core/src/trezor/messages/Entropy.py b/core/src/trezor/messages/Entropy.py index 120f8ffd0..49679d888 100644 --- a/core/src/trezor/messages/Entropy.py +++ b/core/src/trezor/messages/Entropy.py @@ -15,12 +15,13 @@ class Entropy(p.MessageType): def __init__( self, - entropy: bytes = None, + *, + entropy: bytes, ) -> None: self.entropy = entropy @classmethod def get_fields(cls) -> Dict: return { - 1: ('entropy', p.BytesType, 0), # required + 1: ('entropy', p.BytesType, p.FLAG_REQUIRED), } diff --git a/core/src/trezor/messages/EntropyAck.py b/core/src/trezor/messages/EntropyAck.py index 2e783e741..9ea7ae61b 100644 --- a/core/src/trezor/messages/EntropyAck.py +++ b/core/src/trezor/messages/EntropyAck.py @@ -15,6 +15,7 @@ class EntropyAck(p.MessageType): def __init__( self, + *, entropy: bytes = None, ) -> None: self.entropy = entropy @@ -22,5 +23,5 @@ class EntropyAck(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('entropy', p.BytesType, 0), + 1: ('entropy', p.BytesType, None), } diff --git a/core/src/trezor/messages/EosActionBuyRam.py b/core/src/trezor/messages/EosActionBuyRam.py index e19b112fa..f3e485199 100644 --- a/core/src/trezor/messages/EosActionBuyRam.py +++ b/core/src/trezor/messages/EosActionBuyRam.py @@ -16,6 +16,7 @@ class EosActionBuyRam(p.MessageType): def __init__( self, + *, payer: int = None, receiver: int = None, quantity: EosAsset = None, @@ -27,7 +28,7 @@ class EosActionBuyRam(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('payer', p.UVarintType, 0), - 2: ('receiver', p.UVarintType, 0), - 3: ('quantity', EosAsset, 0), + 1: ('payer', p.UVarintType, None), + 2: ('receiver', p.UVarintType, None), + 3: ('quantity', EosAsset, None), } diff --git a/core/src/trezor/messages/EosActionBuyRamBytes.py b/core/src/trezor/messages/EosActionBuyRamBytes.py index e330663a6..f2bc49750 100644 --- a/core/src/trezor/messages/EosActionBuyRamBytes.py +++ b/core/src/trezor/messages/EosActionBuyRamBytes.py @@ -14,6 +14,7 @@ class EosActionBuyRamBytes(p.MessageType): def __init__( self, + *, payer: int = None, receiver: int = None, bytes: int = None, @@ -25,7 +26,7 @@ class EosActionBuyRamBytes(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('payer', p.UVarintType, 0), - 2: ('receiver', p.UVarintType, 0), - 3: ('bytes', p.UVarintType, 0), + 1: ('payer', p.UVarintType, None), + 2: ('receiver', p.UVarintType, None), + 3: ('bytes', p.UVarintType, None), } diff --git a/core/src/trezor/messages/EosActionCommon.py b/core/src/trezor/messages/EosActionCommon.py index 58cb5ce6e..9e512130b 100644 --- a/core/src/trezor/messages/EosActionCommon.py +++ b/core/src/trezor/messages/EosActionCommon.py @@ -16,18 +16,19 @@ class EosActionCommon(p.MessageType): def __init__( self, + *, + authorization: List[EosPermissionLevel] = None, account: int = None, name: int = None, - authorization: List[EosPermissionLevel] = None, ) -> None: + self.authorization = authorization if authorization is not None else [] self.account = account self.name = name - self.authorization = authorization if authorization is not None else [] @classmethod def get_fields(cls) -> Dict: return { - 1: ('account', p.UVarintType, 0), - 2: ('name', p.UVarintType, 0), + 1: ('account', p.UVarintType, None), + 2: ('name', p.UVarintType, None), 3: ('authorization', EosPermissionLevel, p.FLAG_REPEATED), } diff --git a/core/src/trezor/messages/EosActionDelegate.py b/core/src/trezor/messages/EosActionDelegate.py index c9b4d9bfc..82df458bf 100644 --- a/core/src/trezor/messages/EosActionDelegate.py +++ b/core/src/trezor/messages/EosActionDelegate.py @@ -16,6 +16,7 @@ class EosActionDelegate(p.MessageType): def __init__( self, + *, sender: int = None, receiver: int = None, net_quantity: EosAsset = None, @@ -31,9 +32,9 @@ class EosActionDelegate(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('sender', p.UVarintType, 0), - 2: ('receiver', p.UVarintType, 0), - 3: ('net_quantity', EosAsset, 0), - 4: ('cpu_quantity', EosAsset, 0), - 5: ('transfer', p.BoolType, 0), + 1: ('sender', p.UVarintType, None), + 2: ('receiver', p.UVarintType, None), + 3: ('net_quantity', EosAsset, None), + 4: ('cpu_quantity', EosAsset, None), + 5: ('transfer', p.BoolType, None), } diff --git a/core/src/trezor/messages/EosActionDeleteAuth.py b/core/src/trezor/messages/EosActionDeleteAuth.py index 790b98050..ce0401dff 100644 --- a/core/src/trezor/messages/EosActionDeleteAuth.py +++ b/core/src/trezor/messages/EosActionDeleteAuth.py @@ -14,6 +14,7 @@ class EosActionDeleteAuth(p.MessageType): def __init__( self, + *, account: int = None, permission: int = None, ) -> None: @@ -23,6 +24,6 @@ class EosActionDeleteAuth(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('account', p.UVarintType, 0), - 2: ('permission', p.UVarintType, 0), + 1: ('account', p.UVarintType, None), + 2: ('permission', p.UVarintType, None), } diff --git a/core/src/trezor/messages/EosActionLinkAuth.py b/core/src/trezor/messages/EosActionLinkAuth.py index 387218b0e..ee845ab04 100644 --- a/core/src/trezor/messages/EosActionLinkAuth.py +++ b/core/src/trezor/messages/EosActionLinkAuth.py @@ -14,6 +14,7 @@ class EosActionLinkAuth(p.MessageType): def __init__( self, + *, account: int = None, code: int = None, type: int = None, @@ -27,8 +28,8 @@ class EosActionLinkAuth(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('account', p.UVarintType, 0), - 2: ('code', p.UVarintType, 0), - 3: ('type', p.UVarintType, 0), - 4: ('requirement', p.UVarintType, 0), + 1: ('account', p.UVarintType, None), + 2: ('code', p.UVarintType, None), + 3: ('type', p.UVarintType, None), + 4: ('requirement', p.UVarintType, None), } diff --git a/core/src/trezor/messages/EosActionNewAccount.py b/core/src/trezor/messages/EosActionNewAccount.py index 8d1f5304a..3eec6b99f 100644 --- a/core/src/trezor/messages/EosActionNewAccount.py +++ b/core/src/trezor/messages/EosActionNewAccount.py @@ -16,6 +16,7 @@ class EosActionNewAccount(p.MessageType): def __init__( self, + *, creator: int = None, name: int = None, owner: EosAuthorization = None, @@ -29,8 +30,8 @@ class EosActionNewAccount(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('creator', p.UVarintType, 0), - 2: ('name', p.UVarintType, 0), - 3: ('owner', EosAuthorization, 0), - 4: ('active', EosAuthorization, 0), + 1: ('creator', p.UVarintType, None), + 2: ('name', p.UVarintType, None), + 3: ('owner', EosAuthorization, None), + 4: ('active', EosAuthorization, None), } diff --git a/core/src/trezor/messages/EosActionRefund.py b/core/src/trezor/messages/EosActionRefund.py index c9aec763c..b16bb5760 100644 --- a/core/src/trezor/messages/EosActionRefund.py +++ b/core/src/trezor/messages/EosActionRefund.py @@ -14,6 +14,7 @@ class EosActionRefund(p.MessageType): def __init__( self, + *, owner: int = None, ) -> None: self.owner = owner @@ -21,5 +22,5 @@ class EosActionRefund(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('owner', p.UVarintType, 0), + 1: ('owner', p.UVarintType, None), } diff --git a/core/src/trezor/messages/EosActionSellRam.py b/core/src/trezor/messages/EosActionSellRam.py index 40e5c472e..033256670 100644 --- a/core/src/trezor/messages/EosActionSellRam.py +++ b/core/src/trezor/messages/EosActionSellRam.py @@ -14,6 +14,7 @@ class EosActionSellRam(p.MessageType): def __init__( self, + *, account: int = None, bytes: int = None, ) -> None: @@ -23,6 +24,6 @@ class EosActionSellRam(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('account', p.UVarintType, 0), - 2: ('bytes', p.UVarintType, 0), + 1: ('account', p.UVarintType, None), + 2: ('bytes', p.UVarintType, None), } diff --git a/core/src/trezor/messages/EosActionTransfer.py b/core/src/trezor/messages/EosActionTransfer.py index 7bb0253c1..62faaf5f4 100644 --- a/core/src/trezor/messages/EosActionTransfer.py +++ b/core/src/trezor/messages/EosActionTransfer.py @@ -16,6 +16,7 @@ class EosActionTransfer(p.MessageType): def __init__( self, + *, sender: int = None, receiver: int = None, quantity: EosAsset = None, @@ -29,8 +30,8 @@ class EosActionTransfer(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('sender', p.UVarintType, 0), - 2: ('receiver', p.UVarintType, 0), - 3: ('quantity', EosAsset, 0), - 4: ('memo', p.UnicodeType, 0), + 1: ('sender', p.UVarintType, None), + 2: ('receiver', p.UVarintType, None), + 3: ('quantity', EosAsset, None), + 4: ('memo', p.UnicodeType, None), } diff --git a/core/src/trezor/messages/EosActionUndelegate.py b/core/src/trezor/messages/EosActionUndelegate.py index 4030bac14..3a40e9821 100644 --- a/core/src/trezor/messages/EosActionUndelegate.py +++ b/core/src/trezor/messages/EosActionUndelegate.py @@ -16,6 +16,7 @@ class EosActionUndelegate(p.MessageType): def __init__( self, + *, sender: int = None, receiver: int = None, net_quantity: EosAsset = None, @@ -29,8 +30,8 @@ class EosActionUndelegate(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('sender', p.UVarintType, 0), - 2: ('receiver', p.UVarintType, 0), - 3: ('net_quantity', EosAsset, 0), - 4: ('cpu_quantity', EosAsset, 0), + 1: ('sender', p.UVarintType, None), + 2: ('receiver', p.UVarintType, None), + 3: ('net_quantity', EosAsset, None), + 4: ('cpu_quantity', EosAsset, None), } diff --git a/core/src/trezor/messages/EosActionUnknown.py b/core/src/trezor/messages/EosActionUnknown.py index 536ad817a..fcbf8770b 100644 --- a/core/src/trezor/messages/EosActionUnknown.py +++ b/core/src/trezor/messages/EosActionUnknown.py @@ -14,6 +14,7 @@ class EosActionUnknown(p.MessageType): def __init__( self, + *, data_size: int = None, data_chunk: bytes = None, ) -> None: @@ -23,6 +24,6 @@ class EosActionUnknown(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('data_size', p.UVarintType, 0), - 2: ('data_chunk', p.BytesType, 0), + 1: ('data_size', p.UVarintType, None), + 2: ('data_chunk', p.BytesType, None), } diff --git a/core/src/trezor/messages/EosActionUnlinkAuth.py b/core/src/trezor/messages/EosActionUnlinkAuth.py index 7058e1ad8..b6a768878 100644 --- a/core/src/trezor/messages/EosActionUnlinkAuth.py +++ b/core/src/trezor/messages/EosActionUnlinkAuth.py @@ -14,6 +14,7 @@ class EosActionUnlinkAuth(p.MessageType): def __init__( self, + *, account: int = None, code: int = None, type: int = None, @@ -25,7 +26,7 @@ class EosActionUnlinkAuth(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('account', p.UVarintType, 0), - 2: ('code', p.UVarintType, 0), - 3: ('type', p.UVarintType, 0), + 1: ('account', p.UVarintType, None), + 2: ('code', p.UVarintType, None), + 3: ('type', p.UVarintType, None), } diff --git a/core/src/trezor/messages/EosActionUpdateAuth.py b/core/src/trezor/messages/EosActionUpdateAuth.py index ec823fa0b..c4e86ed9a 100644 --- a/core/src/trezor/messages/EosActionUpdateAuth.py +++ b/core/src/trezor/messages/EosActionUpdateAuth.py @@ -16,6 +16,7 @@ class EosActionUpdateAuth(p.MessageType): def __init__( self, + *, account: int = None, permission: int = None, parent: int = None, @@ -29,8 +30,8 @@ class EosActionUpdateAuth(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('account', p.UVarintType, 0), - 2: ('permission', p.UVarintType, 0), - 3: ('parent', p.UVarintType, 0), - 4: ('auth', EosAuthorization, 0), + 1: ('account', p.UVarintType, None), + 2: ('permission', p.UVarintType, None), + 3: ('parent', p.UVarintType, None), + 4: ('auth', EosAuthorization, None), } diff --git a/core/src/trezor/messages/EosActionVoteProducer.py b/core/src/trezor/messages/EosActionVoteProducer.py index 54930e8bc..6bf43e6ab 100644 --- a/core/src/trezor/messages/EosActionVoteProducer.py +++ b/core/src/trezor/messages/EosActionVoteProducer.py @@ -14,18 +14,19 @@ class EosActionVoteProducer(p.MessageType): def __init__( self, + *, + producers: List[int] = None, voter: int = None, proxy: int = None, - producers: List[int] = None, ) -> None: + self.producers = producers if producers is not None else [] self.voter = voter self.proxy = proxy - self.producers = producers if producers is not None else [] @classmethod def get_fields(cls) -> Dict: return { - 1: ('voter', p.UVarintType, 0), - 2: ('proxy', p.UVarintType, 0), + 1: ('voter', p.UVarintType, None), + 2: ('proxy', p.UVarintType, None), 3: ('producers', p.UVarintType, p.FLAG_REPEATED), } diff --git a/core/src/trezor/messages/EosAsset.py b/core/src/trezor/messages/EosAsset.py index 472303b24..b7238f4a5 100644 --- a/core/src/trezor/messages/EosAsset.py +++ b/core/src/trezor/messages/EosAsset.py @@ -14,6 +14,7 @@ class EosAsset(p.MessageType): def __init__( self, + *, amount: int = None, symbol: int = None, ) -> None: @@ -23,6 +24,6 @@ class EosAsset(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('amount', p.SVarintType, 0), - 2: ('symbol', p.UVarintType, 0), + 1: ('amount', p.SVarintType, None), + 2: ('symbol', p.UVarintType, None), } diff --git a/core/src/trezor/messages/EosAuthorization.py b/core/src/trezor/messages/EosAuthorization.py index d41bbd7ca..1ccfc4bf1 100644 --- a/core/src/trezor/messages/EosAuthorization.py +++ b/core/src/trezor/messages/EosAuthorization.py @@ -18,20 +18,21 @@ class EosAuthorization(p.MessageType): def __init__( self, - threshold: int = None, + *, keys: List[EosAuthorizationKey] = None, accounts: List[EosAuthorizationAccount] = None, waits: List[EosAuthorizationWait] = None, + threshold: int = None, ) -> None: - self.threshold = threshold self.keys = keys if keys is not None else [] self.accounts = accounts if accounts is not None else [] self.waits = waits if waits is not None else [] + self.threshold = threshold @classmethod def get_fields(cls) -> Dict: return { - 1: ('threshold', p.UVarintType, 0), + 1: ('threshold', p.UVarintType, None), 2: ('keys', EosAuthorizationKey, p.FLAG_REPEATED), 3: ('accounts', EosAuthorizationAccount, p.FLAG_REPEATED), 4: ('waits', EosAuthorizationWait, p.FLAG_REPEATED), diff --git a/core/src/trezor/messages/EosAuthorizationAccount.py b/core/src/trezor/messages/EosAuthorizationAccount.py index bf40b02b5..255dc4d90 100644 --- a/core/src/trezor/messages/EosAuthorizationAccount.py +++ b/core/src/trezor/messages/EosAuthorizationAccount.py @@ -16,6 +16,7 @@ class EosAuthorizationAccount(p.MessageType): def __init__( self, + *, account: EosPermissionLevel = None, weight: int = None, ) -> None: @@ -25,6 +26,6 @@ class EosAuthorizationAccount(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('account', EosPermissionLevel, 0), - 2: ('weight', p.UVarintType, 0), + 1: ('account', EosPermissionLevel, None), + 2: ('weight', p.UVarintType, None), } diff --git a/core/src/trezor/messages/EosAuthorizationKey.py b/core/src/trezor/messages/EosAuthorizationKey.py index 7a87eaec4..e8632bbf3 100644 --- a/core/src/trezor/messages/EosAuthorizationKey.py +++ b/core/src/trezor/messages/EosAuthorizationKey.py @@ -14,21 +14,22 @@ class EosAuthorizationKey(p.MessageType): def __init__( self, + *, + address_n: List[int] = None, type: int = None, key: bytes = None, - address_n: List[int] = None, weight: int = None, ) -> None: + self.address_n = address_n if address_n is not None else [] self.type = type self.key = key - self.address_n = address_n if address_n is not None else [] self.weight = weight @classmethod def get_fields(cls) -> Dict: return { - 1: ('type', p.UVarintType, 0), - 2: ('key', p.BytesType, 0), + 1: ('type', p.UVarintType, None), + 2: ('key', p.BytesType, None), 3: ('address_n', p.UVarintType, p.FLAG_REPEATED), - 4: ('weight', p.UVarintType, 0), + 4: ('weight', p.UVarintType, None), } diff --git a/core/src/trezor/messages/EosAuthorizationWait.py b/core/src/trezor/messages/EosAuthorizationWait.py index 1662a6b74..42c9b9437 100644 --- a/core/src/trezor/messages/EosAuthorizationWait.py +++ b/core/src/trezor/messages/EosAuthorizationWait.py @@ -14,6 +14,7 @@ class EosAuthorizationWait(p.MessageType): def __init__( self, + *, wait_sec: int = None, weight: int = None, ) -> None: @@ -23,6 +24,6 @@ class EosAuthorizationWait(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('wait_sec', p.UVarintType, 0), - 2: ('weight', p.UVarintType, 0), + 1: ('wait_sec', p.UVarintType, None), + 2: ('weight', p.UVarintType, None), } diff --git a/core/src/trezor/messages/EosGetPublicKey.py b/core/src/trezor/messages/EosGetPublicKey.py index 96eb56acf..9bb8a92b0 100644 --- a/core/src/trezor/messages/EosGetPublicKey.py +++ b/core/src/trezor/messages/EosGetPublicKey.py @@ -15,6 +15,7 @@ class EosGetPublicKey(p.MessageType): def __init__( self, + *, address_n: List[int] = None, show_display: bool = None, ) -> None: @@ -25,5 +26,5 @@ class EosGetPublicKey(p.MessageType): def get_fields(cls) -> Dict: return { 1: ('address_n', p.UVarintType, p.FLAG_REPEATED), - 2: ('show_display', p.BoolType, 0), + 2: ('show_display', p.BoolType, None), } diff --git a/core/src/trezor/messages/EosPermissionLevel.py b/core/src/trezor/messages/EosPermissionLevel.py index b6ffa6764..274b1dafa 100644 --- a/core/src/trezor/messages/EosPermissionLevel.py +++ b/core/src/trezor/messages/EosPermissionLevel.py @@ -14,6 +14,7 @@ class EosPermissionLevel(p.MessageType): def __init__( self, + *, actor: int = None, permission: int = None, ) -> None: @@ -23,6 +24,6 @@ class EosPermissionLevel(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('actor', p.UVarintType, 0), - 2: ('permission', p.UVarintType, 0), + 1: ('actor', p.UVarintType, None), + 2: ('permission', p.UVarintType, None), } diff --git a/core/src/trezor/messages/EosPublicKey.py b/core/src/trezor/messages/EosPublicKey.py index a3aefe8c1..9608dd86b 100644 --- a/core/src/trezor/messages/EosPublicKey.py +++ b/core/src/trezor/messages/EosPublicKey.py @@ -15,6 +15,7 @@ class EosPublicKey(p.MessageType): def __init__( self, + *, wif_public_key: str = None, raw_public_key: bytes = None, ) -> None: @@ -24,6 +25,6 @@ class EosPublicKey(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('wif_public_key', p.UnicodeType, 0), - 2: ('raw_public_key', p.BytesType, 0), + 1: ('wif_public_key', p.UnicodeType, None), + 2: ('raw_public_key', p.BytesType, None), } diff --git a/core/src/trezor/messages/EosSignTx.py b/core/src/trezor/messages/EosSignTx.py index 6404b28ff..d405d97be 100644 --- a/core/src/trezor/messages/EosSignTx.py +++ b/core/src/trezor/messages/EosSignTx.py @@ -17,6 +17,7 @@ class EosSignTx(p.MessageType): def __init__( self, + *, address_n: List[int] = None, chain_id: bytes = None, header: EosTxHeader = None, @@ -31,7 +32,7 @@ class EosSignTx(p.MessageType): def get_fields(cls) -> Dict: return { 1: ('address_n', p.UVarintType, p.FLAG_REPEATED), - 2: ('chain_id', p.BytesType, 0), - 3: ('header', EosTxHeader, 0), - 4: ('num_actions', p.UVarintType, 0), + 2: ('chain_id', p.BytesType, None), + 3: ('header', EosTxHeader, None), + 4: ('num_actions', p.UVarintType, None), } diff --git a/core/src/trezor/messages/EosSignedTx.py b/core/src/trezor/messages/EosSignedTx.py index b98dd11b5..14cb91896 100644 --- a/core/src/trezor/messages/EosSignedTx.py +++ b/core/src/trezor/messages/EosSignedTx.py @@ -15,6 +15,7 @@ class EosSignedTx(p.MessageType): def __init__( self, + *, signature: str = None, ) -> None: self.signature = signature @@ -22,5 +23,5 @@ class EosSignedTx(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('signature', p.UnicodeType, 0), + 1: ('signature', p.UnicodeType, None), } diff --git a/core/src/trezor/messages/EosTxActionAck.py b/core/src/trezor/messages/EosTxActionAck.py index 1decbcd9d..4b7777d10 100644 --- a/core/src/trezor/messages/EosTxActionAck.py +++ b/core/src/trezor/messages/EosTxActionAck.py @@ -31,6 +31,7 @@ class EosTxActionAck(p.MessageType): def __init__( self, + *, common: EosActionCommon = None, transfer: EosActionTransfer = None, delegate: EosActionDelegate = None, @@ -66,19 +67,19 @@ class EosTxActionAck(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('common', EosActionCommon, 0), - 2: ('transfer', EosActionTransfer, 0), - 3: ('delegate', EosActionDelegate, 0), - 4: ('undelegate', EosActionUndelegate, 0), - 5: ('refund', EosActionRefund, 0), - 6: ('buy_ram', EosActionBuyRam, 0), - 7: ('buy_ram_bytes', EosActionBuyRamBytes, 0), - 8: ('sell_ram', EosActionSellRam, 0), - 9: ('vote_producer', EosActionVoteProducer, 0), - 10: ('update_auth', EosActionUpdateAuth, 0), - 11: ('delete_auth', EosActionDeleteAuth, 0), - 12: ('link_auth', EosActionLinkAuth, 0), - 13: ('unlink_auth', EosActionUnlinkAuth, 0), - 14: ('new_account', EosActionNewAccount, 0), - 15: ('unknown', EosActionUnknown, 0), + 1: ('common', EosActionCommon, None), + 2: ('transfer', EosActionTransfer, None), + 3: ('delegate', EosActionDelegate, None), + 4: ('undelegate', EosActionUndelegate, None), + 5: ('refund', EosActionRefund, None), + 6: ('buy_ram', EosActionBuyRam, None), + 7: ('buy_ram_bytes', EosActionBuyRamBytes, None), + 8: ('sell_ram', EosActionSellRam, None), + 9: ('vote_producer', EosActionVoteProducer, None), + 10: ('update_auth', EosActionUpdateAuth, None), + 11: ('delete_auth', EosActionDeleteAuth, None), + 12: ('link_auth', EosActionLinkAuth, None), + 13: ('unlink_auth', EosActionUnlinkAuth, None), + 14: ('new_account', EosActionNewAccount, None), + 15: ('unknown', EosActionUnknown, None), } diff --git a/core/src/trezor/messages/EosTxActionRequest.py b/core/src/trezor/messages/EosTxActionRequest.py index 2228ffb1d..b11f6b913 100644 --- a/core/src/trezor/messages/EosTxActionRequest.py +++ b/core/src/trezor/messages/EosTxActionRequest.py @@ -15,6 +15,7 @@ class EosTxActionRequest(p.MessageType): def __init__( self, + *, data_size: int = None, ) -> None: self.data_size = data_size @@ -22,5 +23,5 @@ class EosTxActionRequest(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('data_size', p.UVarintType, 0), + 1: ('data_size', p.UVarintType, None), } diff --git a/core/src/trezor/messages/EosTxHeader.py b/core/src/trezor/messages/EosTxHeader.py index 0dbfd3dc7..0a335d061 100644 --- a/core/src/trezor/messages/EosTxHeader.py +++ b/core/src/trezor/messages/EosTxHeader.py @@ -14,12 +14,13 @@ class EosTxHeader(p.MessageType): def __init__( self, - expiration: int = None, - ref_block_num: int = None, - ref_block_prefix: int = None, - max_net_usage_words: int = None, - max_cpu_usage_ms: int = None, - delay_sec: int = None, + *, + expiration: int, + ref_block_num: int, + ref_block_prefix: int, + max_net_usage_words: int, + max_cpu_usage_ms: int, + delay_sec: int, ) -> None: self.expiration = expiration self.ref_block_num = ref_block_num @@ -31,10 +32,10 @@ class EosTxHeader(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('expiration', p.UVarintType, 0), # required - 2: ('ref_block_num', p.UVarintType, 0), # required - 3: ('ref_block_prefix', p.UVarintType, 0), # required - 4: ('max_net_usage_words', p.UVarintType, 0), # required - 5: ('max_cpu_usage_ms', p.UVarintType, 0), # required - 6: ('delay_sec', p.UVarintType, 0), # required + 1: ('expiration', p.UVarintType, p.FLAG_REQUIRED), + 2: ('ref_block_num', p.UVarintType, p.FLAG_REQUIRED), + 3: ('ref_block_prefix', p.UVarintType, p.FLAG_REQUIRED), + 4: ('max_net_usage_words', p.UVarintType, p.FLAG_REQUIRED), + 5: ('max_cpu_usage_ms', p.UVarintType, p.FLAG_REQUIRED), + 6: ('delay_sec', p.UVarintType, p.FLAG_REQUIRED), } diff --git a/core/src/trezor/messages/EthereumAddress.py b/core/src/trezor/messages/EthereumAddress.py index 29551be56..c8940f549 100644 --- a/core/src/trezor/messages/EthereumAddress.py +++ b/core/src/trezor/messages/EthereumAddress.py @@ -15,6 +15,7 @@ class EthereumAddress(p.MessageType): def __init__( self, + *, address: str = None, ) -> None: self.address = address @@ -22,5 +23,5 @@ class EthereumAddress(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 2: ('address', p.UnicodeType, 0), + 2: ('address', p.UnicodeType, None), } diff --git a/core/src/trezor/messages/EthereumGetAddress.py b/core/src/trezor/messages/EthereumGetAddress.py index 1d26bdaec..4f7243a72 100644 --- a/core/src/trezor/messages/EthereumGetAddress.py +++ b/core/src/trezor/messages/EthereumGetAddress.py @@ -15,6 +15,7 @@ class EthereumGetAddress(p.MessageType): def __init__( self, + *, address_n: List[int] = None, show_display: bool = None, ) -> None: @@ -25,5 +26,5 @@ class EthereumGetAddress(p.MessageType): def get_fields(cls) -> Dict: return { 1: ('address_n', p.UVarintType, p.FLAG_REPEATED), - 2: ('show_display', p.BoolType, 0), + 2: ('show_display', p.BoolType, None), } diff --git a/core/src/trezor/messages/EthereumGetPublicKey.py b/core/src/trezor/messages/EthereumGetPublicKey.py index b3d1ecb81..7df2d8417 100644 --- a/core/src/trezor/messages/EthereumGetPublicKey.py +++ b/core/src/trezor/messages/EthereumGetPublicKey.py @@ -15,6 +15,7 @@ class EthereumGetPublicKey(p.MessageType): def __init__( self, + *, address_n: List[int] = None, show_display: bool = None, ) -> None: @@ -25,5 +26,5 @@ class EthereumGetPublicKey(p.MessageType): def get_fields(cls) -> Dict: return { 1: ('address_n', p.UVarintType, p.FLAG_REPEATED), - 2: ('show_display', p.BoolType, 0), + 2: ('show_display', p.BoolType, None), } diff --git a/core/src/trezor/messages/EthereumMessageSignature.py b/core/src/trezor/messages/EthereumMessageSignature.py index 27b70a782..c965f9835 100644 --- a/core/src/trezor/messages/EthereumMessageSignature.py +++ b/core/src/trezor/messages/EthereumMessageSignature.py @@ -15,6 +15,7 @@ class EthereumMessageSignature(p.MessageType): def __init__( self, + *, signature: bytes = None, address: str = None, ) -> None: @@ -24,6 +25,6 @@ class EthereumMessageSignature(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 2: ('signature', p.BytesType, 0), - 3: ('address', p.UnicodeType, 0), + 2: ('signature', p.BytesType, None), + 3: ('address', p.UnicodeType, None), } diff --git a/core/src/trezor/messages/EthereumPublicKey.py b/core/src/trezor/messages/EthereumPublicKey.py index 2b6276642..d632ea79d 100644 --- a/core/src/trezor/messages/EthereumPublicKey.py +++ b/core/src/trezor/messages/EthereumPublicKey.py @@ -17,6 +17,7 @@ class EthereumPublicKey(p.MessageType): def __init__( self, + *, node: HDNodeType = None, xpub: str = None, ) -> None: @@ -26,6 +27,6 @@ class EthereumPublicKey(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('node', HDNodeType, 0), - 2: ('xpub', p.UnicodeType, 0), + 1: ('node', HDNodeType, None), + 2: ('xpub', p.UnicodeType, None), } diff --git a/core/src/trezor/messages/EthereumSignMessage.py b/core/src/trezor/messages/EthereumSignMessage.py index 131461d48..1f02ac8fa 100644 --- a/core/src/trezor/messages/EthereumSignMessage.py +++ b/core/src/trezor/messages/EthereumSignMessage.py @@ -15,6 +15,7 @@ class EthereumSignMessage(p.MessageType): def __init__( self, + *, address_n: List[int] = None, message: bytes = None, ) -> None: @@ -25,5 +26,5 @@ class EthereumSignMessage(p.MessageType): def get_fields(cls) -> Dict: return { 1: ('address_n', p.UVarintType, p.FLAG_REPEATED), - 2: ('message', p.BytesType, 0), + 2: ('message', p.BytesType, None), } diff --git a/core/src/trezor/messages/EthereumSignTx.py b/core/src/trezor/messages/EthereumSignTx.py index d82af076f..f169a15a4 100644 --- a/core/src/trezor/messages/EthereumSignTx.py +++ b/core/src/trezor/messages/EthereumSignTx.py @@ -15,6 +15,7 @@ class EthereumSignTx(p.MessageType): def __init__( self, + *, address_n: List[int] = None, nonce: bytes = None, gas_price: bytes = None, @@ -41,13 +42,13 @@ class EthereumSignTx(p.MessageType): def get_fields(cls) -> Dict: return { 1: ('address_n', p.UVarintType, p.FLAG_REPEATED), - 2: ('nonce', p.BytesType, 0), - 3: ('gas_price', p.BytesType, 0), - 4: ('gas_limit', p.BytesType, 0), - 11: ('to', p.UnicodeType, 0), - 6: ('value', p.BytesType, 0), - 7: ('data_initial_chunk', p.BytesType, 0), - 8: ('data_length', p.UVarintType, 0), - 9: ('chain_id', p.UVarintType, 0), - 10: ('tx_type', p.UVarintType, 0), + 2: ('nonce', p.BytesType, None), + 3: ('gas_price', p.BytesType, None), + 4: ('gas_limit', p.BytesType, None), + 11: ('to', p.UnicodeType, None), + 6: ('value', p.BytesType, None), + 7: ('data_initial_chunk', p.BytesType, None), + 8: ('data_length', p.UVarintType, None), + 9: ('chain_id', p.UVarintType, None), + 10: ('tx_type', p.UVarintType, None), } diff --git a/core/src/trezor/messages/EthereumTxAck.py b/core/src/trezor/messages/EthereumTxAck.py index 951a82ce8..dd2d6ccde 100644 --- a/core/src/trezor/messages/EthereumTxAck.py +++ b/core/src/trezor/messages/EthereumTxAck.py @@ -15,6 +15,7 @@ class EthereumTxAck(p.MessageType): def __init__( self, + *, data_chunk: bytes = None, ) -> None: self.data_chunk = data_chunk @@ -22,5 +23,5 @@ class EthereumTxAck(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('data_chunk', p.BytesType, 0), + 1: ('data_chunk', p.BytesType, None), } diff --git a/core/src/trezor/messages/EthereumTxRequest.py b/core/src/trezor/messages/EthereumTxRequest.py index 281259f26..fe9e6eb0c 100644 --- a/core/src/trezor/messages/EthereumTxRequest.py +++ b/core/src/trezor/messages/EthereumTxRequest.py @@ -15,6 +15,7 @@ class EthereumTxRequest(p.MessageType): def __init__( self, + *, data_length: int = None, signature_v: int = None, signature_r: bytes = None, @@ -28,8 +29,8 @@ class EthereumTxRequest(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('data_length', p.UVarintType, 0), - 2: ('signature_v', p.UVarintType, 0), - 3: ('signature_r', p.BytesType, 0), - 4: ('signature_s', p.BytesType, 0), + 1: ('data_length', p.UVarintType, None), + 2: ('signature_v', p.UVarintType, None), + 3: ('signature_r', p.BytesType, None), + 4: ('signature_s', p.BytesType, None), } diff --git a/core/src/trezor/messages/EthereumVerifyMessage.py b/core/src/trezor/messages/EthereumVerifyMessage.py index 3465217ba..726ab367b 100644 --- a/core/src/trezor/messages/EthereumVerifyMessage.py +++ b/core/src/trezor/messages/EthereumVerifyMessage.py @@ -15,6 +15,7 @@ class EthereumVerifyMessage(p.MessageType): def __init__( self, + *, signature: bytes = None, message: bytes = None, address: str = None, @@ -26,7 +27,7 @@ class EthereumVerifyMessage(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 2: ('signature', p.BytesType, 0), - 3: ('message', p.BytesType, 0), - 4: ('address', p.UnicodeType, 0), + 2: ('signature', p.BytesType, None), + 3: ('message', p.BytesType, None), + 4: ('address', p.UnicodeType, None), } diff --git a/core/src/trezor/messages/Failure.py b/core/src/trezor/messages/Failure.py index 2a085e374..4e359e563 100644 --- a/core/src/trezor/messages/Failure.py +++ b/core/src/trezor/messages/Failure.py @@ -16,6 +16,7 @@ class Failure(p.MessageType): def __init__( self, + *, code: EnumTypeFailureType = None, message: str = None, ) -> None: @@ -25,6 +26,6 @@ class Failure(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('code', p.EnumType("FailureType", (1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 99)), 0), - 2: ('message', p.UnicodeType, 0), + 1: ('code', p.EnumType("FailureType", (1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 99)), None), + 2: ('message', p.UnicodeType, None), } diff --git a/core/src/trezor/messages/Features.py b/core/src/trezor/messages/Features.py index 63e21bcf5..37d26f8ac 100644 --- a/core/src/trezor/messages/Features.py +++ b/core/src/trezor/messages/Features.py @@ -18,6 +18,8 @@ class Features(p.MessageType): def __init__( self, + *, + capabilities: List[EnumTypeCapability] = None, vendor: str = None, major_version: int = None, minor_version: int = None, @@ -45,7 +47,6 @@ class Features(p.MessageType): unfinished_backup: bool = None, no_backup: bool = None, recovery_mode: bool = None, - capabilities: List[EnumTypeCapability] = None, backup_type: EnumTypeBackupType = None, sd_card_present: bool = None, sd_protection: bool = None, @@ -54,6 +55,7 @@ class Features(p.MessageType): passphrase_always_on_device: bool = None, safety_checks: EnumTypeSafetyCheckLevel = None, ) -> None: + self.capabilities = capabilities if capabilities is not None else [] self.vendor = vendor self.major_version = major_version self.minor_version = minor_version @@ -81,7 +83,6 @@ class Features(p.MessageType): self.unfinished_backup = unfinished_backup self.no_backup = no_backup self.recovery_mode = recovery_mode - self.capabilities = capabilities if capabilities is not None else [] self.backup_type = backup_type self.sd_card_present = sd_card_present self.sd_protection = sd_protection @@ -93,39 +94,39 @@ class Features(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('vendor', p.UnicodeType, 0), - 2: ('major_version', p.UVarintType, 0), - 3: ('minor_version', p.UVarintType, 0), - 4: ('patch_version', p.UVarintType, 0), - 5: ('bootloader_mode', p.BoolType, 0), - 6: ('device_id', p.UnicodeType, 0), - 7: ('pin_protection', p.BoolType, 0), - 8: ('passphrase_protection', p.BoolType, 0), - 9: ('language', p.UnicodeType, 0), - 10: ('label', p.UnicodeType, 0), - 12: ('initialized', p.BoolType, 0), - 13: ('revision', p.BytesType, 0), - 14: ('bootloader_hash', p.BytesType, 0), - 15: ('imported', p.BoolType, 0), - 16: ('unlocked', p.BoolType, 0), - 18: ('firmware_present', p.BoolType, 0), - 19: ('needs_backup', p.BoolType, 0), - 20: ('flags', p.UVarintType, 0), - 21: ('model', p.UnicodeType, 0), - 22: ('fw_major', p.UVarintType, 0), - 23: ('fw_minor', p.UVarintType, 0), - 24: ('fw_patch', p.UVarintType, 0), - 25: ('fw_vendor', p.UnicodeType, 0), - 26: ('fw_vendor_keys', p.BytesType, 0), - 27: ('unfinished_backup', p.BoolType, 0), - 28: ('no_backup', p.BoolType, 0), - 29: ('recovery_mode', p.BoolType, 0), + 1: ('vendor', p.UnicodeType, None), + 2: ('major_version', p.UVarintType, None), + 3: ('minor_version', p.UVarintType, None), + 4: ('patch_version', p.UVarintType, None), + 5: ('bootloader_mode', p.BoolType, None), + 6: ('device_id', p.UnicodeType, None), + 7: ('pin_protection', p.BoolType, None), + 8: ('passphrase_protection', p.BoolType, None), + 9: ('language', p.UnicodeType, None), + 10: ('label', p.UnicodeType, None), + 12: ('initialized', p.BoolType, None), + 13: ('revision', p.BytesType, None), + 14: ('bootloader_hash', p.BytesType, None), + 15: ('imported', p.BoolType, None), + 16: ('unlocked', p.BoolType, None), + 18: ('firmware_present', p.BoolType, None), + 19: ('needs_backup', p.BoolType, None), + 20: ('flags', p.UVarintType, None), + 21: ('model', p.UnicodeType, None), + 22: ('fw_major', p.UVarintType, None), + 23: ('fw_minor', p.UVarintType, None), + 24: ('fw_patch', p.UVarintType, None), + 25: ('fw_vendor', p.UnicodeType, None), + 26: ('fw_vendor_keys', p.BytesType, None), + 27: ('unfinished_backup', p.BoolType, None), + 28: ('no_backup', p.BoolType, None), + 29: ('recovery_mode', p.BoolType, None), 30: ('capabilities', p.EnumType("Capability", (1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17)), p.FLAG_REPEATED), - 31: ('backup_type', p.EnumType("BackupType", (0, 1, 2)), 0), - 32: ('sd_card_present', p.BoolType, 0), - 33: ('sd_protection', p.BoolType, 0), - 34: ('wipe_code_protection', p.BoolType, 0), - 35: ('session_id', p.BytesType, 0), - 36: ('passphrase_always_on_device', p.BoolType, 0), - 37: ('safety_checks', p.EnumType("SafetyCheckLevel", (0, 1, 2)), 0), + 31: ('backup_type', p.EnumType("BackupType", (0, 1, 2)), None), + 32: ('sd_card_present', p.BoolType, None), + 33: ('sd_protection', p.BoolType, None), + 34: ('wipe_code_protection', p.BoolType, None), + 35: ('session_id', p.BytesType, None), + 36: ('passphrase_always_on_device', p.BoolType, None), + 37: ('safety_checks', p.EnumType("SafetyCheckLevel", (0, 1, 2)), None), } diff --git a/core/src/trezor/messages/GetAddress.py b/core/src/trezor/messages/GetAddress.py index e8cea9fbf..8931593a7 100644 --- a/core/src/trezor/messages/GetAddress.py +++ b/core/src/trezor/messages/GetAddress.py @@ -18,11 +18,12 @@ class GetAddress(p.MessageType): def __init__( self, + *, address_n: List[int] = None, - coin_name: str = None, + coin_name: str = "Bitcoin", show_display: bool = None, multisig: MultisigRedeemScriptType = None, - script_type: EnumTypeInputScriptType = None, + script_type: EnumTypeInputScriptType = 0, ) -> None: self.address_n = address_n if address_n is not None else [] self.coin_name = coin_name @@ -34,8 +35,8 @@ class GetAddress(p.MessageType): def get_fields(cls) -> Dict: return { 1: ('address_n', p.UVarintType, p.FLAG_REPEATED), - 2: ('coin_name', p.UnicodeType, 0), # default=Bitcoin - 3: ('show_display', p.BoolType, 0), - 4: ('multisig', MultisigRedeemScriptType, 0), + 2: ('coin_name', p.UnicodeType, "Bitcoin"), # default=Bitcoin + 3: ('show_display', p.BoolType, None), + 4: ('multisig', MultisigRedeemScriptType, None), 5: ('script_type', p.EnumType("InputScriptType", (0, 1, 2, 3, 4)), 0), # default=SPENDADDRESS } diff --git a/core/src/trezor/messages/GetECDHSessionKey.py b/core/src/trezor/messages/GetECDHSessionKey.py index c8f93c285..0fc696718 100644 --- a/core/src/trezor/messages/GetECDHSessionKey.py +++ b/core/src/trezor/messages/GetECDHSessionKey.py @@ -17,6 +17,7 @@ class GetECDHSessionKey(p.MessageType): def __init__( self, + *, identity: IdentityType = None, peer_public_key: bytes = None, ecdsa_curve_name: str = None, @@ -28,7 +29,7 @@ class GetECDHSessionKey(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('identity', IdentityType, 0), - 2: ('peer_public_key', p.BytesType, 0), - 3: ('ecdsa_curve_name', p.UnicodeType, 0), + 1: ('identity', IdentityType, None), + 2: ('peer_public_key', p.BytesType, None), + 3: ('ecdsa_curve_name', p.UnicodeType, None), } diff --git a/core/src/trezor/messages/GetEntropy.py b/core/src/trezor/messages/GetEntropy.py index 7aa89a94a..956c602b6 100644 --- a/core/src/trezor/messages/GetEntropy.py +++ b/core/src/trezor/messages/GetEntropy.py @@ -15,12 +15,13 @@ class GetEntropy(p.MessageType): def __init__( self, - size: int = None, + *, + size: int, ) -> None: self.size = size @classmethod def get_fields(cls) -> Dict: return { - 1: ('size', p.UVarintType, 0), # required + 1: ('size', p.UVarintType, p.FLAG_REQUIRED), } diff --git a/core/src/trezor/messages/GetOwnershipId.py b/core/src/trezor/messages/GetOwnershipId.py index 899190712..4ca7490d2 100644 --- a/core/src/trezor/messages/GetOwnershipId.py +++ b/core/src/trezor/messages/GetOwnershipId.py @@ -18,10 +18,11 @@ class GetOwnershipId(p.MessageType): def __init__( self, + *, address_n: List[int] = None, - coin_name: str = None, + coin_name: str = "Bitcoin", multisig: MultisigRedeemScriptType = None, - script_type: EnumTypeInputScriptType = None, + script_type: EnumTypeInputScriptType = 0, ) -> None: self.address_n = address_n if address_n is not None else [] self.coin_name = coin_name @@ -32,7 +33,7 @@ class GetOwnershipId(p.MessageType): def get_fields(cls) -> Dict: return { 1: ('address_n', p.UVarintType, p.FLAG_REPEATED), - 2: ('coin_name', p.UnicodeType, 0), # default=Bitcoin - 3: ('multisig', MultisigRedeemScriptType, 0), + 2: ('coin_name', p.UnicodeType, "Bitcoin"), # default=Bitcoin + 3: ('multisig', MultisigRedeemScriptType, None), 4: ('script_type', p.EnumType("InputScriptType", (0, 1, 2, 3, 4)), 0), # default=SPENDADDRESS } diff --git a/core/src/trezor/messages/GetOwnershipProof.py b/core/src/trezor/messages/GetOwnershipProof.py index 5293dde44..bb09a0c3a 100644 --- a/core/src/trezor/messages/GetOwnershipProof.py +++ b/core/src/trezor/messages/GetOwnershipProof.py @@ -18,30 +18,31 @@ class GetOwnershipProof(p.MessageType): def __init__( self, + *, address_n: List[int] = None, - coin_name: str = None, - script_type: EnumTypeInputScriptType = None, - multisig: MultisigRedeemScriptType = None, - user_confirmation: bool = None, ownership_ids: List[bytes] = None, - commitment_data: bytes = None, + coin_name: str = "Bitcoin", + script_type: EnumTypeInputScriptType = 3, + multisig: MultisigRedeemScriptType = None, + user_confirmation: bool = False, + commitment_data: bytes = b"", ) -> None: self.address_n = address_n if address_n is not None else [] + self.ownership_ids = ownership_ids if ownership_ids is not None else [] self.coin_name = coin_name self.script_type = script_type self.multisig = multisig self.user_confirmation = user_confirmation - self.ownership_ids = ownership_ids if ownership_ids is not None else [] self.commitment_data = commitment_data @classmethod def get_fields(cls) -> Dict: return { 1: ('address_n', p.UVarintType, p.FLAG_REPEATED), - 2: ('coin_name', p.UnicodeType, 0), # default=Bitcoin - 3: ('script_type', p.EnumType("InputScriptType", (0, 1, 2, 3, 4)), 0), # default=SPENDWITNESS - 4: ('multisig', MultisigRedeemScriptType, 0), - 5: ('user_confirmation', p.BoolType, 0), + 2: ('coin_name', p.UnicodeType, "Bitcoin"), # default=Bitcoin + 3: ('script_type', p.EnumType("InputScriptType", (0, 1, 2, 3, 4)), 3), # default=SPENDWITNESS + 4: ('multisig', MultisigRedeemScriptType, None), + 5: ('user_confirmation', p.BoolType, False), # default=false 6: ('ownership_ids', p.BytesType, p.FLAG_REPEATED), - 7: ('commitment_data', p.BytesType, 0), + 7: ('commitment_data', p.BytesType, b""), # default= } diff --git a/core/src/trezor/messages/GetPublicKey.py b/core/src/trezor/messages/GetPublicKey.py index e94d445af..30bdc0da3 100644 --- a/core/src/trezor/messages/GetPublicKey.py +++ b/core/src/trezor/messages/GetPublicKey.py @@ -16,11 +16,12 @@ class GetPublicKey(p.MessageType): def __init__( self, + *, address_n: List[int] = None, ecdsa_curve_name: str = None, show_display: bool = None, - coin_name: str = None, - script_type: EnumTypeInputScriptType = None, + coin_name: str = "Bitcoin", + script_type: EnumTypeInputScriptType = 0, ) -> None: self.address_n = address_n if address_n is not None else [] self.ecdsa_curve_name = ecdsa_curve_name @@ -32,8 +33,8 @@ class GetPublicKey(p.MessageType): def get_fields(cls) -> Dict: return { 1: ('address_n', p.UVarintType, p.FLAG_REPEATED), - 2: ('ecdsa_curve_name', p.UnicodeType, 0), - 3: ('show_display', p.BoolType, 0), - 4: ('coin_name', p.UnicodeType, 0), # default=Bitcoin + 2: ('ecdsa_curve_name', p.UnicodeType, None), + 3: ('show_display', p.BoolType, None), + 4: ('coin_name', p.UnicodeType, "Bitcoin"), # default=Bitcoin 5: ('script_type', p.EnumType("InputScriptType", (0, 1, 2, 3, 4)), 0), # default=SPENDADDRESS } diff --git a/core/src/trezor/messages/HDNodePathType.py b/core/src/trezor/messages/HDNodePathType.py index fd892111b..b544bf7ff 100644 --- a/core/src/trezor/messages/HDNodePathType.py +++ b/core/src/trezor/messages/HDNodePathType.py @@ -16,15 +16,16 @@ class HDNodePathType(p.MessageType): def __init__( self, - node: HDNodeType = None, + *, + node: HDNodeType, address_n: List[int] = None, ) -> None: - self.node = node self.address_n = address_n if address_n is not None else [] + self.node = node @classmethod def get_fields(cls) -> Dict: return { - 1: ('node', HDNodeType, 0), # required + 1: ('node', HDNodeType, p.FLAG_REQUIRED), 2: ('address_n', p.UVarintType, p.FLAG_REPEATED), } diff --git a/core/src/trezor/messages/HDNodeType.py b/core/src/trezor/messages/HDNodeType.py index abbace987..cb4876ccd 100644 --- a/core/src/trezor/messages/HDNodeType.py +++ b/core/src/trezor/messages/HDNodeType.py @@ -14,27 +14,28 @@ class HDNodeType(p.MessageType): def __init__( self, - depth: int = None, - fingerprint: int = None, - child_num: int = None, - chain_code: bytes = None, + *, + depth: int, + fingerprint: int, + child_num: int, + chain_code: bytes, + public_key: bytes, private_key: bytes = None, - public_key: bytes = None, ) -> None: self.depth = depth self.fingerprint = fingerprint self.child_num = child_num self.chain_code = chain_code - self.private_key = private_key self.public_key = public_key + self.private_key = private_key @classmethod def get_fields(cls) -> Dict: return { - 1: ('depth', p.UVarintType, 0), # required - 2: ('fingerprint', p.UVarintType, 0), # required - 3: ('child_num', p.UVarintType, 0), # required - 4: ('chain_code', p.BytesType, 0), # required - 5: ('private_key', p.BytesType, 0), - 6: ('public_key', p.BytesType, 0), + 1: ('depth', p.UVarintType, p.FLAG_REQUIRED), + 2: ('fingerprint', p.UVarintType, p.FLAG_REQUIRED), + 3: ('child_num', p.UVarintType, p.FLAG_REQUIRED), + 4: ('chain_code', p.BytesType, p.FLAG_REQUIRED), + 5: ('private_key', p.BytesType, None), + 6: ('public_key', p.BytesType, p.FLAG_REQUIRED), } diff --git a/core/src/trezor/messages/IdentityType.py b/core/src/trezor/messages/IdentityType.py index 9f8ef01f6..2c544067e 100644 --- a/core/src/trezor/messages/IdentityType.py +++ b/core/src/trezor/messages/IdentityType.py @@ -14,12 +14,13 @@ class IdentityType(p.MessageType): def __init__( self, + *, proto: str = None, user: str = None, host: str = None, port: str = None, path: str = None, - index: int = None, + index: int = 0, ) -> None: self.proto = proto self.user = user @@ -31,10 +32,10 @@ class IdentityType(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('proto', p.UnicodeType, 0), - 2: ('user', p.UnicodeType, 0), - 3: ('host', p.UnicodeType, 0), - 4: ('port', p.UnicodeType, 0), - 5: ('path', p.UnicodeType, 0), + 1: ('proto', p.UnicodeType, None), + 2: ('user', p.UnicodeType, None), + 3: ('host', p.UnicodeType, None), + 4: ('port', p.UnicodeType, None), + 5: ('path', p.UnicodeType, None), 6: ('index', p.UVarintType, 0), # default=0 } diff --git a/core/src/trezor/messages/Initialize.py b/core/src/trezor/messages/Initialize.py index 73dd3fdc9..b5701955f 100644 --- a/core/src/trezor/messages/Initialize.py +++ b/core/src/trezor/messages/Initialize.py @@ -15,6 +15,7 @@ class Initialize(p.MessageType): def __init__( self, + *, session_id: bytes = None, ) -> None: self.session_id = session_id @@ -22,5 +23,5 @@ class Initialize(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('session_id', p.BytesType, 0), + 1: ('session_id', p.BytesType, None), } diff --git a/core/src/trezor/messages/LiskAddress.py b/core/src/trezor/messages/LiskAddress.py index e3199fc37..bec470045 100644 --- a/core/src/trezor/messages/LiskAddress.py +++ b/core/src/trezor/messages/LiskAddress.py @@ -15,6 +15,7 @@ class LiskAddress(p.MessageType): def __init__( self, + *, address: str = None, ) -> None: self.address = address @@ -22,5 +23,5 @@ class LiskAddress(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('address', p.UnicodeType, 0), + 1: ('address', p.UnicodeType, None), } diff --git a/core/src/trezor/messages/LiskDelegateType.py b/core/src/trezor/messages/LiskDelegateType.py index bf611aabc..32ffad10b 100644 --- a/core/src/trezor/messages/LiskDelegateType.py +++ b/core/src/trezor/messages/LiskDelegateType.py @@ -14,6 +14,7 @@ class LiskDelegateType(p.MessageType): def __init__( self, + *, username: str = None, ) -> None: self.username = username @@ -21,5 +22,5 @@ class LiskDelegateType(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('username', p.UnicodeType, 0), + 1: ('username', p.UnicodeType, None), } diff --git a/core/src/trezor/messages/LiskGetAddress.py b/core/src/trezor/messages/LiskGetAddress.py index ad77a4833..42553fe10 100644 --- a/core/src/trezor/messages/LiskGetAddress.py +++ b/core/src/trezor/messages/LiskGetAddress.py @@ -15,6 +15,7 @@ class LiskGetAddress(p.MessageType): def __init__( self, + *, address_n: List[int] = None, show_display: bool = None, ) -> None: @@ -25,5 +26,5 @@ class LiskGetAddress(p.MessageType): def get_fields(cls) -> Dict: return { 1: ('address_n', p.UVarintType, p.FLAG_REPEATED), - 2: ('show_display', p.BoolType, 0), + 2: ('show_display', p.BoolType, None), } diff --git a/core/src/trezor/messages/LiskGetPublicKey.py b/core/src/trezor/messages/LiskGetPublicKey.py index 4785d6691..0d23f2210 100644 --- a/core/src/trezor/messages/LiskGetPublicKey.py +++ b/core/src/trezor/messages/LiskGetPublicKey.py @@ -15,6 +15,7 @@ class LiskGetPublicKey(p.MessageType): def __init__( self, + *, address_n: List[int] = None, show_display: bool = None, ) -> None: @@ -25,5 +26,5 @@ class LiskGetPublicKey(p.MessageType): def get_fields(cls) -> Dict: return { 1: ('address_n', p.UVarintType, p.FLAG_REPEATED), - 2: ('show_display', p.BoolType, 0), + 2: ('show_display', p.BoolType, None), } diff --git a/core/src/trezor/messages/LiskMessageSignature.py b/core/src/trezor/messages/LiskMessageSignature.py index 21a7465d5..ead5a00ab 100644 --- a/core/src/trezor/messages/LiskMessageSignature.py +++ b/core/src/trezor/messages/LiskMessageSignature.py @@ -15,6 +15,7 @@ class LiskMessageSignature(p.MessageType): def __init__( self, + *, public_key: bytes = None, signature: bytes = None, ) -> None: @@ -24,6 +25,6 @@ class LiskMessageSignature(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('public_key', p.BytesType, 0), - 2: ('signature', p.BytesType, 0), + 1: ('public_key', p.BytesType, None), + 2: ('signature', p.BytesType, None), } diff --git a/core/src/trezor/messages/LiskMultisignatureType.py b/core/src/trezor/messages/LiskMultisignatureType.py index 781a8a1d8..80f5a0c3a 100644 --- a/core/src/trezor/messages/LiskMultisignatureType.py +++ b/core/src/trezor/messages/LiskMultisignatureType.py @@ -14,18 +14,19 @@ class LiskMultisignatureType(p.MessageType): def __init__( self, + *, + keys_group: List[str] = None, min: int = None, life_time: int = None, - keys_group: List[str] = None, ) -> None: + self.keys_group = keys_group if keys_group is not None else [] self.min = min self.life_time = life_time - self.keys_group = keys_group if keys_group is not None else [] @classmethod def get_fields(cls) -> Dict: return { - 1: ('min', p.UVarintType, 0), - 2: ('life_time', p.UVarintType, 0), + 1: ('min', p.UVarintType, None), + 2: ('life_time', p.UVarintType, None), 3: ('keys_group', p.UnicodeType, p.FLAG_REPEATED), } diff --git a/core/src/trezor/messages/LiskPublicKey.py b/core/src/trezor/messages/LiskPublicKey.py index c4fc70d74..fb1695bbe 100644 --- a/core/src/trezor/messages/LiskPublicKey.py +++ b/core/src/trezor/messages/LiskPublicKey.py @@ -15,6 +15,7 @@ class LiskPublicKey(p.MessageType): def __init__( self, + *, public_key: bytes = None, ) -> None: self.public_key = public_key @@ -22,5 +23,5 @@ class LiskPublicKey(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('public_key', p.BytesType, 0), + 1: ('public_key', p.BytesType, None), } diff --git a/core/src/trezor/messages/LiskSignMessage.py b/core/src/trezor/messages/LiskSignMessage.py index 8b76e393a..6c0a7bae9 100644 --- a/core/src/trezor/messages/LiskSignMessage.py +++ b/core/src/trezor/messages/LiskSignMessage.py @@ -15,6 +15,7 @@ class LiskSignMessage(p.MessageType): def __init__( self, + *, address_n: List[int] = None, message: bytes = None, ) -> None: @@ -25,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, 0), + 2: ('message', p.BytesType, None), } diff --git a/core/src/trezor/messages/LiskSignTx.py b/core/src/trezor/messages/LiskSignTx.py index 27c641678..11545ee19 100644 --- a/core/src/trezor/messages/LiskSignTx.py +++ b/core/src/trezor/messages/LiskSignTx.py @@ -17,6 +17,7 @@ class LiskSignTx(p.MessageType): def __init__( self, + *, address_n: List[int] = None, transaction: LiskTransactionCommon = None, ) -> None: @@ -27,5 +28,5 @@ class LiskSignTx(p.MessageType): def get_fields(cls) -> Dict: return { 1: ('address_n', p.UVarintType, p.FLAG_REPEATED), - 2: ('transaction', LiskTransactionCommon, 0), + 2: ('transaction', LiskTransactionCommon, None), } diff --git a/core/src/trezor/messages/LiskSignatureType.py b/core/src/trezor/messages/LiskSignatureType.py index af8eeddcd..4e0d7d649 100644 --- a/core/src/trezor/messages/LiskSignatureType.py +++ b/core/src/trezor/messages/LiskSignatureType.py @@ -14,6 +14,7 @@ class LiskSignatureType(p.MessageType): def __init__( self, + *, public_key: bytes = None, ) -> None: self.public_key = public_key @@ -21,5 +22,5 @@ class LiskSignatureType(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('public_key', p.BytesType, 0), + 1: ('public_key', p.BytesType, None), } diff --git a/core/src/trezor/messages/LiskSignedTx.py b/core/src/trezor/messages/LiskSignedTx.py index 925a438a0..45bbb836e 100644 --- a/core/src/trezor/messages/LiskSignedTx.py +++ b/core/src/trezor/messages/LiskSignedTx.py @@ -15,6 +15,7 @@ class LiskSignedTx(p.MessageType): def __init__( self, + *, signature: bytes = None, ) -> None: self.signature = signature @@ -22,5 +23,5 @@ class LiskSignedTx(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('signature', p.BytesType, 0), + 1: ('signature', p.BytesType, None), } diff --git a/core/src/trezor/messages/LiskTransactionAsset.py b/core/src/trezor/messages/LiskTransactionAsset.py index c1f2dec90..dfa7b0348 100644 --- a/core/src/trezor/messages/LiskTransactionAsset.py +++ b/core/src/trezor/messages/LiskTransactionAsset.py @@ -18,24 +18,25 @@ class LiskTransactionAsset(p.MessageType): def __init__( self, + *, + votes: List[str] = None, signature: LiskSignatureType = None, delegate: LiskDelegateType = None, - votes: List[str] = None, multisignature: LiskMultisignatureType = None, data: str = None, ) -> None: + self.votes = votes if votes is not None else [] self.signature = signature self.delegate = delegate - self.votes = votes if votes is not None else [] self.multisignature = multisignature self.data = data @classmethod def get_fields(cls) -> Dict: return { - 1: ('signature', LiskSignatureType, 0), - 2: ('delegate', LiskDelegateType, 0), + 1: ('signature', LiskSignatureType, None), + 2: ('delegate', LiskDelegateType, None), 3: ('votes', p.UnicodeType, p.FLAG_REPEATED), - 4: ('multisignature', LiskMultisignatureType, 0), - 5: ('data', p.UnicodeType, 0), + 4: ('multisignature', LiskMultisignatureType, None), + 5: ('data', p.UnicodeType, None), } diff --git a/core/src/trezor/messages/LiskTransactionCommon.py b/core/src/trezor/messages/LiskTransactionCommon.py index 1670dd641..58c85bff7 100644 --- a/core/src/trezor/messages/LiskTransactionCommon.py +++ b/core/src/trezor/messages/LiskTransactionCommon.py @@ -17,6 +17,7 @@ class LiskTransactionCommon(p.MessageType): def __init__( self, + *, type: EnumTypeLiskTransactionType = None, amount: int = None, fee: int = None, @@ -40,13 +41,13 @@ class LiskTransactionCommon(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('type', p.EnumType("LiskTransactionType", (0, 1, 2, 3, 4, 5, 6, 7)), 0), - 2: ('amount', p.UVarintType, 0), - 3: ('fee', p.UVarintType, 0), - 4: ('recipient_id', p.UnicodeType, 0), - 5: ('sender_public_key', p.BytesType, 0), - 6: ('requester_public_key', p.BytesType, 0), - 7: ('signature', p.BytesType, 0), - 8: ('timestamp', p.UVarintType, 0), - 9: ('asset', LiskTransactionAsset, 0), + 1: ('type', p.EnumType("LiskTransactionType", (0, 1, 2, 3, 4, 5, 6, 7)), None), + 2: ('amount', p.UVarintType, None), + 3: ('fee', p.UVarintType, None), + 4: ('recipient_id', p.UnicodeType, None), + 5: ('sender_public_key', p.BytesType, None), + 6: ('requester_public_key', p.BytesType, None), + 7: ('signature', p.BytesType, None), + 8: ('timestamp', p.UVarintType, None), + 9: ('asset', LiskTransactionAsset, None), } diff --git a/core/src/trezor/messages/LiskVerifyMessage.py b/core/src/trezor/messages/LiskVerifyMessage.py index 50b4f160c..1b91c9d4e 100644 --- a/core/src/trezor/messages/LiskVerifyMessage.py +++ b/core/src/trezor/messages/LiskVerifyMessage.py @@ -15,6 +15,7 @@ class LiskVerifyMessage(p.MessageType): def __init__( self, + *, public_key: bytes = None, signature: bytes = None, message: bytes = None, @@ -26,7 +27,7 @@ class LiskVerifyMessage(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('public_key', p.BytesType, 0), - 2: ('signature', p.BytesType, 0), - 3: ('message', p.BytesType, 0), + 1: ('public_key', p.BytesType, None), + 2: ('signature', p.BytesType, None), + 3: ('message', p.BytesType, None), } diff --git a/core/src/trezor/messages/LoadDevice.py b/core/src/trezor/messages/LoadDevice.py index 18ebd512a..aa69c219f 100644 --- a/core/src/trezor/messages/LoadDevice.py +++ b/core/src/trezor/messages/LoadDevice.py @@ -15,10 +15,11 @@ class LoadDevice(p.MessageType): def __init__( self, + *, mnemonics: List[str] = None, pin: str = None, passphrase_protection: bool = None, - language: str = None, + language: str = "en-US", label: str = None, skip_checksum: bool = None, u2f_counter: int = None, @@ -39,12 +40,12 @@ class LoadDevice(p.MessageType): def get_fields(cls) -> Dict: return { 1: ('mnemonics', p.UnicodeType, p.FLAG_REPEATED), - 3: ('pin', p.UnicodeType, 0), - 4: ('passphrase_protection', p.BoolType, 0), - 5: ('language', p.UnicodeType, 0), # default=en-US - 6: ('label', p.UnicodeType, 0), - 7: ('skip_checksum', p.BoolType, 0), - 8: ('u2f_counter', p.UVarintType, 0), - 9: ('needs_backup', p.BoolType, 0), - 10: ('no_backup', p.BoolType, 0), + 3: ('pin', p.UnicodeType, None), + 4: ('passphrase_protection', p.BoolType, None), + 5: ('language', p.UnicodeType, "en-US"), # default=en-US + 6: ('label', p.UnicodeType, None), + 7: ('skip_checksum', p.BoolType, None), + 8: ('u2f_counter', p.UVarintType, None), + 9: ('needs_backup', p.BoolType, None), + 10: ('no_backup', p.BoolType, None), } diff --git a/core/src/trezor/messages/MessageSignature.py b/core/src/trezor/messages/MessageSignature.py index 2e8d4316d..9fde379b7 100644 --- a/core/src/trezor/messages/MessageSignature.py +++ b/core/src/trezor/messages/MessageSignature.py @@ -15,6 +15,7 @@ class MessageSignature(p.MessageType): def __init__( self, + *, address: str = None, signature: bytes = None, ) -> None: @@ -24,6 +25,6 @@ class MessageSignature(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('address', p.UnicodeType, 0), - 2: ('signature', p.BytesType, 0), + 1: ('address', p.UnicodeType, None), + 2: ('signature', p.BytesType, None), } diff --git a/core/src/trezor/messages/MoneroAccountPublicAddress.py b/core/src/trezor/messages/MoneroAccountPublicAddress.py index 039c5fca5..b8b8ab829 100644 --- a/core/src/trezor/messages/MoneroAccountPublicAddress.py +++ b/core/src/trezor/messages/MoneroAccountPublicAddress.py @@ -14,6 +14,7 @@ class MoneroAccountPublicAddress(p.MessageType): def __init__( self, + *, spend_public_key: bytes = None, view_public_key: bytes = None, ) -> None: @@ -23,6 +24,6 @@ class MoneroAccountPublicAddress(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('spend_public_key', p.BytesType, 0), - 2: ('view_public_key', p.BytesType, 0), + 1: ('spend_public_key', p.BytesType, None), + 2: ('view_public_key', p.BytesType, None), } diff --git a/core/src/trezor/messages/MoneroAddress.py b/core/src/trezor/messages/MoneroAddress.py index 6e88dd3e2..cb0a4f1aa 100644 --- a/core/src/trezor/messages/MoneroAddress.py +++ b/core/src/trezor/messages/MoneroAddress.py @@ -15,6 +15,7 @@ class MoneroAddress(p.MessageType): def __init__( self, + *, address: bytes = None, ) -> None: self.address = address @@ -22,5 +23,5 @@ class MoneroAddress(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('address', p.BytesType, 0), + 1: ('address', p.BytesType, None), } diff --git a/core/src/trezor/messages/MoneroExportedKeyImage.py b/core/src/trezor/messages/MoneroExportedKeyImage.py index f0d9225bc..7394e17ec 100644 --- a/core/src/trezor/messages/MoneroExportedKeyImage.py +++ b/core/src/trezor/messages/MoneroExportedKeyImage.py @@ -14,6 +14,7 @@ class MoneroExportedKeyImage(p.MessageType): def __init__( self, + *, iv: bytes = None, blob: bytes = None, ) -> None: @@ -23,6 +24,6 @@ class MoneroExportedKeyImage(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('iv', p.BytesType, 0), - 3: ('blob', p.BytesType, 0), + 1: ('iv', p.BytesType, None), + 3: ('blob', p.BytesType, None), } diff --git a/core/src/trezor/messages/MoneroGetAddress.py b/core/src/trezor/messages/MoneroGetAddress.py index 4c8fb2ea9..dd4891084 100644 --- a/core/src/trezor/messages/MoneroGetAddress.py +++ b/core/src/trezor/messages/MoneroGetAddress.py @@ -15,6 +15,7 @@ class MoneroGetAddress(p.MessageType): def __init__( self, + *, address_n: List[int] = None, show_display: bool = None, network_type: int = None, @@ -33,9 +34,9 @@ class MoneroGetAddress(p.MessageType): def get_fields(cls) -> Dict: return { 1: ('address_n', p.UVarintType, p.FLAG_REPEATED), - 2: ('show_display', p.BoolType, 0), - 3: ('network_type', p.UVarintType, 0), - 4: ('account', p.UVarintType, 0), - 5: ('minor', p.UVarintType, 0), - 6: ('payment_id', p.BytesType, 0), + 2: ('show_display', p.BoolType, None), + 3: ('network_type', p.UVarintType, None), + 4: ('account', p.UVarintType, None), + 5: ('minor', p.UVarintType, None), + 6: ('payment_id', p.BytesType, None), } diff --git a/core/src/trezor/messages/MoneroGetTxKeyAck.py b/core/src/trezor/messages/MoneroGetTxKeyAck.py index c835014a6..43c111f97 100644 --- a/core/src/trezor/messages/MoneroGetTxKeyAck.py +++ b/core/src/trezor/messages/MoneroGetTxKeyAck.py @@ -15,6 +15,7 @@ class MoneroGetTxKeyAck(p.MessageType): def __init__( self, + *, salt: bytes = None, tx_keys: bytes = None, tx_derivations: bytes = None, @@ -26,7 +27,7 @@ class MoneroGetTxKeyAck(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('salt', p.BytesType, 0), - 2: ('tx_keys', p.BytesType, 0), - 3: ('tx_derivations', p.BytesType, 0), + 1: ('salt', p.BytesType, None), + 2: ('tx_keys', p.BytesType, None), + 3: ('tx_derivations', p.BytesType, None), } diff --git a/core/src/trezor/messages/MoneroGetTxKeyRequest.py b/core/src/trezor/messages/MoneroGetTxKeyRequest.py index 7688e6b85..b65a01b0d 100644 --- a/core/src/trezor/messages/MoneroGetTxKeyRequest.py +++ b/core/src/trezor/messages/MoneroGetTxKeyRequest.py @@ -15,6 +15,7 @@ class MoneroGetTxKeyRequest(p.MessageType): def __init__( self, + *, address_n: List[int] = None, network_type: int = None, salt1: bytes = None, @@ -37,11 +38,11 @@ class MoneroGetTxKeyRequest(p.MessageType): def get_fields(cls) -> Dict: return { 1: ('address_n', p.UVarintType, p.FLAG_REPEATED), - 2: ('network_type', p.UVarintType, 0), - 3: ('salt1', p.BytesType, 0), - 4: ('salt2', p.BytesType, 0), - 5: ('tx_enc_keys', p.BytesType, 0), - 6: ('tx_prefix_hash', p.BytesType, 0), - 7: ('reason', p.UVarintType, 0), - 8: ('view_public_key', p.BytesType, 0), + 2: ('network_type', p.UVarintType, None), + 3: ('salt1', p.BytesType, None), + 4: ('salt2', p.BytesType, None), + 5: ('tx_enc_keys', p.BytesType, None), + 6: ('tx_prefix_hash', p.BytesType, None), + 7: ('reason', p.UVarintType, None), + 8: ('view_public_key', p.BytesType, None), } diff --git a/core/src/trezor/messages/MoneroGetWatchKey.py b/core/src/trezor/messages/MoneroGetWatchKey.py index 1a8184d5f..102e56eec 100644 --- a/core/src/trezor/messages/MoneroGetWatchKey.py +++ b/core/src/trezor/messages/MoneroGetWatchKey.py @@ -15,6 +15,7 @@ class MoneroGetWatchKey(p.MessageType): def __init__( self, + *, address_n: List[int] = None, network_type: int = None, ) -> None: @@ -25,5 +26,5 @@ class MoneroGetWatchKey(p.MessageType): def get_fields(cls) -> Dict: return { 1: ('address_n', p.UVarintType, p.FLAG_REPEATED), - 2: ('network_type', p.UVarintType, 0), + 2: ('network_type', p.UVarintType, None), } diff --git a/core/src/trezor/messages/MoneroKeyImageExportInitRequest.py b/core/src/trezor/messages/MoneroKeyImageExportInitRequest.py index 174f8238f..4772ab1f9 100644 --- a/core/src/trezor/messages/MoneroKeyImageExportInitRequest.py +++ b/core/src/trezor/messages/MoneroKeyImageExportInitRequest.py @@ -17,24 +17,25 @@ class MoneroKeyImageExportInitRequest(p.MessageType): def __init__( self, + *, + address_n: List[int] = None, + subs: List[MoneroSubAddressIndicesList] = None, num: int = None, hash: bytes = None, - address_n: List[int] = None, network_type: int = None, - subs: List[MoneroSubAddressIndicesList] = None, ) -> None: + self.address_n = address_n if address_n is not None else [] + self.subs = subs if subs is not None else [] self.num = num self.hash = hash - self.address_n = address_n if address_n is not None else [] self.network_type = network_type - self.subs = subs if subs is not None else [] @classmethod def get_fields(cls) -> Dict: return { - 1: ('num', p.UVarintType, 0), - 2: ('hash', p.BytesType, 0), + 1: ('num', p.UVarintType, None), + 2: ('hash', p.BytesType, None), 3: ('address_n', p.UVarintType, p.FLAG_REPEATED), - 4: ('network_type', p.UVarintType, 0), + 4: ('network_type', p.UVarintType, None), 5: ('subs', MoneroSubAddressIndicesList, p.FLAG_REPEATED), } diff --git a/core/src/trezor/messages/MoneroKeyImageSyncFinalAck.py b/core/src/trezor/messages/MoneroKeyImageSyncFinalAck.py index 4c1b1ec1c..f644a54e2 100644 --- a/core/src/trezor/messages/MoneroKeyImageSyncFinalAck.py +++ b/core/src/trezor/messages/MoneroKeyImageSyncFinalAck.py @@ -15,6 +15,7 @@ class MoneroKeyImageSyncFinalAck(p.MessageType): def __init__( self, + *, enc_key: bytes = None, ) -> None: self.enc_key = enc_key @@ -22,5 +23,5 @@ class MoneroKeyImageSyncFinalAck(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('enc_key', p.BytesType, 0), + 1: ('enc_key', p.BytesType, None), } diff --git a/core/src/trezor/messages/MoneroKeyImageSyncStepAck.py b/core/src/trezor/messages/MoneroKeyImageSyncStepAck.py index 0eda483e2..2a4c57bbe 100644 --- a/core/src/trezor/messages/MoneroKeyImageSyncStepAck.py +++ b/core/src/trezor/messages/MoneroKeyImageSyncStepAck.py @@ -17,6 +17,7 @@ class MoneroKeyImageSyncStepAck(p.MessageType): def __init__( self, + *, kis: List[MoneroExportedKeyImage] = None, ) -> None: self.kis = kis if kis is not None else [] diff --git a/core/src/trezor/messages/MoneroKeyImageSyncStepRequest.py b/core/src/trezor/messages/MoneroKeyImageSyncStepRequest.py index a50f0241e..e9aac326a 100644 --- a/core/src/trezor/messages/MoneroKeyImageSyncStepRequest.py +++ b/core/src/trezor/messages/MoneroKeyImageSyncStepRequest.py @@ -17,6 +17,7 @@ class MoneroKeyImageSyncStepRequest(p.MessageType): def __init__( self, + *, tdis: List[MoneroTransferDetails] = None, ) -> None: self.tdis = tdis if tdis is not None else [] diff --git a/core/src/trezor/messages/MoneroLiveRefreshStartRequest.py b/core/src/trezor/messages/MoneroLiveRefreshStartRequest.py index 70a539953..82655a024 100644 --- a/core/src/trezor/messages/MoneroLiveRefreshStartRequest.py +++ b/core/src/trezor/messages/MoneroLiveRefreshStartRequest.py @@ -15,6 +15,7 @@ class MoneroLiveRefreshStartRequest(p.MessageType): def __init__( self, + *, address_n: List[int] = None, network_type: int = None, ) -> None: @@ -25,5 +26,5 @@ class MoneroLiveRefreshStartRequest(p.MessageType): def get_fields(cls) -> Dict: return { 1: ('address_n', p.UVarintType, p.FLAG_REPEATED), - 2: ('network_type', p.UVarintType, 0), + 2: ('network_type', p.UVarintType, None), } diff --git a/core/src/trezor/messages/MoneroLiveRefreshStepAck.py b/core/src/trezor/messages/MoneroLiveRefreshStepAck.py index 07a1c7430..eaa11eb84 100644 --- a/core/src/trezor/messages/MoneroLiveRefreshStepAck.py +++ b/core/src/trezor/messages/MoneroLiveRefreshStepAck.py @@ -15,6 +15,7 @@ class MoneroLiveRefreshStepAck(p.MessageType): def __init__( self, + *, salt: bytes = None, key_image: bytes = None, ) -> None: @@ -24,6 +25,6 @@ class MoneroLiveRefreshStepAck(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('salt', p.BytesType, 0), - 2: ('key_image', p.BytesType, 0), + 1: ('salt', p.BytesType, None), + 2: ('key_image', p.BytesType, None), } diff --git a/core/src/trezor/messages/MoneroLiveRefreshStepRequest.py b/core/src/trezor/messages/MoneroLiveRefreshStepRequest.py index 26201b169..b410659ec 100644 --- a/core/src/trezor/messages/MoneroLiveRefreshStepRequest.py +++ b/core/src/trezor/messages/MoneroLiveRefreshStepRequest.py @@ -15,6 +15,7 @@ class MoneroLiveRefreshStepRequest(p.MessageType): def __init__( self, + *, out_key: bytes = None, recv_deriv: bytes = None, real_out_idx: int = None, @@ -30,9 +31,9 @@ class MoneroLiveRefreshStepRequest(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('out_key', p.BytesType, 0), - 2: ('recv_deriv', p.BytesType, 0), - 3: ('real_out_idx', p.UVarintType, 0), - 4: ('sub_addr_major', p.UVarintType, 0), - 5: ('sub_addr_minor', p.UVarintType, 0), + 1: ('out_key', p.BytesType, None), + 2: ('recv_deriv', p.BytesType, None), + 3: ('real_out_idx', p.UVarintType, None), + 4: ('sub_addr_major', p.UVarintType, None), + 5: ('sub_addr_minor', p.UVarintType, None), } diff --git a/core/src/trezor/messages/MoneroMultisigKLRki.py b/core/src/trezor/messages/MoneroMultisigKLRki.py index f371cce01..c1758f9d4 100644 --- a/core/src/trezor/messages/MoneroMultisigKLRki.py +++ b/core/src/trezor/messages/MoneroMultisigKLRki.py @@ -14,6 +14,7 @@ class MoneroMultisigKLRki(p.MessageType): def __init__( self, + *, K: bytes = None, L: bytes = None, R: bytes = None, @@ -27,8 +28,8 @@ class MoneroMultisigKLRki(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('K', p.BytesType, 0), - 2: ('L', p.BytesType, 0), - 3: ('R', p.BytesType, 0), - 4: ('ki', p.BytesType, 0), + 1: ('K', p.BytesType, None), + 2: ('L', p.BytesType, None), + 3: ('R', p.BytesType, None), + 4: ('ki', p.BytesType, None), } diff --git a/core/src/trezor/messages/MoneroOutputEntry.py b/core/src/trezor/messages/MoneroOutputEntry.py index 739bd375d..9bdb71333 100644 --- a/core/src/trezor/messages/MoneroOutputEntry.py +++ b/core/src/trezor/messages/MoneroOutputEntry.py @@ -16,6 +16,7 @@ class MoneroOutputEntry(p.MessageType): def __init__( self, + *, idx: int = None, key: MoneroRctKeyPublic = None, ) -> None: @@ -25,6 +26,6 @@ class MoneroOutputEntry(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('idx', p.UVarintType, 0), - 2: ('key', MoneroRctKeyPublic, 0), + 1: ('idx', p.UVarintType, None), + 2: ('key', MoneroRctKeyPublic, None), } diff --git a/core/src/trezor/messages/MoneroRctKeyPublic.py b/core/src/trezor/messages/MoneroRctKeyPublic.py index 1d9becb5c..2ceb5422a 100644 --- a/core/src/trezor/messages/MoneroRctKeyPublic.py +++ b/core/src/trezor/messages/MoneroRctKeyPublic.py @@ -14,6 +14,7 @@ class MoneroRctKeyPublic(p.MessageType): def __init__( self, + *, dest: bytes = None, commitment: bytes = None, ) -> None: @@ -23,6 +24,6 @@ class MoneroRctKeyPublic(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('dest', p.BytesType, 0), - 2: ('commitment', p.BytesType, 0), + 1: ('dest', p.BytesType, None), + 2: ('commitment', p.BytesType, None), } diff --git a/core/src/trezor/messages/MoneroRingCtSig.py b/core/src/trezor/messages/MoneroRingCtSig.py index 2c6659e2b..6c4f6d111 100644 --- a/core/src/trezor/messages/MoneroRingCtSig.py +++ b/core/src/trezor/messages/MoneroRingCtSig.py @@ -14,6 +14,7 @@ class MoneroRingCtSig(p.MessageType): def __init__( self, + *, txn_fee: int = None, message: bytes = None, rv_type: int = None, @@ -25,7 +26,7 @@ class MoneroRingCtSig(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('txn_fee', p.UVarintType, 0), - 2: ('message', p.BytesType, 0), - 3: ('rv_type', p.UVarintType, 0), + 1: ('txn_fee', p.UVarintType, None), + 2: ('message', p.BytesType, None), + 3: ('rv_type', p.UVarintType, None), } diff --git a/core/src/trezor/messages/MoneroSubAddressIndicesList.py b/core/src/trezor/messages/MoneroSubAddressIndicesList.py index 6f9d22764..9d27460ba 100644 --- a/core/src/trezor/messages/MoneroSubAddressIndicesList.py +++ b/core/src/trezor/messages/MoneroSubAddressIndicesList.py @@ -14,15 +14,16 @@ class MoneroSubAddressIndicesList(p.MessageType): def __init__( self, - account: int = None, + *, minor_indices: List[int] = None, + account: int = None, ) -> None: - self.account = account self.minor_indices = minor_indices if minor_indices is not None else [] + self.account = account @classmethod def get_fields(cls) -> Dict: return { - 1: ('account', p.UVarintType, 0), + 1: ('account', p.UVarintType, None), 2: ('minor_indices', p.UVarintType, p.FLAG_REPEATED), } diff --git a/core/src/trezor/messages/MoneroTransactionAllInputsSetAck.py b/core/src/trezor/messages/MoneroTransactionAllInputsSetAck.py index dc6da29fb..bb2d70171 100644 --- a/core/src/trezor/messages/MoneroTransactionAllInputsSetAck.py +++ b/core/src/trezor/messages/MoneroTransactionAllInputsSetAck.py @@ -17,6 +17,7 @@ class MoneroTransactionAllInputsSetAck(p.MessageType): def __init__( self, + *, rsig_data: MoneroTransactionRsigData = None, ) -> None: self.rsig_data = rsig_data @@ -24,5 +25,5 @@ class MoneroTransactionAllInputsSetAck(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('rsig_data', MoneroTransactionRsigData, 0), + 1: ('rsig_data', MoneroTransactionRsigData, None), } diff --git a/core/src/trezor/messages/MoneroTransactionAllOutSetAck.py b/core/src/trezor/messages/MoneroTransactionAllOutSetAck.py index f5216283f..4452db9a6 100644 --- a/core/src/trezor/messages/MoneroTransactionAllOutSetAck.py +++ b/core/src/trezor/messages/MoneroTransactionAllOutSetAck.py @@ -17,6 +17,7 @@ class MoneroTransactionAllOutSetAck(p.MessageType): def __init__( self, + *, extra: bytes = None, tx_prefix_hash: bytes = None, rv: MoneroRingCtSig = None, @@ -30,8 +31,8 @@ class MoneroTransactionAllOutSetAck(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('extra', p.BytesType, 0), - 2: ('tx_prefix_hash', p.BytesType, 0), - 4: ('rv', MoneroRingCtSig, 0), - 5: ('full_message_hash', p.BytesType, 0), + 1: ('extra', p.BytesType, None), + 2: ('tx_prefix_hash', p.BytesType, None), + 4: ('rv', MoneroRingCtSig, None), + 5: ('full_message_hash', p.BytesType, None), } diff --git a/core/src/trezor/messages/MoneroTransactionAllOutSetRequest.py b/core/src/trezor/messages/MoneroTransactionAllOutSetRequest.py index fc8e257c7..33ee18aef 100644 --- a/core/src/trezor/messages/MoneroTransactionAllOutSetRequest.py +++ b/core/src/trezor/messages/MoneroTransactionAllOutSetRequest.py @@ -17,6 +17,7 @@ class MoneroTransactionAllOutSetRequest(p.MessageType): def __init__( self, + *, rsig_data: MoneroTransactionRsigData = None, ) -> None: self.rsig_data = rsig_data @@ -24,5 +25,5 @@ class MoneroTransactionAllOutSetRequest(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('rsig_data', MoneroTransactionRsigData, 0), + 1: ('rsig_data', MoneroTransactionRsigData, None), } diff --git a/core/src/trezor/messages/MoneroTransactionData.py b/core/src/trezor/messages/MoneroTransactionData.py index 04536ff16..a63baa1a9 100644 --- a/core/src/trezor/messages/MoneroTransactionData.py +++ b/core/src/trezor/messages/MoneroTransactionData.py @@ -17,34 +17,35 @@ class MoneroTransactionData(p.MessageType): def __init__( self, + *, + outputs: List[MoneroTransactionDestinationEntry] = None, + minor_indices: List[int] = None, + integrated_indices: List[int] = None, version: int = None, payment_id: bytes = None, unlock_time: int = None, - outputs: List[MoneroTransactionDestinationEntry] = None, change_dts: MoneroTransactionDestinationEntry = None, num_inputs: int = None, mixin: int = None, fee: int = None, account: int = None, - minor_indices: List[int] = None, rsig_data: MoneroTransactionRsigData = None, - integrated_indices: List[int] = None, client_version: int = None, hard_fork: int = None, monero_version: bytes = None, ) -> None: + self.outputs = outputs if outputs is not None else [] + self.minor_indices = minor_indices if minor_indices is not None else [] + self.integrated_indices = integrated_indices if integrated_indices is not None else [] self.version = version self.payment_id = payment_id self.unlock_time = unlock_time - self.outputs = outputs if outputs is not None else [] self.change_dts = change_dts self.num_inputs = num_inputs self.mixin = mixin self.fee = fee self.account = account - self.minor_indices = minor_indices if minor_indices is not None else [] self.rsig_data = rsig_data - self.integrated_indices = integrated_indices if integrated_indices is not None else [] self.client_version = client_version self.hard_fork = hard_fork self.monero_version = monero_version @@ -52,19 +53,19 @@ class MoneroTransactionData(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('version', p.UVarintType, 0), - 2: ('payment_id', p.BytesType, 0), - 3: ('unlock_time', p.UVarintType, 0), + 1: ('version', p.UVarintType, None), + 2: ('payment_id', p.BytesType, None), + 3: ('unlock_time', p.UVarintType, None), 4: ('outputs', MoneroTransactionDestinationEntry, p.FLAG_REPEATED), - 5: ('change_dts', MoneroTransactionDestinationEntry, 0), - 6: ('num_inputs', p.UVarintType, 0), - 7: ('mixin', p.UVarintType, 0), - 8: ('fee', p.UVarintType, 0), - 9: ('account', p.UVarintType, 0), + 5: ('change_dts', MoneroTransactionDestinationEntry, None), + 6: ('num_inputs', p.UVarintType, None), + 7: ('mixin', p.UVarintType, None), + 8: ('fee', p.UVarintType, None), + 9: ('account', p.UVarintType, None), 10: ('minor_indices', p.UVarintType, p.FLAG_REPEATED), - 11: ('rsig_data', MoneroTransactionRsigData, 0), + 11: ('rsig_data', MoneroTransactionRsigData, None), 12: ('integrated_indices', p.UVarintType, p.FLAG_REPEATED), - 13: ('client_version', p.UVarintType, 0), - 14: ('hard_fork', p.UVarintType, 0), - 15: ('monero_version', p.BytesType, 0), + 13: ('client_version', p.UVarintType, None), + 14: ('hard_fork', p.UVarintType, None), + 15: ('monero_version', p.BytesType, None), } diff --git a/core/src/trezor/messages/MoneroTransactionDestinationEntry.py b/core/src/trezor/messages/MoneroTransactionDestinationEntry.py index 7a4159284..fcf2bef16 100644 --- a/core/src/trezor/messages/MoneroTransactionDestinationEntry.py +++ b/core/src/trezor/messages/MoneroTransactionDestinationEntry.py @@ -16,6 +16,7 @@ class MoneroTransactionDestinationEntry(p.MessageType): def __init__( self, + *, amount: int = None, addr: MoneroAccountPublicAddress = None, is_subaddress: bool = None, @@ -31,9 +32,9 @@ class MoneroTransactionDestinationEntry(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('amount', p.UVarintType, 0), - 2: ('addr', MoneroAccountPublicAddress, 0), - 3: ('is_subaddress', p.BoolType, 0), - 4: ('original', p.BytesType, 0), - 5: ('is_integrated', p.BoolType, 0), + 1: ('amount', p.UVarintType, None), + 2: ('addr', MoneroAccountPublicAddress, None), + 3: ('is_subaddress', p.BoolType, None), + 4: ('original', p.BytesType, None), + 5: ('is_integrated', p.BoolType, None), } diff --git a/core/src/trezor/messages/MoneroTransactionFinalAck.py b/core/src/trezor/messages/MoneroTransactionFinalAck.py index b8f74853d..a99b6da45 100644 --- a/core/src/trezor/messages/MoneroTransactionFinalAck.py +++ b/core/src/trezor/messages/MoneroTransactionFinalAck.py @@ -15,6 +15,7 @@ class MoneroTransactionFinalAck(p.MessageType): def __init__( self, + *, cout_key: bytes = None, salt: bytes = None, rand_mult: bytes = None, @@ -30,9 +31,9 @@ class MoneroTransactionFinalAck(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('cout_key', p.BytesType, 0), - 2: ('salt', p.BytesType, 0), - 3: ('rand_mult', p.BytesType, 0), - 4: ('tx_enc_keys', p.BytesType, 0), - 5: ('opening_key', p.BytesType, 0), + 1: ('cout_key', p.BytesType, None), + 2: ('salt', p.BytesType, None), + 3: ('rand_mult', p.BytesType, None), + 4: ('tx_enc_keys', p.BytesType, None), + 5: ('opening_key', p.BytesType, None), } diff --git a/core/src/trezor/messages/MoneroTransactionInitAck.py b/core/src/trezor/messages/MoneroTransactionInitAck.py index 2a94f6aa6..e3f921ddd 100644 --- a/core/src/trezor/messages/MoneroTransactionInitAck.py +++ b/core/src/trezor/messages/MoneroTransactionInitAck.py @@ -17,6 +17,7 @@ class MoneroTransactionInitAck(p.MessageType): def __init__( self, + *, hmacs: List[bytes] = None, rsig_data: MoneroTransactionRsigData = None, ) -> None: @@ -27,5 +28,5 @@ class MoneroTransactionInitAck(p.MessageType): def get_fields(cls) -> Dict: return { 1: ('hmacs', p.BytesType, p.FLAG_REPEATED), - 2: ('rsig_data', MoneroTransactionRsigData, 0), + 2: ('rsig_data', MoneroTransactionRsigData, None), } diff --git a/core/src/trezor/messages/MoneroTransactionInitRequest.py b/core/src/trezor/messages/MoneroTransactionInitRequest.py index 1ab3e0f16..9178493bf 100644 --- a/core/src/trezor/messages/MoneroTransactionInitRequest.py +++ b/core/src/trezor/messages/MoneroTransactionInitRequest.py @@ -17,21 +17,22 @@ class MoneroTransactionInitRequest(p.MessageType): def __init__( self, - version: int = None, + *, address_n: List[int] = None, + version: int = None, network_type: int = None, tsx_data: MoneroTransactionData = None, ) -> None: - self.version = version self.address_n = address_n if address_n is not None else [] + self.version = version self.network_type = network_type self.tsx_data = tsx_data @classmethod def get_fields(cls) -> Dict: return { - 1: ('version', p.UVarintType, 0), + 1: ('version', p.UVarintType, None), 2: ('address_n', p.UVarintType, p.FLAG_REPEATED), - 3: ('network_type', p.UVarintType, 0), - 4: ('tsx_data', MoneroTransactionData, 0), + 3: ('network_type', p.UVarintType, None), + 4: ('tsx_data', MoneroTransactionData, None), } diff --git a/core/src/trezor/messages/MoneroTransactionInputViniRequest.py b/core/src/trezor/messages/MoneroTransactionInputViniRequest.py index a00adbca4..220df2a47 100644 --- a/core/src/trezor/messages/MoneroTransactionInputViniRequest.py +++ b/core/src/trezor/messages/MoneroTransactionInputViniRequest.py @@ -17,6 +17,7 @@ class MoneroTransactionInputViniRequest(p.MessageType): def __init__( self, + *, src_entr: MoneroTransactionSourceEntry = None, vini: bytes = None, vini_hmac: bytes = None, @@ -34,10 +35,10 @@ class MoneroTransactionInputViniRequest(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('src_entr', MoneroTransactionSourceEntry, 0), - 2: ('vini', p.BytesType, 0), - 3: ('vini_hmac', p.BytesType, 0), - 4: ('pseudo_out', p.BytesType, 0), - 5: ('pseudo_out_hmac', p.BytesType, 0), - 6: ('orig_idx', p.UVarintType, 0), + 1: ('src_entr', MoneroTransactionSourceEntry, None), + 2: ('vini', p.BytesType, None), + 3: ('vini_hmac', p.BytesType, None), + 4: ('pseudo_out', p.BytesType, None), + 5: ('pseudo_out_hmac', p.BytesType, None), + 6: ('orig_idx', p.UVarintType, None), } diff --git a/core/src/trezor/messages/MoneroTransactionInputsPermutationRequest.py b/core/src/trezor/messages/MoneroTransactionInputsPermutationRequest.py index 1021bea27..36f36bfea 100644 --- a/core/src/trezor/messages/MoneroTransactionInputsPermutationRequest.py +++ b/core/src/trezor/messages/MoneroTransactionInputsPermutationRequest.py @@ -15,6 +15,7 @@ class MoneroTransactionInputsPermutationRequest(p.MessageType): def __init__( self, + *, perm: List[int] = None, ) -> None: self.perm = perm if perm is not None else [] diff --git a/core/src/trezor/messages/MoneroTransactionRsigData.py b/core/src/trezor/messages/MoneroTransactionRsigData.py index 95a2b88e6..d5aef9e91 100644 --- a/core/src/trezor/messages/MoneroTransactionRsigData.py +++ b/core/src/trezor/messages/MoneroTransactionRsigData.py @@ -14,30 +14,31 @@ class MoneroTransactionRsigData(p.MessageType): def __init__( self, + *, + grouping: List[int] = None, + rsig_parts: List[bytes] = None, rsig_type: int = None, offload_type: int = None, - grouping: List[int] = None, mask: bytes = None, rsig: bytes = None, - rsig_parts: List[bytes] = None, bp_version: int = None, ) -> None: + self.grouping = grouping if grouping is not None else [] + self.rsig_parts = rsig_parts if rsig_parts is not None else [] self.rsig_type = rsig_type self.offload_type = offload_type - self.grouping = grouping if grouping is not None else [] self.mask = mask self.rsig = rsig - self.rsig_parts = rsig_parts if rsig_parts is not None else [] self.bp_version = bp_version @classmethod def get_fields(cls) -> Dict: return { - 1: ('rsig_type', p.UVarintType, 0), - 2: ('offload_type', p.UVarintType, 0), + 1: ('rsig_type', p.UVarintType, None), + 2: ('offload_type', p.UVarintType, None), 3: ('grouping', p.UVarintType, p.FLAG_REPEATED), - 4: ('mask', p.BytesType, 0), - 5: ('rsig', p.BytesType, 0), + 4: ('mask', p.BytesType, None), + 5: ('rsig', p.BytesType, None), 6: ('rsig_parts', p.BytesType, p.FLAG_REPEATED), - 7: ('bp_version', p.UVarintType, 0), + 7: ('bp_version', p.UVarintType, None), } diff --git a/core/src/trezor/messages/MoneroTransactionSetInputAck.py b/core/src/trezor/messages/MoneroTransactionSetInputAck.py index fe4a5c431..4c5f73cdd 100644 --- a/core/src/trezor/messages/MoneroTransactionSetInputAck.py +++ b/core/src/trezor/messages/MoneroTransactionSetInputAck.py @@ -15,6 +15,7 @@ class MoneroTransactionSetInputAck(p.MessageType): def __init__( self, + *, vini: bytes = None, vini_hmac: bytes = None, pseudo_out: bytes = None, @@ -32,10 +33,10 @@ class MoneroTransactionSetInputAck(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('vini', p.BytesType, 0), - 2: ('vini_hmac', p.BytesType, 0), - 3: ('pseudo_out', p.BytesType, 0), - 4: ('pseudo_out_hmac', p.BytesType, 0), - 5: ('pseudo_out_alpha', p.BytesType, 0), - 6: ('spend_key', p.BytesType, 0), + 1: ('vini', p.BytesType, None), + 2: ('vini_hmac', p.BytesType, None), + 3: ('pseudo_out', p.BytesType, None), + 4: ('pseudo_out_hmac', p.BytesType, None), + 5: ('pseudo_out_alpha', p.BytesType, None), + 6: ('spend_key', p.BytesType, None), } diff --git a/core/src/trezor/messages/MoneroTransactionSetInputRequest.py b/core/src/trezor/messages/MoneroTransactionSetInputRequest.py index 9f185d532..3670da7eb 100644 --- a/core/src/trezor/messages/MoneroTransactionSetInputRequest.py +++ b/core/src/trezor/messages/MoneroTransactionSetInputRequest.py @@ -17,6 +17,7 @@ class MoneroTransactionSetInputRequest(p.MessageType): def __init__( self, + *, src_entr: MoneroTransactionSourceEntry = None, ) -> None: self.src_entr = src_entr @@ -24,5 +25,5 @@ class MoneroTransactionSetInputRequest(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('src_entr', MoneroTransactionSourceEntry, 0), + 1: ('src_entr', MoneroTransactionSourceEntry, None), } diff --git a/core/src/trezor/messages/MoneroTransactionSetOutputAck.py b/core/src/trezor/messages/MoneroTransactionSetOutputAck.py index 1e3f51da8..f40825673 100644 --- a/core/src/trezor/messages/MoneroTransactionSetOutputAck.py +++ b/core/src/trezor/messages/MoneroTransactionSetOutputAck.py @@ -17,6 +17,7 @@ class MoneroTransactionSetOutputAck(p.MessageType): def __init__( self, + *, tx_out: bytes = None, vouti_hmac: bytes = None, rsig_data: MoneroTransactionRsigData = None, @@ -32,9 +33,9 @@ class MoneroTransactionSetOutputAck(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('tx_out', p.BytesType, 0), - 2: ('vouti_hmac', p.BytesType, 0), - 3: ('rsig_data', MoneroTransactionRsigData, 0), - 4: ('out_pk', p.BytesType, 0), - 5: ('ecdh_info', p.BytesType, 0), + 1: ('tx_out', p.BytesType, None), + 2: ('vouti_hmac', p.BytesType, None), + 3: ('rsig_data', MoneroTransactionRsigData, None), + 4: ('out_pk', p.BytesType, None), + 5: ('ecdh_info', p.BytesType, None), } diff --git a/core/src/trezor/messages/MoneroTransactionSetOutputRequest.py b/core/src/trezor/messages/MoneroTransactionSetOutputRequest.py index 1d25d81a3..89699c061 100644 --- a/core/src/trezor/messages/MoneroTransactionSetOutputRequest.py +++ b/core/src/trezor/messages/MoneroTransactionSetOutputRequest.py @@ -18,6 +18,7 @@ class MoneroTransactionSetOutputRequest(p.MessageType): def __init__( self, + *, dst_entr: MoneroTransactionDestinationEntry = None, dst_entr_hmac: bytes = None, rsig_data: MoneroTransactionRsigData = None, @@ -31,8 +32,8 @@ class MoneroTransactionSetOutputRequest(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('dst_entr', MoneroTransactionDestinationEntry, 0), - 2: ('dst_entr_hmac', p.BytesType, 0), - 3: ('rsig_data', MoneroTransactionRsigData, 0), - 4: ('is_offloaded_bp', p.BoolType, 0), + 1: ('dst_entr', MoneroTransactionDestinationEntry, None), + 2: ('dst_entr_hmac', p.BytesType, None), + 3: ('rsig_data', MoneroTransactionRsigData, None), + 4: ('is_offloaded_bp', p.BoolType, None), } diff --git a/core/src/trezor/messages/MoneroTransactionSignInputAck.py b/core/src/trezor/messages/MoneroTransactionSignInputAck.py index e72f3c6a2..da1de5aa8 100644 --- a/core/src/trezor/messages/MoneroTransactionSignInputAck.py +++ b/core/src/trezor/messages/MoneroTransactionSignInputAck.py @@ -15,6 +15,7 @@ class MoneroTransactionSignInputAck(p.MessageType): def __init__( self, + *, signature: bytes = None, pseudo_out: bytes = None, ) -> None: @@ -24,6 +25,6 @@ class MoneroTransactionSignInputAck(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('signature', p.BytesType, 0), - 2: ('pseudo_out', p.BytesType, 0), + 1: ('signature', p.BytesType, None), + 2: ('pseudo_out', p.BytesType, None), } diff --git a/core/src/trezor/messages/MoneroTransactionSignInputRequest.py b/core/src/trezor/messages/MoneroTransactionSignInputRequest.py index 323983830..704d56f1d 100644 --- a/core/src/trezor/messages/MoneroTransactionSignInputRequest.py +++ b/core/src/trezor/messages/MoneroTransactionSignInputRequest.py @@ -17,6 +17,7 @@ class MoneroTransactionSignInputRequest(p.MessageType): def __init__( self, + *, src_entr: MoneroTransactionSourceEntry = None, vini: bytes = None, vini_hmac: bytes = None, @@ -38,12 +39,12 @@ class MoneroTransactionSignInputRequest(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('src_entr', MoneroTransactionSourceEntry, 0), - 2: ('vini', p.BytesType, 0), - 3: ('vini_hmac', p.BytesType, 0), - 4: ('pseudo_out', p.BytesType, 0), - 5: ('pseudo_out_hmac', p.BytesType, 0), - 6: ('pseudo_out_alpha', p.BytesType, 0), - 7: ('spend_key', p.BytesType, 0), - 8: ('orig_idx', p.UVarintType, 0), + 1: ('src_entr', MoneroTransactionSourceEntry, None), + 2: ('vini', p.BytesType, None), + 3: ('vini_hmac', p.BytesType, None), + 4: ('pseudo_out', p.BytesType, None), + 5: ('pseudo_out_hmac', p.BytesType, None), + 6: ('pseudo_out_alpha', p.BytesType, None), + 7: ('spend_key', p.BytesType, None), + 8: ('orig_idx', p.UVarintType, None), } diff --git a/core/src/trezor/messages/MoneroTransactionSourceEntry.py b/core/src/trezor/messages/MoneroTransactionSourceEntry.py index 27146916b..914bc93d2 100644 --- a/core/src/trezor/messages/MoneroTransactionSourceEntry.py +++ b/core/src/trezor/messages/MoneroTransactionSourceEntry.py @@ -17,10 +17,11 @@ class MoneroTransactionSourceEntry(p.MessageType): def __init__( self, + *, outputs: List[MoneroOutputEntry] = None, + real_out_additional_tx_keys: List[bytes] = None, real_output: int = None, real_out_tx_key: bytes = None, - real_out_additional_tx_keys: List[bytes] = None, real_output_in_tx_index: int = None, amount: int = None, rct: bool = None, @@ -29,9 +30,9 @@ class MoneroTransactionSourceEntry(p.MessageType): subaddr_minor: int = None, ) -> None: self.outputs = outputs if outputs is not None else [] + self.real_out_additional_tx_keys = real_out_additional_tx_keys if real_out_additional_tx_keys is not None else [] self.real_output = real_output self.real_out_tx_key = real_out_tx_key - self.real_out_additional_tx_keys = real_out_additional_tx_keys if real_out_additional_tx_keys is not None else [] self.real_output_in_tx_index = real_output_in_tx_index self.amount = amount self.rct = rct @@ -43,13 +44,13 @@ class MoneroTransactionSourceEntry(p.MessageType): def get_fields(cls) -> Dict: return { 1: ('outputs', MoneroOutputEntry, p.FLAG_REPEATED), - 2: ('real_output', p.UVarintType, 0), - 3: ('real_out_tx_key', p.BytesType, 0), + 2: ('real_output', p.UVarintType, None), + 3: ('real_out_tx_key', p.BytesType, None), 4: ('real_out_additional_tx_keys', p.BytesType, p.FLAG_REPEATED), - 5: ('real_output_in_tx_index', p.UVarintType, 0), - 6: ('amount', p.UVarintType, 0), - 7: ('rct', p.BoolType, 0), - 8: ('mask', p.BytesType, 0), - 9: ('multisig_kLRki', MoneroMultisigKLRki, 0), - 10: ('subaddr_minor', p.UVarintType, 0), + 5: ('real_output_in_tx_index', p.UVarintType, None), + 6: ('amount', p.UVarintType, None), + 7: ('rct', p.BoolType, None), + 8: ('mask', p.BytesType, None), + 9: ('multisig_kLRki', MoneroMultisigKLRki, None), + 10: ('subaddr_minor', p.UVarintType, None), } diff --git a/core/src/trezor/messages/MoneroTransferDetails.py b/core/src/trezor/messages/MoneroTransferDetails.py index 012afb274..3f1ef6ee9 100644 --- a/core/src/trezor/messages/MoneroTransferDetails.py +++ b/core/src/trezor/messages/MoneroTransferDetails.py @@ -14,16 +14,17 @@ class MoneroTransferDetails(p.MessageType): def __init__( self, + *, + additional_tx_pub_keys: List[bytes] = None, out_key: bytes = None, tx_pub_key: bytes = None, - additional_tx_pub_keys: List[bytes] = None, internal_output_index: int = None, sub_addr_major: int = None, sub_addr_minor: int = None, ) -> None: + self.additional_tx_pub_keys = additional_tx_pub_keys if additional_tx_pub_keys is not None else [] self.out_key = out_key self.tx_pub_key = tx_pub_key - self.additional_tx_pub_keys = additional_tx_pub_keys if additional_tx_pub_keys is not None else [] self.internal_output_index = internal_output_index self.sub_addr_major = sub_addr_major self.sub_addr_minor = sub_addr_minor @@ -31,10 +32,10 @@ class MoneroTransferDetails(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('out_key', p.BytesType, 0), - 2: ('tx_pub_key', p.BytesType, 0), + 1: ('out_key', p.BytesType, None), + 2: ('tx_pub_key', p.BytesType, None), 3: ('additional_tx_pub_keys', p.BytesType, p.FLAG_REPEATED), - 4: ('internal_output_index', p.UVarintType, 0), - 5: ('sub_addr_major', p.UVarintType, 0), - 6: ('sub_addr_minor', p.UVarintType, 0), + 4: ('internal_output_index', p.UVarintType, None), + 5: ('sub_addr_major', p.UVarintType, None), + 6: ('sub_addr_minor', p.UVarintType, None), } diff --git a/core/src/trezor/messages/MoneroWatchKey.py b/core/src/trezor/messages/MoneroWatchKey.py index 9e404636b..6250e5ab7 100644 --- a/core/src/trezor/messages/MoneroWatchKey.py +++ b/core/src/trezor/messages/MoneroWatchKey.py @@ -15,6 +15,7 @@ class MoneroWatchKey(p.MessageType): def __init__( self, + *, watch_key: bytes = None, address: bytes = None, ) -> None: @@ -24,6 +25,6 @@ class MoneroWatchKey(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('watch_key', p.BytesType, 0), - 2: ('address', p.BytesType, 0), + 1: ('watch_key', p.BytesType, None), + 2: ('address', p.BytesType, None), } diff --git a/core/src/trezor/messages/MultisigRedeemScriptType.py b/core/src/trezor/messages/MultisigRedeemScriptType.py index 3b6ce2aee..9005d209e 100644 --- a/core/src/trezor/messages/MultisigRedeemScriptType.py +++ b/core/src/trezor/messages/MultisigRedeemScriptType.py @@ -17,24 +17,25 @@ class MultisigRedeemScriptType(p.MessageType): def __init__( self, + *, + m: int, pubkeys: List[HDNodePathType] = None, signatures: List[bytes] = None, - m: int = None, nodes: List[HDNodeType] = None, address_n: List[int] = None, ) -> None: self.pubkeys = pubkeys if pubkeys is not None else [] self.signatures = signatures if signatures is not None else [] - self.m = m self.nodes = nodes if nodes is not None else [] self.address_n = address_n if address_n is not None else [] + self.m = m @classmethod def get_fields(cls) -> Dict: return { 1: ('pubkeys', HDNodePathType, p.FLAG_REPEATED), 2: ('signatures', p.BytesType, p.FLAG_REPEATED), - 3: ('m', p.UVarintType, 0), + 3: ('m', p.UVarintType, p.FLAG_REQUIRED), 4: ('nodes', HDNodeType, p.FLAG_REPEATED), 5: ('address_n', p.UVarintType, p.FLAG_REPEATED), } diff --git a/core/src/trezor/messages/NEMAddress.py b/core/src/trezor/messages/NEMAddress.py index 4ab32c555..04da2a2f6 100644 --- a/core/src/trezor/messages/NEMAddress.py +++ b/core/src/trezor/messages/NEMAddress.py @@ -15,12 +15,13 @@ class NEMAddress(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, 0), # required + 1: ('address', p.UnicodeType, p.FLAG_REQUIRED), } diff --git a/core/src/trezor/messages/NEMAggregateModification.py b/core/src/trezor/messages/NEMAggregateModification.py index e8bad7480..567a8c1dc 100644 --- a/core/src/trezor/messages/NEMAggregateModification.py +++ b/core/src/trezor/messages/NEMAggregateModification.py @@ -16,6 +16,7 @@ class NEMAggregateModification(p.MessageType): def __init__( self, + *, modifications: List[NEMCosignatoryModification] = None, relative_change: int = None, ) -> None: @@ -26,5 +27,5 @@ class NEMAggregateModification(p.MessageType): def get_fields(cls) -> Dict: return { 1: ('modifications', NEMCosignatoryModification, p.FLAG_REPEATED), - 2: ('relative_change', p.SVarintType, 0), + 2: ('relative_change', p.SVarintType, None), } diff --git a/core/src/trezor/messages/NEMCosignatoryModification.py b/core/src/trezor/messages/NEMCosignatoryModification.py index 7bbe4a92c..b8fc856c6 100644 --- a/core/src/trezor/messages/NEMCosignatoryModification.py +++ b/core/src/trezor/messages/NEMCosignatoryModification.py @@ -15,6 +15,7 @@ class NEMCosignatoryModification(p.MessageType): def __init__( self, + *, type: EnumTypeNEMModificationType = None, public_key: bytes = None, ) -> None: @@ -24,6 +25,6 @@ class NEMCosignatoryModification(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('type', p.EnumType("NEMModificationType", (1, 2)), 0), - 2: ('public_key', p.BytesType, 0), + 1: ('type', p.EnumType("NEMModificationType", (1, 2)), None), + 2: ('public_key', p.BytesType, None), } diff --git a/core/src/trezor/messages/NEMGetAddress.py b/core/src/trezor/messages/NEMGetAddress.py index 00d35f6af..765b29cad 100644 --- a/core/src/trezor/messages/NEMGetAddress.py +++ b/core/src/trezor/messages/NEMGetAddress.py @@ -15,6 +15,7 @@ class NEMGetAddress(p.MessageType): def __init__( self, + *, address_n: List[int] = None, network: int = None, show_display: bool = None, @@ -27,6 +28,6 @@ class NEMGetAddress(p.MessageType): def get_fields(cls) -> Dict: return { 1: ('address_n', p.UVarintType, p.FLAG_REPEATED), - 2: ('network', p.UVarintType, 0), - 3: ('show_display', p.BoolType, 0), + 2: ('network', p.UVarintType, None), + 3: ('show_display', p.BoolType, None), } diff --git a/core/src/trezor/messages/NEMImportanceTransfer.py b/core/src/trezor/messages/NEMImportanceTransfer.py index 94e398a05..f4936426b 100644 --- a/core/src/trezor/messages/NEMImportanceTransfer.py +++ b/core/src/trezor/messages/NEMImportanceTransfer.py @@ -15,6 +15,7 @@ class NEMImportanceTransfer(p.MessageType): def __init__( self, + *, mode: EnumTypeNEMImportanceTransferMode = None, public_key: bytes = None, ) -> None: @@ -24,6 +25,6 @@ class NEMImportanceTransfer(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('mode', p.EnumType("NEMImportanceTransferMode", (1, 2)), 0), - 2: ('public_key', p.BytesType, 0), + 1: ('mode', p.EnumType("NEMImportanceTransferMode", (1, 2)), None), + 2: ('public_key', p.BytesType, None), } diff --git a/core/src/trezor/messages/NEMMosaic.py b/core/src/trezor/messages/NEMMosaic.py index e62a14aad..3409363a6 100644 --- a/core/src/trezor/messages/NEMMosaic.py +++ b/core/src/trezor/messages/NEMMosaic.py @@ -14,6 +14,7 @@ class NEMMosaic(p.MessageType): def __init__( self, + *, namespace: str = None, mosaic: str = None, quantity: int = None, @@ -25,7 +26,7 @@ class NEMMosaic(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('namespace', p.UnicodeType, 0), - 2: ('mosaic', p.UnicodeType, 0), - 3: ('quantity', p.UVarintType, 0), + 1: ('namespace', p.UnicodeType, None), + 2: ('mosaic', p.UnicodeType, None), + 3: ('quantity', p.UVarintType, None), } diff --git a/core/src/trezor/messages/NEMMosaicCreation.py b/core/src/trezor/messages/NEMMosaicCreation.py index 30f1fab4c..cc996cb84 100644 --- a/core/src/trezor/messages/NEMMosaicCreation.py +++ b/core/src/trezor/messages/NEMMosaicCreation.py @@ -16,6 +16,7 @@ class NEMMosaicCreation(p.MessageType): def __init__( self, + *, definition: NEMMosaicDefinition = None, sink: str = None, fee: int = None, @@ -27,7 +28,7 @@ class NEMMosaicCreation(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('definition', NEMMosaicDefinition, 0), - 2: ('sink', p.UnicodeType, 0), - 3: ('fee', p.UVarintType, 0), + 1: ('definition', NEMMosaicDefinition, None), + 2: ('sink', p.UnicodeType, None), + 3: ('fee', p.UVarintType, None), } diff --git a/core/src/trezor/messages/NEMMosaicDefinition.py b/core/src/trezor/messages/NEMMosaicDefinition.py index 6917138c4..d480b5057 100644 --- a/core/src/trezor/messages/NEMMosaicDefinition.py +++ b/core/src/trezor/messages/NEMMosaicDefinition.py @@ -15,6 +15,8 @@ class NEMMosaicDefinition(p.MessageType): def __init__( self, + *, + networks: List[int] = None, name: str = None, ticker: str = None, namespace: str = None, @@ -29,8 +31,8 @@ class NEMMosaicDefinition(p.MessageType): mutable_supply: bool = None, transferable: bool = None, description: str = None, - networks: List[int] = None, ) -> None: + self.networks = networks if networks is not None else [] self.name = name self.ticker = ticker self.namespace = namespace @@ -45,24 +47,23 @@ class NEMMosaicDefinition(p.MessageType): self.mutable_supply = mutable_supply self.transferable = transferable self.description = description - self.networks = networks if networks is not None else [] @classmethod def get_fields(cls) -> Dict: return { - 1: ('name', p.UnicodeType, 0), - 2: ('ticker', p.UnicodeType, 0), - 3: ('namespace', p.UnicodeType, 0), - 4: ('mosaic', p.UnicodeType, 0), - 5: ('divisibility', p.UVarintType, 0), - 6: ('levy', p.EnumType("NEMMosaicLevy", (1, 2)), 0), - 7: ('fee', p.UVarintType, 0), - 8: ('levy_address', p.UnicodeType, 0), - 9: ('levy_namespace', p.UnicodeType, 0), - 10: ('levy_mosaic', p.UnicodeType, 0), - 11: ('supply', p.UVarintType, 0), - 12: ('mutable_supply', p.BoolType, 0), - 13: ('transferable', p.BoolType, 0), - 14: ('description', p.UnicodeType, 0), + 1: ('name', p.UnicodeType, None), + 2: ('ticker', p.UnicodeType, None), + 3: ('namespace', p.UnicodeType, None), + 4: ('mosaic', p.UnicodeType, None), + 5: ('divisibility', p.UVarintType, None), + 6: ('levy', p.EnumType("NEMMosaicLevy", (1, 2)), None), + 7: ('fee', p.UVarintType, None), + 8: ('levy_address', p.UnicodeType, None), + 9: ('levy_namespace', p.UnicodeType, None), + 10: ('levy_mosaic', p.UnicodeType, None), + 11: ('supply', p.UVarintType, None), + 12: ('mutable_supply', p.BoolType, None), + 13: ('transferable', p.BoolType, None), + 14: ('description', p.UnicodeType, None), 15: ('networks', p.UVarintType, p.FLAG_REPEATED), } diff --git a/core/src/trezor/messages/NEMMosaicSupplyChange.py b/core/src/trezor/messages/NEMMosaicSupplyChange.py index 0d8c90d51..7de88018a 100644 --- a/core/src/trezor/messages/NEMMosaicSupplyChange.py +++ b/core/src/trezor/messages/NEMMosaicSupplyChange.py @@ -15,6 +15,7 @@ class NEMMosaicSupplyChange(p.MessageType): def __init__( self, + *, namespace: str = None, mosaic: str = None, type: EnumTypeNEMSupplyChangeType = None, @@ -28,8 +29,8 @@ class NEMMosaicSupplyChange(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('namespace', p.UnicodeType, 0), - 2: ('mosaic', p.UnicodeType, 0), - 3: ('type', p.EnumType("NEMSupplyChangeType", (1, 2)), 0), - 4: ('delta', p.UVarintType, 0), + 1: ('namespace', p.UnicodeType, None), + 2: ('mosaic', p.UnicodeType, None), + 3: ('type', p.EnumType("NEMSupplyChangeType", (1, 2)), None), + 4: ('delta', p.UVarintType, None), } diff --git a/core/src/trezor/messages/NEMProvisionNamespace.py b/core/src/trezor/messages/NEMProvisionNamespace.py index 8c2838a6c..fba358767 100644 --- a/core/src/trezor/messages/NEMProvisionNamespace.py +++ b/core/src/trezor/messages/NEMProvisionNamespace.py @@ -14,6 +14,7 @@ class NEMProvisionNamespace(p.MessageType): def __init__( self, + *, namespace: str = None, parent: str = None, sink: str = None, @@ -27,8 +28,8 @@ class NEMProvisionNamespace(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('namespace', p.UnicodeType, 0), - 2: ('parent', p.UnicodeType, 0), - 3: ('sink', p.UnicodeType, 0), - 4: ('fee', p.UVarintType, 0), + 1: ('namespace', p.UnicodeType, None), + 2: ('parent', p.UnicodeType, None), + 3: ('sink', p.UnicodeType, None), + 4: ('fee', p.UVarintType, None), } diff --git a/core/src/trezor/messages/NEMSignTx.py b/core/src/trezor/messages/NEMSignTx.py index 40a71fe31..4522b0b5d 100644 --- a/core/src/trezor/messages/NEMSignTx.py +++ b/core/src/trezor/messages/NEMSignTx.py @@ -23,6 +23,7 @@ class NEMSignTx(p.MessageType): def __init__( self, + *, transaction: NEMTransactionCommon = None, multisig: NEMTransactionCommon = None, transfer: NEMTransfer = None, @@ -46,13 +47,13 @@ class NEMSignTx(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('transaction', NEMTransactionCommon, 0), - 2: ('multisig', NEMTransactionCommon, 0), - 3: ('transfer', NEMTransfer, 0), - 4: ('cosigning', p.BoolType, 0), - 5: ('provision_namespace', NEMProvisionNamespace, 0), - 6: ('mosaic_creation', NEMMosaicCreation, 0), - 7: ('supply_change', NEMMosaicSupplyChange, 0), - 8: ('aggregate_modification', NEMAggregateModification, 0), - 9: ('importance_transfer', NEMImportanceTransfer, 0), + 1: ('transaction', NEMTransactionCommon, None), + 2: ('multisig', NEMTransactionCommon, None), + 3: ('transfer', NEMTransfer, None), + 4: ('cosigning', p.BoolType, None), + 5: ('provision_namespace', NEMProvisionNamespace, None), + 6: ('mosaic_creation', NEMMosaicCreation, None), + 7: ('supply_change', NEMMosaicSupplyChange, None), + 8: ('aggregate_modification', NEMAggregateModification, None), + 9: ('importance_transfer', NEMImportanceTransfer, None), } diff --git a/core/src/trezor/messages/NEMSignedTx.py b/core/src/trezor/messages/NEMSignedTx.py index e5c8fb057..f9de268e5 100644 --- a/core/src/trezor/messages/NEMSignedTx.py +++ b/core/src/trezor/messages/NEMSignedTx.py @@ -15,6 +15,7 @@ class NEMSignedTx(p.MessageType): def __init__( self, + *, data: bytes = None, signature: bytes = None, ) -> None: @@ -24,6 +25,6 @@ class NEMSignedTx(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('data', p.BytesType, 0), - 2: ('signature', p.BytesType, 0), + 1: ('data', p.BytesType, None), + 2: ('signature', p.BytesType, None), } diff --git a/core/src/trezor/messages/NEMTransactionCommon.py b/core/src/trezor/messages/NEMTransactionCommon.py index bb1b96da0..a9f76fb15 100644 --- a/core/src/trezor/messages/NEMTransactionCommon.py +++ b/core/src/trezor/messages/NEMTransactionCommon.py @@ -14,6 +14,7 @@ class NEMTransactionCommon(p.MessageType): def __init__( self, + *, address_n: List[int] = None, network: int = None, timestamp: int = None, @@ -32,9 +33,9 @@ class NEMTransactionCommon(p.MessageType): def get_fields(cls) -> Dict: return { 1: ('address_n', p.UVarintType, p.FLAG_REPEATED), - 2: ('network', p.UVarintType, 0), - 3: ('timestamp', p.UVarintType, 0), - 4: ('fee', p.UVarintType, 0), - 5: ('deadline', p.UVarintType, 0), - 6: ('signer', p.BytesType, 0), + 2: ('network', p.UVarintType, None), + 3: ('timestamp', p.UVarintType, None), + 4: ('fee', p.UVarintType, None), + 5: ('deadline', p.UVarintType, None), + 6: ('signer', p.BytesType, None), } diff --git a/core/src/trezor/messages/NEMTransfer.py b/core/src/trezor/messages/NEMTransfer.py index 9963e373b..a890db446 100644 --- a/core/src/trezor/messages/NEMTransfer.py +++ b/core/src/trezor/messages/NEMTransfer.py @@ -16,24 +16,25 @@ class NEMTransfer(p.MessageType): def __init__( self, + *, + mosaics: List[NEMMosaic] = None, recipient: str = None, amount: int = None, payload: bytes = None, public_key: bytes = None, - mosaics: List[NEMMosaic] = None, ) -> None: + self.mosaics = mosaics if mosaics is not None else [] self.recipient = recipient self.amount = amount self.payload = payload self.public_key = public_key - self.mosaics = mosaics if mosaics is not None else [] @classmethod def get_fields(cls) -> Dict: return { - 1: ('recipient', p.UnicodeType, 0), - 2: ('amount', p.UVarintType, 0), - 3: ('payload', p.BytesType, 0), - 4: ('public_key', p.BytesType, 0), + 1: ('recipient', p.UnicodeType, None), + 2: ('amount', p.UVarintType, None), + 3: ('payload', p.BytesType, None), + 4: ('public_key', p.BytesType, None), 5: ('mosaics', NEMMosaic, p.FLAG_REPEATED), } diff --git a/core/src/trezor/messages/NextU2FCounter.py b/core/src/trezor/messages/NextU2FCounter.py index 8ac14efe5..2a53ebd2b 100644 --- a/core/src/trezor/messages/NextU2FCounter.py +++ b/core/src/trezor/messages/NextU2FCounter.py @@ -15,6 +15,7 @@ class NextU2FCounter(p.MessageType): def __init__( self, + *, u2f_counter: int = None, ) -> None: self.u2f_counter = u2f_counter @@ -22,5 +23,5 @@ class NextU2FCounter(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('u2f_counter', p.UVarintType, 0), + 1: ('u2f_counter', p.UVarintType, None), } diff --git a/core/src/trezor/messages/OwnershipId.py b/core/src/trezor/messages/OwnershipId.py index 5b3bde331..38c3477cc 100644 --- a/core/src/trezor/messages/OwnershipId.py +++ b/core/src/trezor/messages/OwnershipId.py @@ -15,12 +15,13 @@ class OwnershipId(p.MessageType): def __init__( self, - ownership_id: bytes = None, + *, + ownership_id: bytes, ) -> None: self.ownership_id = ownership_id @classmethod def get_fields(cls) -> Dict: return { - 1: ('ownership_id', p.BytesType, 0), # required + 1: ('ownership_id', p.BytesType, p.FLAG_REQUIRED), } diff --git a/core/src/trezor/messages/OwnershipProof.py b/core/src/trezor/messages/OwnershipProof.py index 8c9a46b3d..942e5f88e 100644 --- a/core/src/trezor/messages/OwnershipProof.py +++ b/core/src/trezor/messages/OwnershipProof.py @@ -15,8 +15,9 @@ class OwnershipProof(p.MessageType): def __init__( self, - ownership_proof: bytes = None, - signature: bytes = None, + *, + ownership_proof: bytes, + signature: bytes, ) -> None: self.ownership_proof = ownership_proof self.signature = signature @@ -24,6 +25,6 @@ class OwnershipProof(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('ownership_proof', p.BytesType, 0), # required - 2: ('signature', p.BytesType, 0), # required + 1: ('ownership_proof', p.BytesType, p.FLAG_REQUIRED), + 2: ('signature', p.BytesType, p.FLAG_REQUIRED), } diff --git a/core/src/trezor/messages/PassphraseAck.py b/core/src/trezor/messages/PassphraseAck.py index 791d6c54f..113d8eefd 100644 --- a/core/src/trezor/messages/PassphraseAck.py +++ b/core/src/trezor/messages/PassphraseAck.py @@ -15,6 +15,7 @@ class PassphraseAck(p.MessageType): def __init__( self, + *, passphrase: str = None, on_device: bool = None, ) -> None: @@ -24,6 +25,6 @@ class PassphraseAck(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('passphrase', p.UnicodeType, 0), - 3: ('on_device', p.BoolType, 0), + 1: ('passphrase', p.UnicodeType, None), + 3: ('on_device', p.BoolType, None), } diff --git a/core/src/trezor/messages/Ping.py b/core/src/trezor/messages/Ping.py index 9aff85c6c..1eea229dc 100644 --- a/core/src/trezor/messages/Ping.py +++ b/core/src/trezor/messages/Ping.py @@ -15,6 +15,7 @@ class Ping(p.MessageType): def __init__( self, + *, message: str = None, button_protection: bool = None, ) -> None: @@ -24,6 +25,6 @@ class Ping(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('message', p.UnicodeType, 0), - 2: ('button_protection', p.BoolType, 0), + 1: ('message', p.UnicodeType, None), + 2: ('button_protection', p.BoolType, None), } diff --git a/core/src/trezor/messages/PublicKey.py b/core/src/trezor/messages/PublicKey.py index 741d63359..d0de749ee 100644 --- a/core/src/trezor/messages/PublicKey.py +++ b/core/src/trezor/messages/PublicKey.py @@ -17,6 +17,7 @@ class PublicKey(p.MessageType): def __init__( self, + *, node: HDNodeType = None, xpub: str = None, ) -> None: @@ -26,6 +27,6 @@ class PublicKey(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('node', HDNodeType, 0), - 2: ('xpub', p.UnicodeType, 0), + 1: ('node', HDNodeType, None), + 2: ('xpub', p.UnicodeType, None), } diff --git a/core/src/trezor/messages/RecoveryDevice.py b/core/src/trezor/messages/RecoveryDevice.py index 0d12b8004..4b0adf4a6 100644 --- a/core/src/trezor/messages/RecoveryDevice.py +++ b/core/src/trezor/messages/RecoveryDevice.py @@ -16,6 +16,7 @@ class RecoveryDevice(p.MessageType): def __init__( self, + *, word_count: int = None, passphrase_protection: bool = None, pin_protection: bool = None, @@ -39,13 +40,13 @@ class RecoveryDevice(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('word_count', p.UVarintType, 0), - 2: ('passphrase_protection', p.BoolType, 0), - 3: ('pin_protection', p.BoolType, 0), - 4: ('language', p.UnicodeType, 0), # default=en-US - 5: ('label', p.UnicodeType, 0), - 6: ('enforce_wordlist', p.BoolType, 0), - 8: ('type', p.EnumType("RecoveryDeviceType", (0, 1)), 0), - 9: ('u2f_counter', p.UVarintType, 0), - 10: ('dry_run', p.BoolType, 0), + 1: ('word_count', p.UVarintType, None), + 2: ('passphrase_protection', p.BoolType, None), + 3: ('pin_protection', p.BoolType, None), + 4: ('language', p.UnicodeType, None), + 5: ('label', p.UnicodeType, None), + 6: ('enforce_wordlist', p.BoolType, None), + 8: ('type', p.EnumType("RecoveryDeviceType", (0, 1)), None), + 9: ('u2f_counter', p.UVarintType, None), + 10: ('dry_run', p.BoolType, None), } diff --git a/core/src/trezor/messages/ResetDevice.py b/core/src/trezor/messages/ResetDevice.py index 3e32b64bc..ad9cf4f18 100644 --- a/core/src/trezor/messages/ResetDevice.py +++ b/core/src/trezor/messages/ResetDevice.py @@ -16,16 +16,17 @@ class ResetDevice(p.MessageType): def __init__( self, + *, display_random: bool = None, - strength: int = None, + strength: int = 256, passphrase_protection: bool = None, pin_protection: bool = None, - language: str = None, + language: str = "en-US", label: str = None, u2f_counter: int = None, skip_backup: bool = None, no_backup: bool = None, - backup_type: EnumTypeBackupType = None, + backup_type: EnumTypeBackupType = 0, ) -> None: self.display_random = display_random self.strength = strength @@ -41,14 +42,14 @@ class ResetDevice(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('display_random', p.BoolType, 0), - 2: ('strength', p.UVarintType, 0), # default=256 - 3: ('passphrase_protection', p.BoolType, 0), - 4: ('pin_protection', p.BoolType, 0), - 5: ('language', p.UnicodeType, 0), # default=en-US - 6: ('label', p.UnicodeType, 0), - 7: ('u2f_counter', p.UVarintType, 0), - 8: ('skip_backup', p.BoolType, 0), - 9: ('no_backup', p.BoolType, 0), + 1: ('display_random', p.BoolType, None), + 2: ('strength', p.UVarintType, 256), # default=256 + 3: ('passphrase_protection', p.BoolType, None), + 4: ('pin_protection', p.BoolType, None), + 5: ('language', p.UnicodeType, "en-US"), # default=en-US + 6: ('label', p.UnicodeType, None), + 7: ('u2f_counter', p.UVarintType, None), + 8: ('skip_backup', p.BoolType, None), + 9: ('no_backup', p.BoolType, None), 10: ('backup_type', p.EnumType("BackupType", (0, 1, 2)), 0), # default=Bip39 } diff --git a/core/src/trezor/messages/RippleAddress.py b/core/src/trezor/messages/RippleAddress.py index 104682713..833daadff 100644 --- a/core/src/trezor/messages/RippleAddress.py +++ b/core/src/trezor/messages/RippleAddress.py @@ -15,6 +15,7 @@ class RippleAddress(p.MessageType): def __init__( self, + *, address: str = None, ) -> None: self.address = address @@ -22,5 +23,5 @@ class RippleAddress(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('address', p.UnicodeType, 0), + 1: ('address', p.UnicodeType, None), } diff --git a/core/src/trezor/messages/RippleGetAddress.py b/core/src/trezor/messages/RippleGetAddress.py index 3bb24ea50..ba6ad08c9 100644 --- a/core/src/trezor/messages/RippleGetAddress.py +++ b/core/src/trezor/messages/RippleGetAddress.py @@ -15,6 +15,7 @@ class RippleGetAddress(p.MessageType): def __init__( self, + *, address_n: List[int] = None, show_display: bool = None, ) -> None: @@ -25,5 +26,5 @@ class RippleGetAddress(p.MessageType): def get_fields(cls) -> Dict: return { 1: ('address_n', p.UVarintType, p.FLAG_REPEATED), - 2: ('show_display', p.BoolType, 0), + 2: ('show_display', p.BoolType, None), } diff --git a/core/src/trezor/messages/RipplePayment.py b/core/src/trezor/messages/RipplePayment.py index ae4890c65..9e7675da0 100644 --- a/core/src/trezor/messages/RipplePayment.py +++ b/core/src/trezor/messages/RipplePayment.py @@ -14,6 +14,7 @@ class RipplePayment(p.MessageType): def __init__( self, + *, amount: int = None, destination: str = None, destination_tag: int = None, @@ -25,7 +26,7 @@ class RipplePayment(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('amount', p.UVarintType, 0), - 2: ('destination', p.UnicodeType, 0), - 3: ('destination_tag', p.UVarintType, 0), + 1: ('amount', p.UVarintType, None), + 2: ('destination', p.UnicodeType, None), + 3: ('destination_tag', p.UVarintType, None), } diff --git a/core/src/trezor/messages/RippleSignTx.py b/core/src/trezor/messages/RippleSignTx.py index f576286c7..b239fa063 100644 --- a/core/src/trezor/messages/RippleSignTx.py +++ b/core/src/trezor/messages/RippleSignTx.py @@ -17,6 +17,7 @@ class RippleSignTx(p.MessageType): def __init__( self, + *, address_n: List[int] = None, fee: int = None, flags: int = None, @@ -35,9 +36,9 @@ class RippleSignTx(p.MessageType): def get_fields(cls) -> Dict: return { 1: ('address_n', p.UVarintType, p.FLAG_REPEATED), - 2: ('fee', p.UVarintType, 0), - 3: ('flags', p.UVarintType, 0), - 4: ('sequence', p.UVarintType, 0), - 5: ('last_ledger_sequence', p.UVarintType, 0), - 6: ('payment', RipplePayment, 0), + 2: ('fee', p.UVarintType, None), + 3: ('flags', p.UVarintType, None), + 4: ('sequence', p.UVarintType, None), + 5: ('last_ledger_sequence', p.UVarintType, None), + 6: ('payment', RipplePayment, None), } diff --git a/core/src/trezor/messages/RippleSignedTx.py b/core/src/trezor/messages/RippleSignedTx.py index 1d8886c0a..78c807f9f 100644 --- a/core/src/trezor/messages/RippleSignedTx.py +++ b/core/src/trezor/messages/RippleSignedTx.py @@ -15,6 +15,7 @@ class RippleSignedTx(p.MessageType): def __init__( self, + *, signature: bytes = None, serialized_tx: bytes = None, ) -> None: @@ -24,6 +25,6 @@ class RippleSignedTx(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('signature', p.BytesType, 0), - 2: ('serialized_tx', p.BytesType, 0), + 1: ('signature', p.BytesType, None), + 2: ('serialized_tx', p.BytesType, None), } diff --git a/core/src/trezor/messages/SdProtect.py b/core/src/trezor/messages/SdProtect.py index 211b23402..fbb33312c 100644 --- a/core/src/trezor/messages/SdProtect.py +++ b/core/src/trezor/messages/SdProtect.py @@ -16,6 +16,7 @@ class SdProtect(p.MessageType): def __init__( self, + *, operation: EnumTypeSdProtectOperationType = None, ) -> None: self.operation = operation @@ -23,5 +24,5 @@ class SdProtect(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('operation', p.EnumType("SdProtectOperationType", (0, 1, 2)), 0), + 1: ('operation', p.EnumType("SdProtectOperationType", (0, 1, 2)), None), } diff --git a/core/src/trezor/messages/SetU2FCounter.py b/core/src/trezor/messages/SetU2FCounter.py index 532acea5b..856dd85e0 100644 --- a/core/src/trezor/messages/SetU2FCounter.py +++ b/core/src/trezor/messages/SetU2FCounter.py @@ -15,6 +15,7 @@ class SetU2FCounter(p.MessageType): def __init__( self, + *, u2f_counter: int = None, ) -> None: self.u2f_counter = u2f_counter @@ -22,5 +23,5 @@ class SetU2FCounter(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('u2f_counter', p.UVarintType, 0), + 1: ('u2f_counter', p.UVarintType, None), } diff --git a/core/src/trezor/messages/SignIdentity.py b/core/src/trezor/messages/SignIdentity.py index 6002e6924..5a8d4cfed 100644 --- a/core/src/trezor/messages/SignIdentity.py +++ b/core/src/trezor/messages/SignIdentity.py @@ -17,6 +17,7 @@ class SignIdentity(p.MessageType): def __init__( self, + *, identity: IdentityType = None, challenge_hidden: bytes = None, challenge_visual: str = None, @@ -30,8 +31,8 @@ class SignIdentity(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('identity', IdentityType, 0), - 2: ('challenge_hidden', p.BytesType, 0), - 3: ('challenge_visual', p.UnicodeType, 0), - 4: ('ecdsa_curve_name', p.UnicodeType, 0), + 1: ('identity', IdentityType, None), + 2: ('challenge_hidden', p.BytesType, None), + 3: ('challenge_visual', p.UnicodeType, None), + 4: ('ecdsa_curve_name', p.UnicodeType, None), } diff --git a/core/src/trezor/messages/SignMessage.py b/core/src/trezor/messages/SignMessage.py index ea4b64561..7523498ae 100644 --- a/core/src/trezor/messages/SignMessage.py +++ b/core/src/trezor/messages/SignMessage.py @@ -16,10 +16,11 @@ class SignMessage(p.MessageType): def __init__( self, + *, + message: bytes, address_n: List[int] = None, - message: bytes = None, - coin_name: str = None, - script_type: EnumTypeInputScriptType = None, + coin_name: str = "Bitcoin", + script_type: EnumTypeInputScriptType = 0, ) -> None: self.address_n = address_n if address_n is not None else [] self.message = message @@ -30,7 +31,7 @@ class SignMessage(p.MessageType): def get_fields(cls) -> Dict: return { 1: ('address_n', p.UVarintType, p.FLAG_REPEATED), - 2: ('message', p.BytesType, 0), # required - 3: ('coin_name', p.UnicodeType, 0), # default=Bitcoin + 2: ('message', p.BytesType, p.FLAG_REQUIRED), + 3: ('coin_name', p.UnicodeType, "Bitcoin"), # default=Bitcoin 4: ('script_type', p.EnumType("InputScriptType", (0, 1, 2, 3, 4)), 0), # default=SPENDADDRESS } diff --git a/core/src/trezor/messages/SignTx.py b/core/src/trezor/messages/SignTx.py index 2977808ea..041109b6d 100644 --- a/core/src/trezor/messages/SignTx.py +++ b/core/src/trezor/messages/SignTx.py @@ -15,11 +15,12 @@ class SignTx(p.MessageType): def __init__( self, - outputs_count: int = None, - inputs_count: int = None, - coin_name: str = None, - version: int = None, - lock_time: int = None, + *, + outputs_count: int, + inputs_count: int, + coin_name: str = "Bitcoin", + version: int = 1, + lock_time: int = 0, expiry: int = None, version_group_id: int = None, timestamp: int = None, @@ -38,13 +39,13 @@ class SignTx(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('outputs_count', p.UVarintType, 0), # required - 2: ('inputs_count', p.UVarintType, 0), # required - 3: ('coin_name', p.UnicodeType, 0), # default=Bitcoin - 4: ('version', p.UVarintType, 0), # default=1 + 1: ('outputs_count', p.UVarintType, p.FLAG_REQUIRED), + 2: ('inputs_count', p.UVarintType, p.FLAG_REQUIRED), + 3: ('coin_name', p.UnicodeType, "Bitcoin"), # default=Bitcoin + 4: ('version', p.UVarintType, 1), # default=1 5: ('lock_time', p.UVarintType, 0), # default=0 - 6: ('expiry', p.UVarintType, 0), - 8: ('version_group_id', p.UVarintType, 0), - 9: ('timestamp', p.UVarintType, 0), - 10: ('branch_id', p.UVarintType, 0), + 6: ('expiry', p.UVarintType, None), + 8: ('version_group_id', p.UVarintType, None), + 9: ('timestamp', p.UVarintType, None), + 10: ('branch_id', p.UVarintType, None), } diff --git a/core/src/trezor/messages/SignedIdentity.py b/core/src/trezor/messages/SignedIdentity.py index 0acafb262..05098b511 100644 --- a/core/src/trezor/messages/SignedIdentity.py +++ b/core/src/trezor/messages/SignedIdentity.py @@ -15,6 +15,7 @@ class SignedIdentity(p.MessageType): def __init__( self, + *, address: str = None, public_key: bytes = None, signature: bytes = None, @@ -26,7 +27,7 @@ class SignedIdentity(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('address', p.UnicodeType, 0), - 2: ('public_key', p.BytesType, 0), - 3: ('signature', p.BytesType, 0), + 1: ('address', p.UnicodeType, None), + 2: ('public_key', p.BytesType, None), + 3: ('signature', p.BytesType, None), } diff --git a/core/src/trezor/messages/StellarAccountMergeOp.py b/core/src/trezor/messages/StellarAccountMergeOp.py index 984a875d9..0b4b8f714 100644 --- a/core/src/trezor/messages/StellarAccountMergeOp.py +++ b/core/src/trezor/messages/StellarAccountMergeOp.py @@ -15,6 +15,7 @@ class StellarAccountMergeOp(p.MessageType): def __init__( self, + *, source_account: str = None, destination_account: str = None, ) -> None: @@ -24,6 +25,6 @@ class StellarAccountMergeOp(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('source_account', p.UnicodeType, 0), - 2: ('destination_account', p.UnicodeType, 0), + 1: ('source_account', p.UnicodeType, None), + 2: ('destination_account', p.UnicodeType, None), } diff --git a/core/src/trezor/messages/StellarAddress.py b/core/src/trezor/messages/StellarAddress.py index 24a0dc30e..908090529 100644 --- a/core/src/trezor/messages/StellarAddress.py +++ b/core/src/trezor/messages/StellarAddress.py @@ -15,6 +15,7 @@ class StellarAddress(p.MessageType): def __init__( self, + *, address: str = None, ) -> None: self.address = address @@ -22,5 +23,5 @@ class StellarAddress(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('address', p.UnicodeType, 0), + 1: ('address', p.UnicodeType, None), } diff --git a/core/src/trezor/messages/StellarAllowTrustOp.py b/core/src/trezor/messages/StellarAllowTrustOp.py index bf4e2106d..29216f3bc 100644 --- a/core/src/trezor/messages/StellarAllowTrustOp.py +++ b/core/src/trezor/messages/StellarAllowTrustOp.py @@ -15,6 +15,7 @@ class StellarAllowTrustOp(p.MessageType): def __init__( self, + *, source_account: str = None, trusted_account: str = None, asset_type: int = None, @@ -30,9 +31,9 @@ class StellarAllowTrustOp(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('source_account', p.UnicodeType, 0), - 2: ('trusted_account', p.UnicodeType, 0), - 3: ('asset_type', p.UVarintType, 0), - 4: ('asset_code', p.UnicodeType, 0), - 5: ('is_authorized', p.UVarintType, 0), + 1: ('source_account', p.UnicodeType, None), + 2: ('trusted_account', p.UnicodeType, None), + 3: ('asset_type', p.UVarintType, None), + 4: ('asset_code', p.UnicodeType, None), + 5: ('is_authorized', p.UVarintType, None), } diff --git a/core/src/trezor/messages/StellarAssetType.py b/core/src/trezor/messages/StellarAssetType.py index 6ddb76806..dca1afcc2 100644 --- a/core/src/trezor/messages/StellarAssetType.py +++ b/core/src/trezor/messages/StellarAssetType.py @@ -14,6 +14,7 @@ class StellarAssetType(p.MessageType): def __init__( self, + *, type: int = None, code: str = None, issuer: str = None, @@ -25,7 +26,7 @@ class StellarAssetType(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('type', p.UVarintType, 0), - 2: ('code', p.UnicodeType, 0), - 3: ('issuer', p.UnicodeType, 0), + 1: ('type', p.UVarintType, None), + 2: ('code', p.UnicodeType, None), + 3: ('issuer', p.UnicodeType, None), } diff --git a/core/src/trezor/messages/StellarBumpSequenceOp.py b/core/src/trezor/messages/StellarBumpSequenceOp.py index fb940278f..ab1703701 100644 --- a/core/src/trezor/messages/StellarBumpSequenceOp.py +++ b/core/src/trezor/messages/StellarBumpSequenceOp.py @@ -15,6 +15,7 @@ class StellarBumpSequenceOp(p.MessageType): def __init__( self, + *, source_account: str = None, bump_to: int = None, ) -> None: @@ -24,6 +25,6 @@ class StellarBumpSequenceOp(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('source_account', p.UnicodeType, 0), - 2: ('bump_to', p.UVarintType, 0), + 1: ('source_account', p.UnicodeType, None), + 2: ('bump_to', p.UVarintType, None), } diff --git a/core/src/trezor/messages/StellarChangeTrustOp.py b/core/src/trezor/messages/StellarChangeTrustOp.py index 00c1588b9..a72e40343 100644 --- a/core/src/trezor/messages/StellarChangeTrustOp.py +++ b/core/src/trezor/messages/StellarChangeTrustOp.py @@ -17,6 +17,7 @@ class StellarChangeTrustOp(p.MessageType): def __init__( self, + *, source_account: str = None, asset: StellarAssetType = None, limit: int = None, @@ -28,7 +29,7 @@ class StellarChangeTrustOp(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('source_account', p.UnicodeType, 0), - 2: ('asset', StellarAssetType, 0), - 3: ('limit', p.UVarintType, 0), + 1: ('source_account', p.UnicodeType, None), + 2: ('asset', StellarAssetType, None), + 3: ('limit', p.UVarintType, None), } diff --git a/core/src/trezor/messages/StellarCreateAccountOp.py b/core/src/trezor/messages/StellarCreateAccountOp.py index 8e368e0e7..b83bbdf04 100644 --- a/core/src/trezor/messages/StellarCreateAccountOp.py +++ b/core/src/trezor/messages/StellarCreateAccountOp.py @@ -15,6 +15,7 @@ class StellarCreateAccountOp(p.MessageType): def __init__( self, + *, source_account: str = None, new_account: str = None, starting_balance: int = None, @@ -26,7 +27,7 @@ class StellarCreateAccountOp(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('source_account', p.UnicodeType, 0), - 2: ('new_account', p.UnicodeType, 0), - 3: ('starting_balance', p.SVarintType, 0), + 1: ('source_account', p.UnicodeType, None), + 2: ('new_account', p.UnicodeType, None), + 3: ('starting_balance', p.SVarintType, None), } diff --git a/core/src/trezor/messages/StellarCreatePassiveOfferOp.py b/core/src/trezor/messages/StellarCreatePassiveOfferOp.py index d3fbdf69d..1b439007a 100644 --- a/core/src/trezor/messages/StellarCreatePassiveOfferOp.py +++ b/core/src/trezor/messages/StellarCreatePassiveOfferOp.py @@ -17,6 +17,7 @@ class StellarCreatePassiveOfferOp(p.MessageType): def __init__( self, + *, source_account: str = None, selling_asset: StellarAssetType = None, buying_asset: StellarAssetType = None, @@ -34,10 +35,10 @@ class StellarCreatePassiveOfferOp(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('source_account', p.UnicodeType, 0), - 2: ('selling_asset', StellarAssetType, 0), - 3: ('buying_asset', StellarAssetType, 0), - 4: ('amount', p.SVarintType, 0), - 5: ('price_n', p.UVarintType, 0), - 6: ('price_d', p.UVarintType, 0), + 1: ('source_account', p.UnicodeType, None), + 2: ('selling_asset', StellarAssetType, None), + 3: ('buying_asset', StellarAssetType, None), + 4: ('amount', p.SVarintType, None), + 5: ('price_n', p.UVarintType, None), + 6: ('price_d', p.UVarintType, None), } diff --git a/core/src/trezor/messages/StellarGetAddress.py b/core/src/trezor/messages/StellarGetAddress.py index b893fb780..d6f39b074 100644 --- a/core/src/trezor/messages/StellarGetAddress.py +++ b/core/src/trezor/messages/StellarGetAddress.py @@ -15,6 +15,7 @@ class StellarGetAddress(p.MessageType): def __init__( self, + *, address_n: List[int] = None, show_display: bool = None, ) -> None: @@ -25,5 +26,5 @@ class StellarGetAddress(p.MessageType): def get_fields(cls) -> Dict: return { 1: ('address_n', p.UVarintType, p.FLAG_REPEATED), - 2: ('show_display', p.BoolType, 0), + 2: ('show_display', p.BoolType, None), } diff --git a/core/src/trezor/messages/StellarManageDataOp.py b/core/src/trezor/messages/StellarManageDataOp.py index 97818251a..6193f7c05 100644 --- a/core/src/trezor/messages/StellarManageDataOp.py +++ b/core/src/trezor/messages/StellarManageDataOp.py @@ -15,6 +15,7 @@ class StellarManageDataOp(p.MessageType): def __init__( self, + *, source_account: str = None, key: str = None, value: bytes = None, @@ -26,7 +27,7 @@ class StellarManageDataOp(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('source_account', p.UnicodeType, 0), - 2: ('key', p.UnicodeType, 0), - 3: ('value', p.BytesType, 0), + 1: ('source_account', p.UnicodeType, None), + 2: ('key', p.UnicodeType, None), + 3: ('value', p.BytesType, None), } diff --git a/core/src/trezor/messages/StellarManageOfferOp.py b/core/src/trezor/messages/StellarManageOfferOp.py index 9eb97238e..c731805dd 100644 --- a/core/src/trezor/messages/StellarManageOfferOp.py +++ b/core/src/trezor/messages/StellarManageOfferOp.py @@ -17,6 +17,7 @@ class StellarManageOfferOp(p.MessageType): def __init__( self, + *, source_account: str = None, selling_asset: StellarAssetType = None, buying_asset: StellarAssetType = None, @@ -36,11 +37,11 @@ class StellarManageOfferOp(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('source_account', p.UnicodeType, 0), - 2: ('selling_asset', StellarAssetType, 0), - 3: ('buying_asset', StellarAssetType, 0), - 4: ('amount', p.SVarintType, 0), - 5: ('price_n', p.UVarintType, 0), - 6: ('price_d', p.UVarintType, 0), - 7: ('offer_id', p.UVarintType, 0), + 1: ('source_account', p.UnicodeType, None), + 2: ('selling_asset', StellarAssetType, None), + 3: ('buying_asset', StellarAssetType, None), + 4: ('amount', p.SVarintType, None), + 5: ('price_n', p.UVarintType, None), + 6: ('price_d', p.UVarintType, None), + 7: ('offer_id', p.UVarintType, None), } diff --git a/core/src/trezor/messages/StellarPathPaymentOp.py b/core/src/trezor/messages/StellarPathPaymentOp.py index 4a89a0172..f80b2821d 100644 --- a/core/src/trezor/messages/StellarPathPaymentOp.py +++ b/core/src/trezor/messages/StellarPathPaymentOp.py @@ -17,30 +17,31 @@ class StellarPathPaymentOp(p.MessageType): def __init__( self, + *, + paths: List[StellarAssetType] = None, source_account: str = None, send_asset: StellarAssetType = None, send_max: int = None, destination_account: str = None, destination_asset: StellarAssetType = None, destination_amount: int = None, - paths: List[StellarAssetType] = None, ) -> None: + self.paths = paths if paths is not None else [] self.source_account = source_account self.send_asset = send_asset self.send_max = send_max self.destination_account = destination_account self.destination_asset = destination_asset self.destination_amount = destination_amount - self.paths = paths if paths is not None else [] @classmethod def get_fields(cls) -> Dict: return { - 1: ('source_account', p.UnicodeType, 0), - 2: ('send_asset', StellarAssetType, 0), - 3: ('send_max', p.SVarintType, 0), - 4: ('destination_account', p.UnicodeType, 0), - 5: ('destination_asset', StellarAssetType, 0), - 6: ('destination_amount', p.SVarintType, 0), + 1: ('source_account', p.UnicodeType, None), + 2: ('send_asset', StellarAssetType, None), + 3: ('send_max', p.SVarintType, None), + 4: ('destination_account', p.UnicodeType, None), + 5: ('destination_asset', StellarAssetType, None), + 6: ('destination_amount', p.SVarintType, None), 7: ('paths', StellarAssetType, p.FLAG_REPEATED), } diff --git a/core/src/trezor/messages/StellarPaymentOp.py b/core/src/trezor/messages/StellarPaymentOp.py index 7b55bef34..835713c2c 100644 --- a/core/src/trezor/messages/StellarPaymentOp.py +++ b/core/src/trezor/messages/StellarPaymentOp.py @@ -17,6 +17,7 @@ class StellarPaymentOp(p.MessageType): def __init__( self, + *, source_account: str = None, destination_account: str = None, asset: StellarAssetType = None, @@ -30,8 +31,8 @@ class StellarPaymentOp(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('source_account', p.UnicodeType, 0), - 2: ('destination_account', p.UnicodeType, 0), - 3: ('asset', StellarAssetType, 0), - 4: ('amount', p.SVarintType, 0), + 1: ('source_account', p.UnicodeType, None), + 2: ('destination_account', p.UnicodeType, None), + 3: ('asset', StellarAssetType, None), + 4: ('amount', p.SVarintType, None), } diff --git a/core/src/trezor/messages/StellarSetOptionsOp.py b/core/src/trezor/messages/StellarSetOptionsOp.py index 7061d4b39..1ed08ace4 100644 --- a/core/src/trezor/messages/StellarSetOptionsOp.py +++ b/core/src/trezor/messages/StellarSetOptionsOp.py @@ -15,6 +15,7 @@ class StellarSetOptionsOp(p.MessageType): def __init__( self, + *, source_account: str = None, inflation_destination_account: str = None, clear_flags: int = None, @@ -44,16 +45,16 @@ class StellarSetOptionsOp(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('source_account', p.UnicodeType, 0), - 2: ('inflation_destination_account', p.UnicodeType, 0), - 3: ('clear_flags', p.UVarintType, 0), - 4: ('set_flags', p.UVarintType, 0), - 5: ('master_weight', p.UVarintType, 0), - 6: ('low_threshold', p.UVarintType, 0), - 7: ('medium_threshold', p.UVarintType, 0), - 8: ('high_threshold', p.UVarintType, 0), - 9: ('home_domain', p.UnicodeType, 0), - 10: ('signer_type', p.UVarintType, 0), - 11: ('signer_key', p.BytesType, 0), - 12: ('signer_weight', p.UVarintType, 0), + 1: ('source_account', p.UnicodeType, None), + 2: ('inflation_destination_account', p.UnicodeType, None), + 3: ('clear_flags', p.UVarintType, None), + 4: ('set_flags', p.UVarintType, None), + 5: ('master_weight', p.UVarintType, None), + 6: ('low_threshold', p.UVarintType, None), + 7: ('medium_threshold', p.UVarintType, None), + 8: ('high_threshold', p.UVarintType, None), + 9: ('home_domain', p.UnicodeType, None), + 10: ('signer_type', p.UVarintType, None), + 11: ('signer_key', p.BytesType, None), + 12: ('signer_weight', p.UVarintType, None), } diff --git a/core/src/trezor/messages/StellarSignTx.py b/core/src/trezor/messages/StellarSignTx.py index d7296e5f4..baa04300d 100644 --- a/core/src/trezor/messages/StellarSignTx.py +++ b/core/src/trezor/messages/StellarSignTx.py @@ -15,6 +15,7 @@ class StellarSignTx(p.MessageType): def __init__( self, + *, address_n: List[int] = None, network_passphrase: str = None, source_account: str = None, @@ -45,15 +46,15 @@ class StellarSignTx(p.MessageType): def get_fields(cls) -> Dict: return { 2: ('address_n', p.UVarintType, p.FLAG_REPEATED), - 3: ('network_passphrase', p.UnicodeType, 0), - 4: ('source_account', p.UnicodeType, 0), - 5: ('fee', p.UVarintType, 0), - 6: ('sequence_number', p.UVarintType, 0), - 8: ('timebounds_start', p.UVarintType, 0), - 9: ('timebounds_end', p.UVarintType, 0), - 10: ('memo_type', p.UVarintType, 0), - 11: ('memo_text', p.UnicodeType, 0), - 12: ('memo_id', p.UVarintType, 0), - 13: ('memo_hash', p.BytesType, 0), - 14: ('num_operations', p.UVarintType, 0), + 3: ('network_passphrase', p.UnicodeType, None), + 4: ('source_account', p.UnicodeType, None), + 5: ('fee', p.UVarintType, None), + 6: ('sequence_number', p.UVarintType, None), + 8: ('timebounds_start', p.UVarintType, None), + 9: ('timebounds_end', p.UVarintType, None), + 10: ('memo_type', p.UVarintType, None), + 11: ('memo_text', p.UnicodeType, None), + 12: ('memo_id', p.UVarintType, None), + 13: ('memo_hash', p.BytesType, None), + 14: ('num_operations', p.UVarintType, None), } diff --git a/core/src/trezor/messages/StellarSignedTx.py b/core/src/trezor/messages/StellarSignedTx.py index 9d9518688..f77a63eba 100644 --- a/core/src/trezor/messages/StellarSignedTx.py +++ b/core/src/trezor/messages/StellarSignedTx.py @@ -15,6 +15,7 @@ class StellarSignedTx(p.MessageType): def __init__( self, + *, public_key: bytes = None, signature: bytes = None, ) -> None: @@ -24,6 +25,6 @@ class StellarSignedTx(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('public_key', p.BytesType, 0), - 2: ('signature', p.BytesType, 0), + 1: ('public_key', p.BytesType, None), + 2: ('signature', p.BytesType, None), } diff --git a/core/src/trezor/messages/Success.py b/core/src/trezor/messages/Success.py index 086331b9f..8692b013d 100644 --- a/core/src/trezor/messages/Success.py +++ b/core/src/trezor/messages/Success.py @@ -15,6 +15,7 @@ class Success(p.MessageType): def __init__( self, + *, message: str = None, ) -> None: self.message = message @@ -22,5 +23,5 @@ class Success(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('message', p.UnicodeType, 0), + 1: ('message', p.UnicodeType, None), } diff --git a/core/src/trezor/messages/TezosAddress.py b/core/src/trezor/messages/TezosAddress.py index 8013249cb..fda7fa22f 100644 --- a/core/src/trezor/messages/TezosAddress.py +++ b/core/src/trezor/messages/TezosAddress.py @@ -15,6 +15,7 @@ class TezosAddress(p.MessageType): def __init__( self, + *, address: str = None, ) -> None: self.address = address @@ -22,5 +23,5 @@ class TezosAddress(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('address', p.UnicodeType, 0), + 1: ('address', p.UnicodeType, None), } diff --git a/core/src/trezor/messages/TezosBallotOp.py b/core/src/trezor/messages/TezosBallotOp.py index 3f702ccc2..0e183591a 100644 --- a/core/src/trezor/messages/TezosBallotOp.py +++ b/core/src/trezor/messages/TezosBallotOp.py @@ -15,6 +15,7 @@ class TezosBallotOp(p.MessageType): def __init__( self, + *, source: bytes = None, period: int = None, proposal: bytes = None, @@ -28,8 +29,8 @@ class TezosBallotOp(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('source', p.BytesType, 0), - 2: ('period', p.UVarintType, 0), - 3: ('proposal', p.BytesType, 0), - 4: ('ballot', p.EnumType("TezosBallotType", (0, 1, 2)), 0), + 1: ('source', p.BytesType, None), + 2: ('period', p.UVarintType, None), + 3: ('proposal', p.BytesType, None), + 4: ('ballot', p.EnumType("TezosBallotType", (0, 1, 2)), None), } diff --git a/core/src/trezor/messages/TezosContractID.py b/core/src/trezor/messages/TezosContractID.py index aefbb4f15..b531ec631 100644 --- a/core/src/trezor/messages/TezosContractID.py +++ b/core/src/trezor/messages/TezosContractID.py @@ -15,6 +15,7 @@ class TezosContractID(p.MessageType): def __init__( self, + *, tag: EnumTypeTezosContractType = None, hash: bytes = None, ) -> None: @@ -24,6 +25,6 @@ class TezosContractID(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('tag', p.EnumType("TezosContractType", (0, 1)), 0), - 2: ('hash', p.BytesType, 0), + 1: ('tag', p.EnumType("TezosContractType", (0, 1)), None), + 2: ('hash', p.BytesType, None), } diff --git a/core/src/trezor/messages/TezosDelegationOp.py b/core/src/trezor/messages/TezosDelegationOp.py index a15f6ecfd..9fd725a8d 100644 --- a/core/src/trezor/messages/TezosDelegationOp.py +++ b/core/src/trezor/messages/TezosDelegationOp.py @@ -14,6 +14,7 @@ class TezosDelegationOp(p.MessageType): def __init__( self, + *, source: bytes = None, fee: int = None, counter: int = None, @@ -31,10 +32,10 @@ class TezosDelegationOp(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 7: ('source', p.BytesType, 0), - 2: ('fee', p.UVarintType, 0), - 3: ('counter', p.UVarintType, 0), - 4: ('gas_limit', p.UVarintType, 0), - 5: ('storage_limit', p.UVarintType, 0), - 6: ('delegate', p.BytesType, 0), + 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), } diff --git a/core/src/trezor/messages/TezosGetAddress.py b/core/src/trezor/messages/TezosGetAddress.py index c3de399a7..d94e713a4 100644 --- a/core/src/trezor/messages/TezosGetAddress.py +++ b/core/src/trezor/messages/TezosGetAddress.py @@ -15,6 +15,7 @@ class TezosGetAddress(p.MessageType): def __init__( self, + *, address_n: List[int] = None, show_display: bool = None, ) -> None: @@ -25,5 +26,5 @@ class TezosGetAddress(p.MessageType): def get_fields(cls) -> Dict: return { 1: ('address_n', p.UVarintType, p.FLAG_REPEATED), - 2: ('show_display', p.BoolType, 0), + 2: ('show_display', p.BoolType, None), } diff --git a/core/src/trezor/messages/TezosGetPublicKey.py b/core/src/trezor/messages/TezosGetPublicKey.py index d18d701ab..8ca8709f9 100644 --- a/core/src/trezor/messages/TezosGetPublicKey.py +++ b/core/src/trezor/messages/TezosGetPublicKey.py @@ -15,6 +15,7 @@ class TezosGetPublicKey(p.MessageType): def __init__( self, + *, address_n: List[int] = None, show_display: bool = None, ) -> None: @@ -25,5 +26,5 @@ class TezosGetPublicKey(p.MessageType): def get_fields(cls) -> Dict: return { 1: ('address_n', p.UVarintType, p.FLAG_REPEATED), - 2: ('show_display', p.BoolType, 0), + 2: ('show_display', p.BoolType, None), } diff --git a/core/src/trezor/messages/TezosManagerTransfer.py b/core/src/trezor/messages/TezosManagerTransfer.py index 40b2fabb9..1a875a0b6 100644 --- a/core/src/trezor/messages/TezosManagerTransfer.py +++ b/core/src/trezor/messages/TezosManagerTransfer.py @@ -16,6 +16,7 @@ class TezosManagerTransfer(p.MessageType): def __init__( self, + *, destination: TezosContractID = None, amount: int = None, ) -> None: @@ -25,6 +26,6 @@ class TezosManagerTransfer(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('destination', TezosContractID, 0), - 2: ('amount', p.UVarintType, 0), + 1: ('destination', TezosContractID, None), + 2: ('amount', p.UVarintType, None), } diff --git a/core/src/trezor/messages/TezosOriginationOp.py b/core/src/trezor/messages/TezosOriginationOp.py index 7f0f7c4f7..01dbebafd 100644 --- a/core/src/trezor/messages/TezosOriginationOp.py +++ b/core/src/trezor/messages/TezosOriginationOp.py @@ -14,6 +14,7 @@ class TezosOriginationOp(p.MessageType): def __init__( self, + *, source: bytes = None, fee: int = None, counter: int = None, @@ -41,15 +42,15 @@ class TezosOriginationOp(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 12: ('source', p.BytesType, 0), - 2: ('fee', p.UVarintType, 0), - 3: ('counter', p.UVarintType, 0), - 4: ('gas_limit', p.UVarintType, 0), - 5: ('storage_limit', p.UVarintType, 0), - 6: ('manager_pubkey', p.BytesType, 0), - 7: ('balance', p.UVarintType, 0), - 8: ('spendable', p.BoolType, 0), - 9: ('delegatable', p.BoolType, 0), - 10: ('delegate', p.BytesType, 0), - 11: ('script', p.BytesType, 0), + 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), + 6: ('manager_pubkey', p.BytesType, None), + 7: ('balance', p.UVarintType, None), + 8: ('spendable', p.BoolType, None), + 9: ('delegatable', p.BoolType, None), + 10: ('delegate', p.BytesType, None), + 11: ('script', p.BytesType, None), } diff --git a/core/src/trezor/messages/TezosParametersManager.py b/core/src/trezor/messages/TezosParametersManager.py index c50b52a7c..c53e32e8f 100644 --- a/core/src/trezor/messages/TezosParametersManager.py +++ b/core/src/trezor/messages/TezosParametersManager.py @@ -16,6 +16,7 @@ class TezosParametersManager(p.MessageType): def __init__( self, + *, set_delegate: bytes = None, cancel_delegate: bool = None, transfer: TezosManagerTransfer = None, @@ -27,7 +28,7 @@ class TezosParametersManager(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('set_delegate', p.BytesType, 0), - 2: ('cancel_delegate', p.BoolType, 0), - 3: ('transfer', TezosManagerTransfer, 0), + 1: ('set_delegate', p.BytesType, None), + 2: ('cancel_delegate', p.BoolType, None), + 3: ('transfer', TezosManagerTransfer, None), } diff --git a/core/src/trezor/messages/TezosProposalOp.py b/core/src/trezor/messages/TezosProposalOp.py index b4730383c..d2780efff 100644 --- a/core/src/trezor/messages/TezosProposalOp.py +++ b/core/src/trezor/messages/TezosProposalOp.py @@ -14,18 +14,19 @@ class TezosProposalOp(p.MessageType): def __init__( self, + *, + proposals: List[bytes] = None, source: bytes = None, period: int = None, - proposals: List[bytes] = None, ) -> None: + self.proposals = proposals if proposals is not None else [] self.source = source self.period = period - self.proposals = proposals if proposals is not None else [] @classmethod def get_fields(cls) -> Dict: return { - 1: ('source', p.BytesType, 0), - 2: ('period', p.UVarintType, 0), + 1: ('source', p.BytesType, None), + 2: ('period', p.UVarintType, None), 4: ('proposals', p.BytesType, p.FLAG_REPEATED), } diff --git a/core/src/trezor/messages/TezosPublicKey.py b/core/src/trezor/messages/TezosPublicKey.py index eedc71138..1afb9aeea 100644 --- a/core/src/trezor/messages/TezosPublicKey.py +++ b/core/src/trezor/messages/TezosPublicKey.py @@ -15,6 +15,7 @@ class TezosPublicKey(p.MessageType): def __init__( self, + *, public_key: str = None, ) -> None: self.public_key = public_key @@ -22,5 +23,5 @@ class TezosPublicKey(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('public_key', p.UnicodeType, 0), + 1: ('public_key', p.UnicodeType, None), } diff --git a/core/src/trezor/messages/TezosRevealOp.py b/core/src/trezor/messages/TezosRevealOp.py index 2abf3f52e..d00762a82 100644 --- a/core/src/trezor/messages/TezosRevealOp.py +++ b/core/src/trezor/messages/TezosRevealOp.py @@ -14,6 +14,7 @@ class TezosRevealOp(p.MessageType): def __init__( self, + *, source: bytes = None, fee: int = None, counter: int = None, @@ -31,10 +32,10 @@ class TezosRevealOp(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 7: ('source', p.BytesType, 0), - 2: ('fee', p.UVarintType, 0), - 3: ('counter', p.UVarintType, 0), - 4: ('gas_limit', p.UVarintType, 0), - 5: ('storage_limit', p.UVarintType, 0), - 6: ('public_key', p.BytesType, 0), + 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), } diff --git a/core/src/trezor/messages/TezosSignTx.py b/core/src/trezor/messages/TezosSignTx.py index 3d85a8792..bc95d8a0f 100644 --- a/core/src/trezor/messages/TezosSignTx.py +++ b/core/src/trezor/messages/TezosSignTx.py @@ -22,6 +22,7 @@ class TezosSignTx(p.MessageType): def __init__( self, + *, address_n: List[int] = None, branch: bytes = None, reveal: TezosRevealOp = None, @@ -44,11 +45,11 @@ class TezosSignTx(p.MessageType): def get_fields(cls) -> Dict: return { 1: ('address_n', p.UVarintType, p.FLAG_REPEATED), - 2: ('branch', p.BytesType, 0), - 3: ('reveal', TezosRevealOp, 0), - 4: ('transaction', TezosTransactionOp, 0), - 5: ('origination', TezosOriginationOp, 0), - 6: ('delegation', TezosDelegationOp, 0), - 7: ('proposal', TezosProposalOp, 0), - 8: ('ballot', TezosBallotOp, 0), + 2: ('branch', p.BytesType, None), + 3: ('reveal', TezosRevealOp, None), + 4: ('transaction', TezosTransactionOp, None), + 5: ('origination', TezosOriginationOp, None), + 6: ('delegation', TezosDelegationOp, None), + 7: ('proposal', TezosProposalOp, None), + 8: ('ballot', TezosBallotOp, None), } diff --git a/core/src/trezor/messages/TezosSignedTx.py b/core/src/trezor/messages/TezosSignedTx.py index 1e3902a21..036cd6197 100644 --- a/core/src/trezor/messages/TezosSignedTx.py +++ b/core/src/trezor/messages/TezosSignedTx.py @@ -15,6 +15,7 @@ class TezosSignedTx(p.MessageType): def __init__( self, + *, signature: str = None, sig_op_contents: bytes = None, operation_hash: str = None, @@ -26,7 +27,7 @@ class TezosSignedTx(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('signature', p.UnicodeType, 0), - 2: ('sig_op_contents', p.BytesType, 0), - 3: ('operation_hash', p.UnicodeType, 0), + 1: ('signature', p.UnicodeType, None), + 2: ('sig_op_contents', p.BytesType, None), + 3: ('operation_hash', p.UnicodeType, None), } diff --git a/core/src/trezor/messages/TezosTransactionOp.py b/core/src/trezor/messages/TezosTransactionOp.py index 6e4d8b361..98612cd09 100644 --- a/core/src/trezor/messages/TezosTransactionOp.py +++ b/core/src/trezor/messages/TezosTransactionOp.py @@ -17,6 +17,7 @@ class TezosTransactionOp(p.MessageType): def __init__( self, + *, source: bytes = None, fee: int = None, counter: int = None, @@ -40,13 +41,13 @@ class TezosTransactionOp(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 9: ('source', p.BytesType, 0), - 2: ('fee', p.UVarintType, 0), - 3: ('counter', p.UVarintType, 0), - 4: ('gas_limit', p.UVarintType, 0), - 5: ('storage_limit', p.UVarintType, 0), - 6: ('amount', p.UVarintType, 0), - 7: ('destination', TezosContractID, 0), - 8: ('parameters', p.BytesType, 0), - 10: ('parameters_manager', TezosParametersManager, 0), + 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), + 8: ('parameters', p.BytesType, None), + 10: ('parameters_manager', TezosParametersManager, None), } diff --git a/core/src/trezor/messages/TransactionType.py b/core/src/trezor/messages/TransactionType.py index b2aaaf1ec..0d66d4f1b 100644 --- a/core/src/trezor/messages/TransactionType.py +++ b/core/src/trezor/messages/TransactionType.py @@ -18,11 +18,12 @@ class TransactionType(p.MessageType): def __init__( self, - version: int = None, + *, inputs: List[TxInputType] = None, bin_outputs: List[TxOutputBinType] = None, - lock_time: int = None, outputs: List[TxOutputType] = None, + version: int = None, + lock_time: int = None, inputs_cnt: int = None, outputs_cnt: int = None, extra_data: bytes = None, @@ -32,11 +33,11 @@ class TransactionType(p.MessageType): timestamp: int = None, branch_id: int = None, ) -> None: - self.version = version self.inputs = inputs if inputs is not None else [] self.bin_outputs = bin_outputs if bin_outputs is not None else [] - self.lock_time = lock_time self.outputs = outputs if outputs is not None else [] + self.version = version + self.lock_time = lock_time self.inputs_cnt = inputs_cnt self.outputs_cnt = outputs_cnt self.extra_data = extra_data @@ -49,17 +50,17 @@ class TransactionType(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('version', p.UVarintType, 0), + 1: ('version', p.UVarintType, None), 2: ('inputs', TxInputType, p.FLAG_REPEATED), 3: ('bin_outputs', TxOutputBinType, p.FLAG_REPEATED), - 4: ('lock_time', p.UVarintType, 0), + 4: ('lock_time', p.UVarintType, None), 5: ('outputs', TxOutputType, p.FLAG_REPEATED), - 6: ('inputs_cnt', p.UVarintType, 0), - 7: ('outputs_cnt', p.UVarintType, 0), - 8: ('extra_data', p.BytesType, 0), - 9: ('extra_data_len', p.UVarintType, 0), - 10: ('expiry', p.UVarintType, 0), - 12: ('version_group_id', p.UVarintType, 0), - 13: ('timestamp', p.UVarintType, 0), - 14: ('branch_id', p.UVarintType, 0), + 6: ('inputs_cnt', p.UVarintType, None), + 7: ('outputs_cnt', p.UVarintType, None), + 8: ('extra_data', p.BytesType, None), + 9: ('extra_data_len', p.UVarintType, None), + 10: ('expiry', p.UVarintType, None), + 12: ('version_group_id', p.UVarintType, None), + 13: ('timestamp', p.UVarintType, None), + 14: ('branch_id', p.UVarintType, None), } diff --git a/core/src/trezor/messages/TxAck.py b/core/src/trezor/messages/TxAck.py index c34f196e8..d2630ffd5 100644 --- a/core/src/trezor/messages/TxAck.py +++ b/core/src/trezor/messages/TxAck.py @@ -17,6 +17,7 @@ class TxAck(p.MessageType): def __init__( self, + *, tx: TransactionType = None, ) -> None: self.tx = tx @@ -24,5 +25,5 @@ class TxAck(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('tx', TransactionType, 0), + 1: ('tx', TransactionType, None), } diff --git a/core/src/trezor/messages/TxAckInput.py b/core/src/trezor/messages/TxAckInput.py new file mode 100644 index 000000000..eb23898ab --- /dev/null +++ b/core/src/trezor/messages/TxAckInput.py @@ -0,0 +1,29 @@ +# Automatically generated by pb2py +# fmt: off +import protobuf as p + +from .TxAckInputWrapper import TxAckInputWrapper + +if __debug__: + try: + from typing import Dict, List # noqa: F401 + from typing_extensions import Literal # noqa: F401 + except ImportError: + pass + + +class TxAckInput(p.MessageType): + MESSAGE_WIRE_TYPE = 22 + + def __init__( + self, + *, + tx: TxAckInputWrapper, + ) -> None: + self.tx = tx + + @classmethod + def get_fields(cls) -> Dict: + return { + 1: ('tx', TxAckInputWrapper, p.FLAG_REQUIRED), + } diff --git a/core/src/trezor/messages/TxAckInputType.py b/core/src/trezor/messages/TxAckInputType.py new file mode 100644 index 000000000..77faa446c --- /dev/null +++ b/core/src/trezor/messages/TxAckInputType.py @@ -0,0 +1,62 @@ +# Automatically generated by pb2py +# fmt: off +import protobuf as p + +from .MultisigRedeemScriptType import MultisigRedeemScriptType + +if __debug__: + try: + from typing import Dict, List # noqa: F401 + from typing_extensions import Literal # noqa: F401 + EnumTypeInputScriptType = Literal[0, 1, 2, 3, 4] + except ImportError: + pass + + +class TxAckInputType(p.MessageType): + + def __init__( + self, + *, + prev_hash: bytes, + prev_index: int, + amount: int, + address_n: List[int] = None, + script_sig: bytes = None, + sequence: int = 4294967295, + script_type: EnumTypeInputScriptType = 0, + multisig: MultisigRedeemScriptType = None, + decred_tree: int = None, + witness: bytes = None, + ownership_proof: bytes = None, + commitment_data: bytes = None, + ) -> None: + self.address_n = address_n if address_n is not None else [] + self.prev_hash = prev_hash + self.prev_index = prev_index + self.amount = amount + self.script_sig = script_sig + self.sequence = sequence + self.script_type = script_type + self.multisig = multisig + self.decred_tree = decred_tree + self.witness = witness + self.ownership_proof = ownership_proof + self.commitment_data = commitment_data + + @classmethod + def get_fields(cls) -> Dict: + return { + 1: ('address_n', p.UVarintType, p.FLAG_REPEATED), + 2: ('prev_hash', p.BytesType, p.FLAG_REQUIRED), + 3: ('prev_index', p.UVarintType, p.FLAG_REQUIRED), + 4: ('script_sig', p.BytesType, None), + 5: ('sequence', p.UVarintType, 4294967295), # default=4294967295 + 6: ('script_type', p.EnumType("InputScriptType", (0, 1, 2, 3, 4)), 0), # default=SPENDADDRESS + 7: ('multisig', MultisigRedeemScriptType, None), + 8: ('amount', p.UVarintType, p.FLAG_REQUIRED), + 9: ('decred_tree', p.UVarintType, None), + 13: ('witness', p.BytesType, None), + 14: ('ownership_proof', p.BytesType, None), + 15: ('commitment_data', p.BytesType, None), + } diff --git a/core/src/trezor/messages/TxAckInputWrapper.py b/core/src/trezor/messages/TxAckInputWrapper.py new file mode 100644 index 000000000..2d8a9f8a9 --- /dev/null +++ b/core/src/trezor/messages/TxAckInputWrapper.py @@ -0,0 +1,28 @@ +# Automatically generated by pb2py +# fmt: off +import protobuf as p + +from .TxAckInputType import TxAckInputType + +if __debug__: + try: + from typing import Dict, List # noqa: F401 + from typing_extensions import Literal # noqa: F401 + except ImportError: + pass + + +class TxAckInputWrapper(p.MessageType): + + def __init__( + self, + *, + input: TxAckInputType, + ) -> None: + self.input = input + + @classmethod + def get_fields(cls) -> Dict: + return { + 2: ('input', TxAckInputType, p.FLAG_REQUIRED), + } diff --git a/core/src/trezor/messages/TxAckOutput.py b/core/src/trezor/messages/TxAckOutput.py new file mode 100644 index 000000000..5353bb201 --- /dev/null +++ b/core/src/trezor/messages/TxAckOutput.py @@ -0,0 +1,29 @@ +# Automatically generated by pb2py +# fmt: off +import protobuf as p + +from .TxAckOutputWrapper import TxAckOutputWrapper + +if __debug__: + try: + from typing import Dict, List # noqa: F401 + from typing_extensions import Literal # noqa: F401 + except ImportError: + pass + + +class TxAckOutput(p.MessageType): + MESSAGE_WIRE_TYPE = 22 + + def __init__( + self, + *, + tx: TxAckOutputWrapper, + ) -> None: + self.tx = tx + + @classmethod + def get_fields(cls) -> Dict: + return { + 1: ('tx', TxAckOutputWrapper, p.FLAG_REQUIRED), + } diff --git a/core/src/trezor/messages/TxAckOutputType.py b/core/src/trezor/messages/TxAckOutputType.py new file mode 100644 index 000000000..be4e7f06e --- /dev/null +++ b/core/src/trezor/messages/TxAckOutputType.py @@ -0,0 +1,44 @@ +# Automatically generated by pb2py +# fmt: off +import protobuf as p + +from .MultisigRedeemScriptType import MultisigRedeemScriptType + +if __debug__: + try: + from typing import Dict, List # noqa: F401 + from typing_extensions import Literal # noqa: F401 + EnumTypeOutputScriptType = Literal[0, 1, 2, 3, 4, 5] + except ImportError: + pass + + +class TxAckOutputType(p.MessageType): + + def __init__( + self, + *, + amount: int, + address_n: List[int] = None, + address: str = None, + script_type: EnumTypeOutputScriptType = 0, + multisig: MultisigRedeemScriptType = None, + op_return_data: bytes = None, + ) -> None: + self.address_n = address_n if address_n is not None else [] + self.amount = amount + self.address = address + self.script_type = script_type + self.multisig = multisig + self.op_return_data = op_return_data + + @classmethod + def get_fields(cls) -> Dict: + return { + 1: ('address', p.UnicodeType, None), + 2: ('address_n', p.UVarintType, p.FLAG_REPEATED), + 3: ('amount', p.UVarintType, p.FLAG_REQUIRED), + 4: ('script_type', p.EnumType("OutputScriptType", (0, 1, 2, 3, 4, 5)), 0), # default=PAYTOADDRESS + 5: ('multisig', MultisigRedeemScriptType, None), + 6: ('op_return_data', p.BytesType, None), + } diff --git a/core/src/trezor/messages/TxAckOutputWrapper.py b/core/src/trezor/messages/TxAckOutputWrapper.py new file mode 100644 index 000000000..729d4187d --- /dev/null +++ b/core/src/trezor/messages/TxAckOutputWrapper.py @@ -0,0 +1,28 @@ +# Automatically generated by pb2py +# fmt: off +import protobuf as p + +from .TxAckOutputType import TxAckOutputType + +if __debug__: + try: + from typing import Dict, List # noqa: F401 + from typing_extensions import Literal # noqa: F401 + except ImportError: + pass + + +class TxAckOutputWrapper(p.MessageType): + + def __init__( + self, + *, + output: TxAckOutputType, + ) -> None: + self.output = output + + @classmethod + def get_fields(cls) -> Dict: + return { + 5: ('output', TxAckOutputType, p.FLAG_REQUIRED), + } diff --git a/core/src/trezor/messages/TxAckPrevExtraData.py b/core/src/trezor/messages/TxAckPrevExtraData.py new file mode 100644 index 000000000..a540407f6 --- /dev/null +++ b/core/src/trezor/messages/TxAckPrevExtraData.py @@ -0,0 +1,29 @@ +# Automatically generated by pb2py +# fmt: off +import protobuf as p + +from .TxAckPrevExtraDataWrapper import TxAckPrevExtraDataWrapper + +if __debug__: + try: + from typing import Dict, List # noqa: F401 + from typing_extensions import Literal # noqa: F401 + except ImportError: + pass + + +class TxAckPrevExtraData(p.MessageType): + MESSAGE_WIRE_TYPE = 22 + + def __init__( + self, + *, + tx: TxAckPrevExtraDataWrapper, + ) -> None: + self.tx = tx + + @classmethod + def get_fields(cls) -> Dict: + return { + 1: ('tx', TxAckPrevExtraDataWrapper, p.FLAG_REQUIRED), + } diff --git a/core/src/trezor/messages/TxAckPrevExtraDataWrapper.py b/core/src/trezor/messages/TxAckPrevExtraDataWrapper.py new file mode 100644 index 000000000..3e1e30e92 --- /dev/null +++ b/core/src/trezor/messages/TxAckPrevExtraDataWrapper.py @@ -0,0 +1,26 @@ +# Automatically generated by pb2py +# fmt: off +import protobuf as p + +if __debug__: + try: + from typing import Dict, List # noqa: F401 + from typing_extensions import Literal # noqa: F401 + except ImportError: + pass + + +class TxAckPrevExtraDataWrapper(p.MessageType): + + def __init__( + self, + *, + extra_data_chunk: bytes, + ) -> None: + self.extra_data_chunk = extra_data_chunk + + @classmethod + def get_fields(cls) -> Dict: + return { + 8: ('extra_data_chunk', p.BytesType, p.FLAG_REQUIRED), + } diff --git a/core/src/trezor/messages/TxAckPrevInput.py b/core/src/trezor/messages/TxAckPrevInput.py new file mode 100644 index 000000000..d2c939321 --- /dev/null +++ b/core/src/trezor/messages/TxAckPrevInput.py @@ -0,0 +1,29 @@ +# Automatically generated by pb2py +# fmt: off +import protobuf as p + +from .TxAckPrevInputWrapper import TxAckPrevInputWrapper + +if __debug__: + try: + from typing import Dict, List # noqa: F401 + from typing_extensions import Literal # noqa: F401 + except ImportError: + pass + + +class TxAckPrevInput(p.MessageType): + MESSAGE_WIRE_TYPE = 22 + + def __init__( + self, + *, + tx: TxAckPrevInputWrapper, + ) -> None: + self.tx = tx + + @classmethod + def get_fields(cls) -> Dict: + return { + 1: ('tx', TxAckPrevInputWrapper, p.FLAG_REQUIRED), + } diff --git a/core/src/trezor/messages/TxAckPrevInputType.py b/core/src/trezor/messages/TxAckPrevInputType.py new file mode 100644 index 000000000..3c63a1309 --- /dev/null +++ b/core/src/trezor/messages/TxAckPrevInputType.py @@ -0,0 +1,38 @@ +# Automatically generated by pb2py +# fmt: off +import protobuf as p + +if __debug__: + try: + from typing import Dict, List # noqa: F401 + from typing_extensions import Literal # noqa: F401 + except ImportError: + pass + + +class TxAckPrevInputType(p.MessageType): + + def __init__( + self, + *, + prev_hash: bytes, + prev_index: int, + script_sig: bytes, + sequence: int, + decred_tree: int = None, + ) -> None: + self.prev_hash = prev_hash + self.prev_index = prev_index + self.script_sig = script_sig + self.sequence = sequence + self.decred_tree = decred_tree + + @classmethod + def get_fields(cls) -> Dict: + return { + 2: ('prev_hash', p.BytesType, p.FLAG_REQUIRED), + 3: ('prev_index', p.UVarintType, p.FLAG_REQUIRED), + 4: ('script_sig', p.BytesType, p.FLAG_REQUIRED), + 5: ('sequence', p.UVarintType, p.FLAG_REQUIRED), + 9: ('decred_tree', p.UVarintType, None), + } diff --git a/core/src/trezor/messages/TxAckPrevInputWrapper.py b/core/src/trezor/messages/TxAckPrevInputWrapper.py new file mode 100644 index 000000000..96ce2395d --- /dev/null +++ b/core/src/trezor/messages/TxAckPrevInputWrapper.py @@ -0,0 +1,28 @@ +# Automatically generated by pb2py +# fmt: off +import protobuf as p + +from .TxAckPrevInputType import TxAckPrevInputType + +if __debug__: + try: + from typing import Dict, List # noqa: F401 + from typing_extensions import Literal # noqa: F401 + except ImportError: + pass + + +class TxAckPrevInputWrapper(p.MessageType): + + def __init__( + self, + *, + input: TxAckPrevInputType, + ) -> None: + self.input = input + + @classmethod + def get_fields(cls) -> Dict: + return { + 2: ('input', TxAckPrevInputType, p.FLAG_REQUIRED), + } diff --git a/core/src/trezor/messages/TxAckPrevMeta.py b/core/src/trezor/messages/TxAckPrevMeta.py new file mode 100644 index 000000000..dfe44ccb0 --- /dev/null +++ b/core/src/trezor/messages/TxAckPrevMeta.py @@ -0,0 +1,29 @@ +# Automatically generated by pb2py +# fmt: off +import protobuf as p + +from .TxAckPrevTxType import TxAckPrevTxType + +if __debug__: + try: + from typing import Dict, List # noqa: F401 + from typing_extensions import Literal # noqa: F401 + except ImportError: + pass + + +class TxAckPrevMeta(p.MessageType): + MESSAGE_WIRE_TYPE = 22 + + def __init__( + self, + *, + tx: TxAckPrevTxType, + ) -> None: + self.tx = tx + + @classmethod + def get_fields(cls) -> Dict: + return { + 1: ('tx', TxAckPrevTxType, p.FLAG_REQUIRED), + } diff --git a/core/src/trezor/messages/TxAckPrevOutput.py b/core/src/trezor/messages/TxAckPrevOutput.py new file mode 100644 index 000000000..cc50e169c --- /dev/null +++ b/core/src/trezor/messages/TxAckPrevOutput.py @@ -0,0 +1,29 @@ +# Automatically generated by pb2py +# fmt: off +import protobuf as p + +from .TxAckPrevOutputWrapper import TxAckPrevOutputWrapper + +if __debug__: + try: + from typing import Dict, List # noqa: F401 + from typing_extensions import Literal # noqa: F401 + except ImportError: + pass + + +class TxAckPrevOutput(p.MessageType): + MESSAGE_WIRE_TYPE = 22 + + def __init__( + self, + *, + tx: TxAckPrevOutputWrapper, + ) -> None: + self.tx = tx + + @classmethod + def get_fields(cls) -> Dict: + return { + 1: ('tx', TxAckPrevOutputWrapper, p.FLAG_REQUIRED), + } diff --git a/core/src/trezor/messages/TxAckPrevOutputType.py b/core/src/trezor/messages/TxAckPrevOutputType.py new file mode 100644 index 000000000..5605719ab --- /dev/null +++ b/core/src/trezor/messages/TxAckPrevOutputType.py @@ -0,0 +1,32 @@ +# Automatically generated by pb2py +# fmt: off +import protobuf as p + +if __debug__: + try: + from typing import Dict, List # noqa: F401 + from typing_extensions import Literal # noqa: F401 + except ImportError: + pass + + +class TxAckPrevOutputType(p.MessageType): + + def __init__( + self, + *, + amount: int, + script_pubkey: bytes, + decred_script_version: int = None, + ) -> None: + self.amount = amount + self.script_pubkey = script_pubkey + self.decred_script_version = decred_script_version + + @classmethod + def get_fields(cls) -> Dict: + return { + 1: ('amount', p.UVarintType, p.FLAG_REQUIRED), + 2: ('script_pubkey', p.BytesType, p.FLAG_REQUIRED), + 3: ('decred_script_version', p.UVarintType, None), + } diff --git a/core/src/trezor/messages/TxAckPrevOutputWrapper.py b/core/src/trezor/messages/TxAckPrevOutputWrapper.py new file mode 100644 index 000000000..abb4821b2 --- /dev/null +++ b/core/src/trezor/messages/TxAckPrevOutputWrapper.py @@ -0,0 +1,28 @@ +# Automatically generated by pb2py +# fmt: off +import protobuf as p + +from .TxAckPrevOutputType import TxAckPrevOutputType + +if __debug__: + try: + from typing import Dict, List # noqa: F401 + from typing_extensions import Literal # noqa: F401 + except ImportError: + pass + + +class TxAckPrevOutputWrapper(p.MessageType): + + def __init__( + self, + *, + output: TxAckPrevOutputType, + ) -> None: + self.output = output + + @classmethod + def get_fields(cls) -> Dict: + return { + 3: ('output', TxAckPrevOutputType, p.FLAG_REQUIRED), + } diff --git a/core/src/trezor/messages/TxAckPrevTxType.py b/core/src/trezor/messages/TxAckPrevTxType.py new file mode 100644 index 000000000..60b96d568 --- /dev/null +++ b/core/src/trezor/messages/TxAckPrevTxType.py @@ -0,0 +1,50 @@ +# Automatically generated by pb2py +# fmt: off +import protobuf as p + +if __debug__: + try: + from typing import Dict, List # noqa: F401 + from typing_extensions import Literal # noqa: F401 + except ImportError: + pass + + +class TxAckPrevTxType(p.MessageType): + + def __init__( + self, + *, + version: int, + lock_time: int, + inputs_count: int, + outputs_count: int, + extra_data_len: int = 0, + expiry: int = None, + version_group_id: int = None, + timestamp: int = None, + branch_id: int = None, + ) -> None: + self.version = version + self.lock_time = lock_time + self.inputs_count = inputs_count + self.outputs_count = outputs_count + self.extra_data_len = extra_data_len + self.expiry = expiry + self.version_group_id = version_group_id + self.timestamp = timestamp + self.branch_id = branch_id + + @classmethod + def get_fields(cls) -> Dict: + return { + 1: ('version', p.UVarintType, p.FLAG_REQUIRED), + 4: ('lock_time', p.UVarintType, p.FLAG_REQUIRED), + 6: ('inputs_count', p.UVarintType, p.FLAG_REQUIRED), + 7: ('outputs_count', p.UVarintType, p.FLAG_REQUIRED), + 9: ('extra_data_len', p.UVarintType, 0), # default=0 + 10: ('expiry', p.UVarintType, None), + 12: ('version_group_id', p.UVarintType, None), + 13: ('timestamp', p.UVarintType, None), + 14: ('branch_id', p.UVarintType, None), + } diff --git a/core/src/trezor/messages/TxInputType.py b/core/src/trezor/messages/TxInputType.py index 8051d0ce5..b7621fe93 100644 --- a/core/src/trezor/messages/TxInputType.py +++ b/core/src/trezor/messages/TxInputType.py @@ -17,12 +17,13 @@ class TxInputType(p.MessageType): def __init__( self, + *, + prev_hash: bytes, + prev_index: int, address_n: List[int] = None, - prev_hash: bytes = None, - prev_index: int = None, script_sig: bytes = None, - sequence: int = None, - script_type: EnumTypeInputScriptType = None, + sequence: int = 4294967295, + script_type: EnumTypeInputScriptType = 0, multisig: MultisigRedeemScriptType = None, amount: int = None, decred_tree: int = None, @@ -47,15 +48,15 @@ class TxInputType(p.MessageType): def get_fields(cls) -> Dict: return { 1: ('address_n', p.UVarintType, p.FLAG_REPEATED), - 2: ('prev_hash', p.BytesType, 0), # required - 3: ('prev_index', p.UVarintType, 0), # required - 4: ('script_sig', p.BytesType, 0), - 5: ('sequence', p.UVarintType, 0), # default=4294967295 + 2: ('prev_hash', p.BytesType, p.FLAG_REQUIRED), + 3: ('prev_index', p.UVarintType, p.FLAG_REQUIRED), + 4: ('script_sig', p.BytesType, None), + 5: ('sequence', p.UVarintType, 4294967295), # default=4294967295 6: ('script_type', p.EnumType("InputScriptType", (0, 1, 2, 3, 4)), 0), # default=SPENDADDRESS - 7: ('multisig', MultisigRedeemScriptType, 0), - 8: ('amount', p.UVarintType, 0), - 9: ('decred_tree', p.UVarintType, 0), - 13: ('witness', p.BytesType, 0), - 14: ('ownership_proof', p.BytesType, 0), - 15: ('commitment_data', p.BytesType, 0), + 7: ('multisig', MultisigRedeemScriptType, None), + 8: ('amount', p.UVarintType, None), + 9: ('decred_tree', p.UVarintType, None), + 13: ('witness', p.BytesType, None), + 14: ('ownership_proof', p.BytesType, None), + 15: ('commitment_data', p.BytesType, None), } diff --git a/core/src/trezor/messages/TxOutputBinType.py b/core/src/trezor/messages/TxOutputBinType.py index ea6f25b06..0063c51b5 100644 --- a/core/src/trezor/messages/TxOutputBinType.py +++ b/core/src/trezor/messages/TxOutputBinType.py @@ -14,8 +14,9 @@ class TxOutputBinType(p.MessageType): def __init__( self, - amount: int = None, - script_pubkey: bytes = None, + *, + amount: int, + script_pubkey: bytes, decred_script_version: int = None, ) -> None: self.amount = amount @@ -25,7 +26,7 @@ class TxOutputBinType(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('amount', p.UVarintType, 0), # required - 2: ('script_pubkey', p.BytesType, 0), # required - 3: ('decred_script_version', p.UVarintType, 0), + 1: ('amount', p.UVarintType, p.FLAG_REQUIRED), + 2: ('script_pubkey', p.BytesType, p.FLAG_REQUIRED), + 3: ('decred_script_version', p.UVarintType, None), } diff --git a/core/src/trezor/messages/TxOutputType.py b/core/src/trezor/messages/TxOutputType.py index 8862b3093..7ab50e121 100644 --- a/core/src/trezor/messages/TxOutputType.py +++ b/core/src/trezor/messages/TxOutputType.py @@ -17,16 +17,17 @@ class TxOutputType(p.MessageType): def __init__( self, - address: str = None, + *, + amount: int, address_n: List[int] = None, - amount: int = None, - script_type: EnumTypeOutputScriptType = None, + address: str = None, + script_type: EnumTypeOutputScriptType = 0, multisig: MultisigRedeemScriptType = None, op_return_data: bytes = None, ) -> None: - self.address = address self.address_n = address_n if address_n is not None else [] self.amount = amount + self.address = address self.script_type = script_type self.multisig = multisig self.op_return_data = op_return_data @@ -34,10 +35,10 @@ class TxOutputType(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('address', p.UnicodeType, 0), + 1: ('address', p.UnicodeType, None), 2: ('address_n', p.UVarintType, p.FLAG_REPEATED), - 3: ('amount', p.UVarintType, 0), # required - 4: ('script_type', p.EnumType("OutputScriptType", (0, 1, 2, 3, 4, 5)), 0), # required - 5: ('multisig', MultisigRedeemScriptType, 0), - 6: ('op_return_data', p.BytesType, 0), + 3: ('amount', p.UVarintType, p.FLAG_REQUIRED), + 4: ('script_type', p.EnumType("OutputScriptType", (0, 1, 2, 3, 4, 5)), 0), # default=PAYTOADDRESS + 5: ('multisig', MultisigRedeemScriptType, None), + 6: ('op_return_data', p.BytesType, None), } diff --git a/core/src/trezor/messages/TxRequest.py b/core/src/trezor/messages/TxRequest.py index 07b1725ff..5e3a867bf 100644 --- a/core/src/trezor/messages/TxRequest.py +++ b/core/src/trezor/messages/TxRequest.py @@ -19,6 +19,7 @@ class TxRequest(p.MessageType): def __init__( self, + *, request_type: EnumTypeRequestType = None, details: TxRequestDetailsType = None, serialized: TxRequestSerializedType = None, @@ -30,7 +31,7 @@ class TxRequest(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('request_type', p.EnumType("RequestType", (0, 1, 2, 3, 4)), 0), - 2: ('details', TxRequestDetailsType, 0), - 3: ('serialized', TxRequestSerializedType, 0), + 1: ('request_type', p.EnumType("RequestType", (0, 1, 2, 3, 4)), None), + 2: ('details', TxRequestDetailsType, None), + 3: ('serialized', TxRequestSerializedType, None), } diff --git a/core/src/trezor/messages/TxRequestDetailsType.py b/core/src/trezor/messages/TxRequestDetailsType.py index ee411fb12..63dfd2686 100644 --- a/core/src/trezor/messages/TxRequestDetailsType.py +++ b/core/src/trezor/messages/TxRequestDetailsType.py @@ -14,6 +14,7 @@ class TxRequestDetailsType(p.MessageType): def __init__( self, + *, request_index: int = None, tx_hash: bytes = None, extra_data_len: int = None, @@ -27,8 +28,8 @@ class TxRequestDetailsType(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('request_index', p.UVarintType, 0), - 2: ('tx_hash', p.BytesType, 0), - 3: ('extra_data_len', p.UVarintType, 0), - 4: ('extra_data_offset', p.UVarintType, 0), + 1: ('request_index', p.UVarintType, None), + 2: ('tx_hash', p.BytesType, None), + 3: ('extra_data_len', p.UVarintType, None), + 4: ('extra_data_offset', p.UVarintType, None), } diff --git a/core/src/trezor/messages/TxRequestSerializedType.py b/core/src/trezor/messages/TxRequestSerializedType.py index 73636a20d..5f95894b2 100644 --- a/core/src/trezor/messages/TxRequestSerializedType.py +++ b/core/src/trezor/messages/TxRequestSerializedType.py @@ -14,6 +14,7 @@ class TxRequestSerializedType(p.MessageType): def __init__( self, + *, signature_index: int = None, signature: bytes = None, serialized_tx: bytes = None, @@ -25,7 +26,7 @@ class TxRequestSerializedType(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('signature_index', p.UVarintType, 0), - 2: ('signature', p.BytesType, 0), - 3: ('serialized_tx', p.BytesType, 0), + 1: ('signature_index', p.UVarintType, None), + 2: ('signature', p.BytesType, None), + 3: ('serialized_tx', p.BytesType, None), } diff --git a/core/src/trezor/messages/VerifyMessage.py b/core/src/trezor/messages/VerifyMessage.py index 8e7886c1f..963583c60 100644 --- a/core/src/trezor/messages/VerifyMessage.py +++ b/core/src/trezor/messages/VerifyMessage.py @@ -15,10 +15,11 @@ class VerifyMessage(p.MessageType): def __init__( self, - address: str = None, - signature: bytes = None, - message: bytes = None, - coin_name: str = None, + *, + address: str, + signature: bytes, + message: bytes, + coin_name: str = "Bitcoin", ) -> None: self.address = address self.signature = signature @@ -28,8 +29,8 @@ class VerifyMessage(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('address', p.UnicodeType, 0), - 2: ('signature', p.BytesType, 0), - 3: ('message', p.BytesType, 0), - 4: ('coin_name', p.UnicodeType, 0), # default=Bitcoin + 1: ('address', p.UnicodeType, p.FLAG_REQUIRED), + 2: ('signature', p.BytesType, p.FLAG_REQUIRED), + 3: ('message', p.BytesType, p.FLAG_REQUIRED), + 4: ('coin_name', p.UnicodeType, "Bitcoin"), # default=Bitcoin } diff --git a/core/src/trezor/messages/WebAuthnAddResidentCredential.py b/core/src/trezor/messages/WebAuthnAddResidentCredential.py index 90907037a..411c3c26f 100644 --- a/core/src/trezor/messages/WebAuthnAddResidentCredential.py +++ b/core/src/trezor/messages/WebAuthnAddResidentCredential.py @@ -15,6 +15,7 @@ class WebAuthnAddResidentCredential(p.MessageType): def __init__( self, + *, credential_id: bytes = None, ) -> None: self.credential_id = credential_id @@ -22,5 +23,5 @@ class WebAuthnAddResidentCredential(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('credential_id', p.BytesType, 0), + 1: ('credential_id', p.BytesType, None), } diff --git a/core/src/trezor/messages/WebAuthnCredential.py b/core/src/trezor/messages/WebAuthnCredential.py index 6f75df4d0..ceabd8f81 100644 --- a/core/src/trezor/messages/WebAuthnCredential.py +++ b/core/src/trezor/messages/WebAuthnCredential.py @@ -14,6 +14,7 @@ class WebAuthnCredential(p.MessageType): def __init__( self, + *, index: int = None, id: bytes = None, rp_id: str = None, @@ -43,16 +44,16 @@ class WebAuthnCredential(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('index', p.UVarintType, 0), - 2: ('id', p.BytesType, 0), - 3: ('rp_id', p.UnicodeType, 0), - 4: ('rp_name', p.UnicodeType, 0), - 5: ('user_id', p.BytesType, 0), - 6: ('user_name', p.UnicodeType, 0), - 7: ('user_display_name', p.UnicodeType, 0), - 8: ('creation_time', p.UVarintType, 0), - 9: ('hmac_secret', p.BoolType, 0), - 10: ('use_sign_count', p.BoolType, 0), - 11: ('algorithm', p.SVarintType, 0), - 12: ('curve', p.SVarintType, 0), + 1: ('index', p.UVarintType, None), + 2: ('id', p.BytesType, None), + 3: ('rp_id', p.UnicodeType, None), + 4: ('rp_name', p.UnicodeType, None), + 5: ('user_id', p.BytesType, None), + 6: ('user_name', p.UnicodeType, None), + 7: ('user_display_name', p.UnicodeType, None), + 8: ('creation_time', p.UVarintType, None), + 9: ('hmac_secret', p.BoolType, None), + 10: ('use_sign_count', p.BoolType, None), + 11: ('algorithm', p.SVarintType, None), + 12: ('curve', p.SVarintType, None), } diff --git a/core/src/trezor/messages/WebAuthnCredentials.py b/core/src/trezor/messages/WebAuthnCredentials.py index b90a7fa03..d024eef68 100644 --- a/core/src/trezor/messages/WebAuthnCredentials.py +++ b/core/src/trezor/messages/WebAuthnCredentials.py @@ -17,6 +17,7 @@ class WebAuthnCredentials(p.MessageType): def __init__( self, + *, credentials: List[WebAuthnCredential] = None, ) -> None: self.credentials = credentials if credentials is not None else [] diff --git a/core/src/trezor/messages/WebAuthnRemoveResidentCredential.py b/core/src/trezor/messages/WebAuthnRemoveResidentCredential.py index 89eb729b6..0040098e5 100644 --- a/core/src/trezor/messages/WebAuthnRemoveResidentCredential.py +++ b/core/src/trezor/messages/WebAuthnRemoveResidentCredential.py @@ -15,6 +15,7 @@ class WebAuthnRemoveResidentCredential(p.MessageType): def __init__( self, + *, index: int = None, ) -> None: self.index = index @@ -22,5 +23,5 @@ class WebAuthnRemoveResidentCredential(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('index', p.UVarintType, 0), + 1: ('index', p.UVarintType, None), } diff --git a/python/src/trezorlib/messages/Address.py b/python/src/trezorlib/messages/Address.py index c3daf3d85..f07b92c6b 100644 --- a/python/src/trezorlib/messages/Address.py +++ b/python/src/trezorlib/messages/Address.py @@ -15,12 +15,13 @@ class Address(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, 0), # required + 1: ('address', p.UnicodeType, p.FLAG_REQUIRED), } diff --git a/python/src/trezorlib/messages/ApplyFlags.py b/python/src/trezorlib/messages/ApplyFlags.py index 1cacb6ca8..408b344c8 100644 --- a/python/src/trezorlib/messages/ApplyFlags.py +++ b/python/src/trezorlib/messages/ApplyFlags.py @@ -15,6 +15,7 @@ class ApplyFlags(p.MessageType): def __init__( self, + *, flags: int = None, ) -> None: self.flags = flags @@ -22,5 +23,5 @@ class ApplyFlags(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('flags', p.UVarintType, 0), + 1: ('flags', p.UVarintType, None), } diff --git a/python/src/trezorlib/messages/ApplySettings.py b/python/src/trezorlib/messages/ApplySettings.py index f2118f9df..a09d77867 100644 --- a/python/src/trezorlib/messages/ApplySettings.py +++ b/python/src/trezorlib/messages/ApplySettings.py @@ -16,6 +16,7 @@ class ApplySettings(p.MessageType): def __init__( self, + *, language: str = None, label: str = None, use_passphrase: bool = None, @@ -37,12 +38,12 @@ class ApplySettings(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('language', p.UnicodeType, 0), - 2: ('label', p.UnicodeType, 0), - 3: ('use_passphrase', p.BoolType, 0), - 4: ('homescreen', p.BytesType, 0), - 6: ('auto_lock_delay_ms', p.UVarintType, 0), - 7: ('display_rotation', p.UVarintType, 0), - 8: ('passphrase_always_on_device', p.BoolType, 0), - 9: ('safety_checks', p.EnumType("SafetyCheckLevel", (0, 1, 2)), 0), + 1: ('language', p.UnicodeType, None), + 2: ('label', p.UnicodeType, None), + 3: ('use_passphrase', p.BoolType, None), + 4: ('homescreen', p.BytesType, None), + 6: ('auto_lock_delay_ms', p.UVarintType, None), + 7: ('display_rotation', p.UVarintType, None), + 8: ('passphrase_always_on_device', p.BoolType, None), + 9: ('safety_checks', p.EnumType("SafetyCheckLevel", (0, 1, 2)), None), } diff --git a/python/src/trezorlib/messages/AuthorizeCoinJoin.py b/python/src/trezorlib/messages/AuthorizeCoinJoin.py index 8a636d7a7..c27daf952 100644 --- a/python/src/trezorlib/messages/AuthorizeCoinJoin.py +++ b/python/src/trezorlib/messages/AuthorizeCoinJoin.py @@ -16,27 +16,28 @@ class AuthorizeCoinJoin(p.MessageType): def __init__( self, - coordinator: str = None, - max_total_fee: int = None, - fee_per_anonymity: int = None, + *, + coordinator: str, + max_total_fee: int, address_n: List[int] = None, - coin_name: str = None, - script_type: EnumTypeInputScriptType = None, + fee_per_anonymity: int = None, + coin_name: str = "Bitcoin", + script_type: EnumTypeInputScriptType = 0, ) -> None: + self.address_n = address_n if address_n is not None else [] self.coordinator = coordinator self.max_total_fee = max_total_fee self.fee_per_anonymity = fee_per_anonymity - self.address_n = address_n if address_n is not None else [] self.coin_name = coin_name self.script_type = script_type @classmethod def get_fields(cls) -> Dict: return { - 1: ('coordinator', p.UnicodeType, 0), # required - 2: ('max_total_fee', p.UVarintType, 0), # required - 3: ('fee_per_anonymity', p.UVarintType, 0), + 1: ('coordinator', p.UnicodeType, p.FLAG_REQUIRED), + 2: ('max_total_fee', p.UVarintType, p.FLAG_REQUIRED), + 3: ('fee_per_anonymity', p.UVarintType, None), 4: ('address_n', p.UVarintType, p.FLAG_REPEATED), - 5: ('coin_name', p.UnicodeType, 0), # default=Bitcoin + 5: ('coin_name', p.UnicodeType, "Bitcoin"), # default=Bitcoin 6: ('script_type', p.EnumType("InputScriptType", (0, 1, 2, 3, 4)), 0), # default=SPENDADDRESS } diff --git a/python/src/trezorlib/messages/BinanceAddress.py b/python/src/trezorlib/messages/BinanceAddress.py index 9aa9ab1ab..5bca344e2 100644 --- a/python/src/trezorlib/messages/BinanceAddress.py +++ b/python/src/trezorlib/messages/BinanceAddress.py @@ -15,6 +15,7 @@ class BinanceAddress(p.MessageType): def __init__( self, + *, address: str = None, ) -> None: self.address = address @@ -22,5 +23,5 @@ class BinanceAddress(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('address', p.UnicodeType, 0), + 1: ('address', p.UnicodeType, None), } diff --git a/python/src/trezorlib/messages/BinanceCancelMsg.py b/python/src/trezorlib/messages/BinanceCancelMsg.py index 121e6a64b..143dc08b8 100644 --- a/python/src/trezorlib/messages/BinanceCancelMsg.py +++ b/python/src/trezorlib/messages/BinanceCancelMsg.py @@ -15,6 +15,7 @@ class BinanceCancelMsg(p.MessageType): def __init__( self, + *, refid: str = None, sender: str = None, symbol: str = None, @@ -26,7 +27,7 @@ class BinanceCancelMsg(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('refid', p.UnicodeType, 0), - 2: ('sender', p.UnicodeType, 0), - 3: ('symbol', p.UnicodeType, 0), + 1: ('refid', p.UnicodeType, None), + 2: ('sender', p.UnicodeType, None), + 3: ('symbol', p.UnicodeType, None), } diff --git a/python/src/trezorlib/messages/BinanceCoin.py b/python/src/trezorlib/messages/BinanceCoin.py index d00c9e188..310f6823a 100644 --- a/python/src/trezorlib/messages/BinanceCoin.py +++ b/python/src/trezorlib/messages/BinanceCoin.py @@ -14,6 +14,7 @@ class BinanceCoin(p.MessageType): def __init__( self, + *, amount: int = None, denom: str = None, ) -> None: @@ -23,6 +24,6 @@ class BinanceCoin(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('amount', p.SVarintType, 0), - 2: ('denom', p.UnicodeType, 0), + 1: ('amount', p.SVarintType, None), + 2: ('denom', p.UnicodeType, None), } diff --git a/python/src/trezorlib/messages/BinanceGetAddress.py b/python/src/trezorlib/messages/BinanceGetAddress.py index a61008c8f..a72d68fd2 100644 --- a/python/src/trezorlib/messages/BinanceGetAddress.py +++ b/python/src/trezorlib/messages/BinanceGetAddress.py @@ -15,6 +15,7 @@ class BinanceGetAddress(p.MessageType): def __init__( self, + *, address_n: List[int] = None, show_display: bool = None, ) -> None: @@ -25,5 +26,5 @@ class BinanceGetAddress(p.MessageType): def get_fields(cls) -> Dict: return { 1: ('address_n', p.UVarintType, p.FLAG_REPEATED), - 2: ('show_display', p.BoolType, 0), + 2: ('show_display', p.BoolType, None), } diff --git a/python/src/trezorlib/messages/BinanceGetPublicKey.py b/python/src/trezorlib/messages/BinanceGetPublicKey.py index 1332d9dc6..8c651740c 100644 --- a/python/src/trezorlib/messages/BinanceGetPublicKey.py +++ b/python/src/trezorlib/messages/BinanceGetPublicKey.py @@ -15,6 +15,7 @@ class BinanceGetPublicKey(p.MessageType): def __init__( self, + *, address_n: List[int] = None, show_display: bool = None, ) -> None: @@ -25,5 +26,5 @@ class BinanceGetPublicKey(p.MessageType): def get_fields(cls) -> Dict: return { 1: ('address_n', p.UVarintType, p.FLAG_REPEATED), - 2: ('show_display', p.BoolType, 0), + 2: ('show_display', p.BoolType, None), } diff --git a/python/src/trezorlib/messages/BinanceInputOutput.py b/python/src/trezorlib/messages/BinanceInputOutput.py index 86fb7835b..136c40fc1 100644 --- a/python/src/trezorlib/messages/BinanceInputOutput.py +++ b/python/src/trezorlib/messages/BinanceInputOutput.py @@ -16,15 +16,16 @@ class BinanceInputOutput(p.MessageType): def __init__( self, - address: str = None, + *, coins: List[BinanceCoin] = None, + address: str = None, ) -> None: - self.address = address self.coins = coins if coins is not None else [] + self.address = address @classmethod def get_fields(cls) -> Dict: return { - 1: ('address', p.UnicodeType, 0), + 1: ('address', p.UnicodeType, None), 2: ('coins', BinanceCoin, p.FLAG_REPEATED), } diff --git a/python/src/trezorlib/messages/BinanceOrderMsg.py b/python/src/trezorlib/messages/BinanceOrderMsg.py index d84de857e..3624c498b 100644 --- a/python/src/trezorlib/messages/BinanceOrderMsg.py +++ b/python/src/trezorlib/messages/BinanceOrderMsg.py @@ -18,6 +18,7 @@ class BinanceOrderMsg(p.MessageType): def __init__( self, + *, id: str = None, ordertype: EnumTypeBinanceOrderType = None, price: int = None, @@ -39,12 +40,12 @@ class BinanceOrderMsg(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('id', p.UnicodeType, 0), - 2: ('ordertype', p.EnumType("BinanceOrderType", (0, 1, 2, 3)), 0), - 3: ('price', p.SVarintType, 0), - 4: ('quantity', p.SVarintType, 0), - 5: ('sender', p.UnicodeType, 0), - 6: ('side', p.EnumType("BinanceOrderSide", (0, 1, 2)), 0), - 7: ('symbol', p.UnicodeType, 0), - 8: ('timeinforce', p.EnumType("BinanceTimeInForce", (0, 1, 2, 3)), 0), + 1: ('id', p.UnicodeType, None), + 2: ('ordertype', p.EnumType("BinanceOrderType", (0, 1, 2, 3)), None), + 3: ('price', p.SVarintType, None), + 4: ('quantity', p.SVarintType, None), + 5: ('sender', p.UnicodeType, None), + 6: ('side', p.EnumType("BinanceOrderSide", (0, 1, 2)), None), + 7: ('symbol', p.UnicodeType, None), + 8: ('timeinforce', p.EnumType("BinanceTimeInForce", (0, 1, 2, 3)), None), } diff --git a/python/src/trezorlib/messages/BinancePublicKey.py b/python/src/trezorlib/messages/BinancePublicKey.py index 5f453031b..5009374c3 100644 --- a/python/src/trezorlib/messages/BinancePublicKey.py +++ b/python/src/trezorlib/messages/BinancePublicKey.py @@ -15,6 +15,7 @@ class BinancePublicKey(p.MessageType): def __init__( self, + *, public_key: bytes = None, ) -> None: self.public_key = public_key @@ -22,5 +23,5 @@ class BinancePublicKey(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('public_key', p.BytesType, 0), + 1: ('public_key', p.BytesType, None), } diff --git a/python/src/trezorlib/messages/BinanceSignTx.py b/python/src/trezorlib/messages/BinanceSignTx.py index 716cc7e12..fcc0f874b 100644 --- a/python/src/trezorlib/messages/BinanceSignTx.py +++ b/python/src/trezorlib/messages/BinanceSignTx.py @@ -15,6 +15,7 @@ class BinanceSignTx(p.MessageType): def __init__( self, + *, address_n: List[int] = None, msg_count: int = None, account_number: int = None, @@ -35,10 +36,10 @@ class BinanceSignTx(p.MessageType): def get_fields(cls) -> Dict: return { 1: ('address_n', p.UVarintType, p.FLAG_REPEATED), - 2: ('msg_count', p.UVarintType, 0), - 3: ('account_number', p.SVarintType, 0), - 4: ('chain_id', p.UnicodeType, 0), - 5: ('memo', p.UnicodeType, 0), - 6: ('sequence', p.SVarintType, 0), - 7: ('source', p.SVarintType, 0), + 2: ('msg_count', p.UVarintType, None), + 3: ('account_number', p.SVarintType, None), + 4: ('chain_id', p.UnicodeType, None), + 5: ('memo', p.UnicodeType, None), + 6: ('sequence', p.SVarintType, None), + 7: ('source', p.SVarintType, None), } diff --git a/python/src/trezorlib/messages/BinanceSignedTx.py b/python/src/trezorlib/messages/BinanceSignedTx.py index a26b550dd..846f7aca8 100644 --- a/python/src/trezorlib/messages/BinanceSignedTx.py +++ b/python/src/trezorlib/messages/BinanceSignedTx.py @@ -15,6 +15,7 @@ class BinanceSignedTx(p.MessageType): def __init__( self, + *, signature: bytes = None, public_key: bytes = None, ) -> None: @@ -24,6 +25,6 @@ class BinanceSignedTx(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('signature', p.BytesType, 0), - 2: ('public_key', p.BytesType, 0), + 1: ('signature', p.BytesType, None), + 2: ('public_key', p.BytesType, None), } diff --git a/python/src/trezorlib/messages/BinanceTransferMsg.py b/python/src/trezorlib/messages/BinanceTransferMsg.py index b3486bfdf..539f29616 100644 --- a/python/src/trezorlib/messages/BinanceTransferMsg.py +++ b/python/src/trezorlib/messages/BinanceTransferMsg.py @@ -17,6 +17,7 @@ class BinanceTransferMsg(p.MessageType): def __init__( self, + *, inputs: List[BinanceInputOutput] = None, outputs: List[BinanceInputOutput] = None, ) -> None: diff --git a/python/src/trezorlib/messages/ButtonRequest.py b/python/src/trezorlib/messages/ButtonRequest.py index 61ac7d3d6..bbbc48550 100644 --- a/python/src/trezorlib/messages/ButtonRequest.py +++ b/python/src/trezorlib/messages/ButtonRequest.py @@ -16,6 +16,7 @@ class ButtonRequest(p.MessageType): def __init__( self, + *, code: EnumTypeButtonRequestType = None, ) -> None: self.code = code @@ -23,5 +24,5 @@ class ButtonRequest(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('code', p.EnumType("ButtonRequestType", (1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20)), 0), + 1: ('code', p.EnumType("ButtonRequestType", (1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20)), None), } diff --git a/python/src/trezorlib/messages/CardanoAddress.py b/python/src/trezorlib/messages/CardanoAddress.py index ede61f190..56defb88c 100644 --- a/python/src/trezorlib/messages/CardanoAddress.py +++ b/python/src/trezorlib/messages/CardanoAddress.py @@ -15,6 +15,7 @@ class CardanoAddress(p.MessageType): def __init__( self, + *, address: str = None, ) -> None: self.address = address @@ -22,5 +23,5 @@ class CardanoAddress(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('address', p.UnicodeType, 0), + 1: ('address', p.UnicodeType, None), } diff --git a/python/src/trezorlib/messages/CardanoAddressParametersType.py b/python/src/trezorlib/messages/CardanoAddressParametersType.py index 56e22280c..62fbb22b4 100644 --- a/python/src/trezorlib/messages/CardanoAddressParametersType.py +++ b/python/src/trezorlib/messages/CardanoAddressParametersType.py @@ -17,24 +17,25 @@ class CardanoAddressParametersType(p.MessageType): def __init__( self, - address_type: EnumTypeCardanoAddressType = None, + *, 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: - self.address_type = address_type self.address_n = address_n if address_n is not None else [] self.address_n_staking = address_n_staking if address_n_staking is not None else [] + self.address_type = address_type self.staking_key_hash = staking_key_hash self.certificate_pointer = certificate_pointer @classmethod def get_fields(cls) -> Dict: return { - 1: ('address_type', p.EnumType("CardanoAddressType", (0, 1, 2, 3, 4, 5, 6, 7, 8, 14, 15)), 0), + 1: ('address_type', p.EnumType("CardanoAddressType", (0, 1, 2, 3, 4, 5, 6, 7, 8, 14, 15)), None), 2: ('address_n', p.UVarintType, p.FLAG_REPEATED), 3: ('address_n_staking', p.UVarintType, p.FLAG_REPEATED), - 4: ('staking_key_hash', p.BytesType, 0), - 5: ('certificate_pointer', CardanoBlockchainPointerType, 0), + 4: ('staking_key_hash', p.BytesType, None), + 5: ('certificate_pointer', CardanoBlockchainPointerType, None), } diff --git a/python/src/trezorlib/messages/CardanoBlockchainPointerType.py b/python/src/trezorlib/messages/CardanoBlockchainPointerType.py index bb0f7f472..721646f12 100644 --- a/python/src/trezorlib/messages/CardanoBlockchainPointerType.py +++ b/python/src/trezorlib/messages/CardanoBlockchainPointerType.py @@ -14,6 +14,7 @@ class CardanoBlockchainPointerType(p.MessageType): def __init__( self, + *, block_index: int = None, tx_index: int = None, certificate_index: int = None, @@ -25,7 +26,7 @@ class CardanoBlockchainPointerType(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('block_index', p.UVarintType, 0), - 2: ('tx_index', p.UVarintType, 0), - 3: ('certificate_index', p.UVarintType, 0), + 1: ('block_index', p.UVarintType, None), + 2: ('tx_index', p.UVarintType, None), + 3: ('certificate_index', p.UVarintType, None), } diff --git a/python/src/trezorlib/messages/CardanoGetAddress.py b/python/src/trezorlib/messages/CardanoGetAddress.py index 81932b1d6..0c0192ea8 100644 --- a/python/src/trezorlib/messages/CardanoGetAddress.py +++ b/python/src/trezorlib/messages/CardanoGetAddress.py @@ -17,6 +17,7 @@ class CardanoGetAddress(p.MessageType): def __init__( self, + *, show_display: bool = None, protocol_magic: int = None, network_id: int = None, @@ -30,8 +31,8 @@ class CardanoGetAddress(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 2: ('show_display', p.BoolType, 0), - 3: ('protocol_magic', p.UVarintType, 0), - 4: ('network_id', p.UVarintType, 0), - 5: ('address_parameters', CardanoAddressParametersType, 0), + 2: ('show_display', p.BoolType, None), + 3: ('protocol_magic', p.UVarintType, None), + 4: ('network_id', p.UVarintType, None), + 5: ('address_parameters', CardanoAddressParametersType, None), } diff --git a/python/src/trezorlib/messages/CardanoGetPublicKey.py b/python/src/trezorlib/messages/CardanoGetPublicKey.py index 3c9386ffa..957d27438 100644 --- a/python/src/trezorlib/messages/CardanoGetPublicKey.py +++ b/python/src/trezorlib/messages/CardanoGetPublicKey.py @@ -15,6 +15,7 @@ class CardanoGetPublicKey(p.MessageType): def __init__( self, + *, address_n: List[int] = None, show_display: bool = None, ) -> None: @@ -25,5 +26,5 @@ class CardanoGetPublicKey(p.MessageType): def get_fields(cls) -> Dict: return { 1: ('address_n', p.UVarintType, p.FLAG_REPEATED), - 2: ('show_display', p.BoolType, 0), + 2: ('show_display', p.BoolType, None), } diff --git a/python/src/trezorlib/messages/CardanoPublicKey.py b/python/src/trezorlib/messages/CardanoPublicKey.py index 401a2bba7..bc908adb4 100644 --- a/python/src/trezorlib/messages/CardanoPublicKey.py +++ b/python/src/trezorlib/messages/CardanoPublicKey.py @@ -17,6 +17,7 @@ class CardanoPublicKey(p.MessageType): def __init__( self, + *, xpub: str = None, node: HDNodeType = None, ) -> None: @@ -26,6 +27,6 @@ class CardanoPublicKey(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('xpub', p.UnicodeType, 0), - 2: ('node', HDNodeType, 0), + 1: ('xpub', p.UnicodeType, None), + 2: ('node', HDNodeType, None), } diff --git a/python/src/trezorlib/messages/CardanoSignTx.py b/python/src/trezorlib/messages/CardanoSignTx.py index 8e3a65f16..2cff681fe 100644 --- a/python/src/trezorlib/messages/CardanoSignTx.py +++ b/python/src/trezorlib/messages/CardanoSignTx.py @@ -20,24 +20,25 @@ class CardanoSignTx(p.MessageType): def __init__( self, + *, 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, - certificates: List[CardanoTxCertificateType] = None, - withdrawals: List[CardanoTxWithdrawalType] = None, metadata: bytes = None, ) -> None: self.inputs = inputs if inputs is not None else [] self.outputs = outputs if outputs is not None else [] + self.certificates = certificates if certificates is not None else [] + 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.certificates = certificates if certificates is not None else [] - self.withdrawals = withdrawals if withdrawals is not None else [] self.metadata = metadata @classmethod @@ -45,11 +46,11 @@ class CardanoSignTx(p.MessageType): return { 1: ('inputs', CardanoTxInputType, p.FLAG_REPEATED), 2: ('outputs', CardanoTxOutputType, p.FLAG_REPEATED), - 5: ('protocol_magic', p.UVarintType, 0), - 6: ('fee', p.UVarintType, 0), - 7: ('ttl', p.UVarintType, 0), - 8: ('network_id', p.UVarintType, 0), + 5: ('protocol_magic', p.UVarintType, None), + 6: ('fee', p.UVarintType, None), + 7: ('ttl', p.UVarintType, None), + 8: ('network_id', p.UVarintType, None), 9: ('certificates', CardanoTxCertificateType, p.FLAG_REPEATED), 10: ('withdrawals', CardanoTxWithdrawalType, p.FLAG_REPEATED), - 11: ('metadata', p.BytesType, 0), + 11: ('metadata', p.BytesType, None), } diff --git a/python/src/trezorlib/messages/CardanoSignedTx.py b/python/src/trezorlib/messages/CardanoSignedTx.py index fb0326df9..5dd8f77b3 100644 --- a/python/src/trezorlib/messages/CardanoSignedTx.py +++ b/python/src/trezorlib/messages/CardanoSignedTx.py @@ -15,6 +15,7 @@ class CardanoSignedTx(p.MessageType): def __init__( self, + *, tx_hash: bytes = None, serialized_tx: bytes = None, ) -> None: @@ -24,6 +25,6 @@ class CardanoSignedTx(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('tx_hash', p.BytesType, 0), - 2: ('serialized_tx', p.BytesType, 0), + 1: ('tx_hash', p.BytesType, None), + 2: ('serialized_tx', p.BytesType, None), } diff --git a/python/src/trezorlib/messages/CardanoTxCertificateType.py b/python/src/trezorlib/messages/CardanoTxCertificateType.py index 968f0bc36..532735621 100644 --- a/python/src/trezorlib/messages/CardanoTxCertificateType.py +++ b/python/src/trezorlib/messages/CardanoTxCertificateType.py @@ -15,18 +15,19 @@ class CardanoTxCertificateType(p.MessageType): def __init__( self, - type: EnumTypeCardanoCertificateType = None, + *, path: List[int] = None, + type: EnumTypeCardanoCertificateType = None, pool: bytes = None, ) -> None: - self.type = type self.path = path if path is not None else [] + self.type = type self.pool = pool @classmethod def get_fields(cls) -> Dict: return { - 1: ('type', p.EnumType("CardanoCertificateType", (0, 1, 2)), 0), + 1: ('type', p.EnumType("CardanoCertificateType", (0, 1, 2)), None), 2: ('path', p.UVarintType, p.FLAG_REPEATED), - 3: ('pool', p.BytesType, 0), + 3: ('pool', p.BytesType, None), } diff --git a/python/src/trezorlib/messages/CardanoTxInputType.py b/python/src/trezorlib/messages/CardanoTxInputType.py index 4531f395f..9eb4c3152 100644 --- a/python/src/trezorlib/messages/CardanoTxInputType.py +++ b/python/src/trezorlib/messages/CardanoTxInputType.py @@ -14,6 +14,7 @@ class CardanoTxInputType(p.MessageType): def __init__( self, + *, address_n: List[int] = None, prev_hash: bytes = None, prev_index: int = None, @@ -26,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, 0), - 3: ('prev_index', p.UVarintType, 0), + 2: ('prev_hash', p.BytesType, None), + 3: ('prev_index', p.UVarintType, None), } diff --git a/python/src/trezorlib/messages/CardanoTxOutputType.py b/python/src/trezorlib/messages/CardanoTxOutputType.py index 066d7596b..16da8074a 100644 --- a/python/src/trezorlib/messages/CardanoTxOutputType.py +++ b/python/src/trezorlib/messages/CardanoTxOutputType.py @@ -16,6 +16,7 @@ class CardanoTxOutputType(p.MessageType): def __init__( self, + *, address: str = None, amount: int = None, address_parameters: CardanoAddressParametersType = None, @@ -27,7 +28,7 @@ class CardanoTxOutputType(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('address', p.UnicodeType, 0), - 3: ('amount', p.UVarintType, 0), - 4: ('address_parameters', CardanoAddressParametersType, 0), + 1: ('address', p.UnicodeType, None), + 3: ('amount', p.UVarintType, None), + 4: ('address_parameters', CardanoAddressParametersType, None), } diff --git a/python/src/trezorlib/messages/CardanoTxWithdrawalType.py b/python/src/trezorlib/messages/CardanoTxWithdrawalType.py index 6b6fa97c3..053f60362 100644 --- a/python/src/trezorlib/messages/CardanoTxWithdrawalType.py +++ b/python/src/trezorlib/messages/CardanoTxWithdrawalType.py @@ -14,6 +14,7 @@ class CardanoTxWithdrawalType(p.MessageType): def __init__( self, + *, path: List[int] = None, amount: int = None, ) -> None: @@ -24,5 +25,5 @@ class CardanoTxWithdrawalType(p.MessageType): def get_fields(cls) -> Dict: return { 1: ('path', p.UVarintType, p.FLAG_REPEATED), - 2: ('amount', p.UVarintType, 0), + 2: ('amount', p.UVarintType, None), } diff --git a/python/src/trezorlib/messages/ChangePin.py b/python/src/trezorlib/messages/ChangePin.py index cc3b776a3..a2c4327d5 100644 --- a/python/src/trezorlib/messages/ChangePin.py +++ b/python/src/trezorlib/messages/ChangePin.py @@ -15,6 +15,7 @@ class ChangePin(p.MessageType): def __init__( self, + *, remove: bool = None, ) -> None: self.remove = remove @@ -22,5 +23,5 @@ class ChangePin(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('remove', p.BoolType, 0), + 1: ('remove', p.BoolType, None), } diff --git a/python/src/trezorlib/messages/ChangeWipeCode.py b/python/src/trezorlib/messages/ChangeWipeCode.py index 733217c83..5e345d882 100644 --- a/python/src/trezorlib/messages/ChangeWipeCode.py +++ b/python/src/trezorlib/messages/ChangeWipeCode.py @@ -15,6 +15,7 @@ class ChangeWipeCode(p.MessageType): def __init__( self, + *, remove: bool = None, ) -> None: self.remove = remove @@ -22,5 +23,5 @@ class ChangeWipeCode(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('remove', p.BoolType, 0), + 1: ('remove', p.BoolType, None), } diff --git a/python/src/trezorlib/messages/CipherKeyValue.py b/python/src/trezorlib/messages/CipherKeyValue.py index fc028e9a2..db06401f8 100644 --- a/python/src/trezorlib/messages/CipherKeyValue.py +++ b/python/src/trezorlib/messages/CipherKeyValue.py @@ -15,6 +15,7 @@ class CipherKeyValue(p.MessageType): def __init__( self, + *, address_n: List[int] = None, key: str = None, value: bytes = None, @@ -35,10 +36,10 @@ class CipherKeyValue(p.MessageType): def get_fields(cls) -> Dict: return { 1: ('address_n', p.UVarintType, p.FLAG_REPEATED), - 2: ('key', p.UnicodeType, 0), - 3: ('value', p.BytesType, 0), - 4: ('encrypt', p.BoolType, 0), - 5: ('ask_on_encrypt', p.BoolType, 0), - 6: ('ask_on_decrypt', p.BoolType, 0), - 7: ('iv', p.BytesType, 0), + 2: ('key', p.UnicodeType, None), + 3: ('value', p.BytesType, None), + 4: ('encrypt', p.BoolType, None), + 5: ('ask_on_encrypt', p.BoolType, None), + 6: ('ask_on_decrypt', p.BoolType, None), + 7: ('iv', p.BytesType, None), } diff --git a/python/src/trezorlib/messages/CipheredKeyValue.py b/python/src/trezorlib/messages/CipheredKeyValue.py index 43fd81107..3837d1ba2 100644 --- a/python/src/trezorlib/messages/CipheredKeyValue.py +++ b/python/src/trezorlib/messages/CipheredKeyValue.py @@ -15,6 +15,7 @@ class CipheredKeyValue(p.MessageType): def __init__( self, + *, value: bytes = None, ) -> None: self.value = value @@ -22,5 +23,5 @@ class CipheredKeyValue(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('value', p.BytesType, 0), + 1: ('value', p.BytesType, None), } diff --git a/python/src/trezorlib/messages/CosiCommit.py b/python/src/trezorlib/messages/CosiCommit.py index f75bb84db..b99808248 100644 --- a/python/src/trezorlib/messages/CosiCommit.py +++ b/python/src/trezorlib/messages/CosiCommit.py @@ -15,6 +15,7 @@ class CosiCommit(p.MessageType): def __init__( self, + *, address_n: List[int] = None, data: bytes = None, ) -> None: @@ -25,5 +26,5 @@ class CosiCommit(p.MessageType): def get_fields(cls) -> Dict: return { 1: ('address_n', p.UVarintType, p.FLAG_REPEATED), - 2: ('data', p.BytesType, 0), + 2: ('data', p.BytesType, None), } diff --git a/python/src/trezorlib/messages/CosiCommitment.py b/python/src/trezorlib/messages/CosiCommitment.py index 57bf00a80..fbc9b9cac 100644 --- a/python/src/trezorlib/messages/CosiCommitment.py +++ b/python/src/trezorlib/messages/CosiCommitment.py @@ -15,6 +15,7 @@ class CosiCommitment(p.MessageType): def __init__( self, + *, commitment: bytes = None, pubkey: bytes = None, ) -> None: @@ -24,6 +25,6 @@ class CosiCommitment(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('commitment', p.BytesType, 0), - 2: ('pubkey', p.BytesType, 0), + 1: ('commitment', p.BytesType, None), + 2: ('pubkey', p.BytesType, None), } diff --git a/python/src/trezorlib/messages/CosiSign.py b/python/src/trezorlib/messages/CosiSign.py index 56950193b..d9fcc00fc 100644 --- a/python/src/trezorlib/messages/CosiSign.py +++ b/python/src/trezorlib/messages/CosiSign.py @@ -15,6 +15,7 @@ class CosiSign(p.MessageType): def __init__( self, + *, address_n: List[int] = None, data: bytes = None, global_commitment: bytes = None, @@ -29,7 +30,7 @@ class CosiSign(p.MessageType): def get_fields(cls) -> Dict: return { 1: ('address_n', p.UVarintType, p.FLAG_REPEATED), - 2: ('data', p.BytesType, 0), - 3: ('global_commitment', p.BytesType, 0), - 4: ('global_pubkey', p.BytesType, 0), + 2: ('data', p.BytesType, None), + 3: ('global_commitment', p.BytesType, None), + 4: ('global_pubkey', p.BytesType, None), } diff --git a/python/src/trezorlib/messages/CosiSignature.py b/python/src/trezorlib/messages/CosiSignature.py index 1d7373064..ad8caa03a 100644 --- a/python/src/trezorlib/messages/CosiSignature.py +++ b/python/src/trezorlib/messages/CosiSignature.py @@ -15,6 +15,7 @@ class CosiSignature(p.MessageType): def __init__( self, + *, signature: bytes = None, ) -> None: self.signature = signature @@ -22,5 +23,5 @@ class CosiSignature(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('signature', p.BytesType, 0), + 1: ('signature', p.BytesType, None), } diff --git a/python/src/trezorlib/messages/DebugLinkDecision.py b/python/src/trezorlib/messages/DebugLinkDecision.py index 08030c611..42be1e295 100644 --- a/python/src/trezorlib/messages/DebugLinkDecision.py +++ b/python/src/trezorlib/messages/DebugLinkDecision.py @@ -16,6 +16,7 @@ class DebugLinkDecision(p.MessageType): def __init__( self, + *, yes_no: bool = None, swipe: EnumTypeDebugSwipeDirection = None, input: str = None, @@ -33,10 +34,10 @@ class DebugLinkDecision(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('yes_no', p.BoolType, 0), - 2: ('swipe', p.EnumType("DebugSwipeDirection", (0, 1, 2, 3)), 0), - 3: ('input', p.UnicodeType, 0), - 4: ('x', p.UVarintType, 0), - 5: ('y', p.UVarintType, 0), - 6: ('wait', p.BoolType, 0), + 1: ('yes_no', p.BoolType, None), + 2: ('swipe', p.EnumType("DebugSwipeDirection", (0, 1, 2, 3)), None), + 3: ('input', p.UnicodeType, None), + 4: ('x', p.UVarintType, None), + 5: ('y', p.UVarintType, None), + 6: ('wait', p.BoolType, None), } diff --git a/python/src/trezorlib/messages/DebugLinkEraseSdCard.py b/python/src/trezorlib/messages/DebugLinkEraseSdCard.py index e640527af..37aa32f1c 100644 --- a/python/src/trezorlib/messages/DebugLinkEraseSdCard.py +++ b/python/src/trezorlib/messages/DebugLinkEraseSdCard.py @@ -15,6 +15,7 @@ class DebugLinkEraseSdCard(p.MessageType): def __init__( self, + *, format: bool = None, ) -> None: self.format = format @@ -22,5 +23,5 @@ class DebugLinkEraseSdCard(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('format', p.BoolType, 0), + 1: ('format', p.BoolType, None), } diff --git a/python/src/trezorlib/messages/DebugLinkFlashErase.py b/python/src/trezorlib/messages/DebugLinkFlashErase.py index dea9ec10a..4521db54f 100644 --- a/python/src/trezorlib/messages/DebugLinkFlashErase.py +++ b/python/src/trezorlib/messages/DebugLinkFlashErase.py @@ -15,6 +15,7 @@ class DebugLinkFlashErase(p.MessageType): def __init__( self, + *, sector: int = None, ) -> None: self.sector = sector @@ -22,5 +23,5 @@ class DebugLinkFlashErase(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('sector', p.UVarintType, 0), + 1: ('sector', p.UVarintType, None), } diff --git a/python/src/trezorlib/messages/DebugLinkGetState.py b/python/src/trezorlib/messages/DebugLinkGetState.py index 188493d0e..4f5ef23c7 100644 --- a/python/src/trezorlib/messages/DebugLinkGetState.py +++ b/python/src/trezorlib/messages/DebugLinkGetState.py @@ -15,6 +15,7 @@ class DebugLinkGetState(p.MessageType): def __init__( self, + *, wait_word_list: bool = None, wait_word_pos: bool = None, wait_layout: bool = None, @@ -26,7 +27,7 @@ class DebugLinkGetState(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('wait_word_list', p.BoolType, 0), - 2: ('wait_word_pos', p.BoolType, 0), - 3: ('wait_layout', p.BoolType, 0), + 1: ('wait_word_list', p.BoolType, None), + 2: ('wait_word_pos', p.BoolType, None), + 3: ('wait_layout', p.BoolType, None), } diff --git a/python/src/trezorlib/messages/DebugLinkLayout.py b/python/src/trezorlib/messages/DebugLinkLayout.py index 7b8b41b78..c83cf6ffd 100644 --- a/python/src/trezorlib/messages/DebugLinkLayout.py +++ b/python/src/trezorlib/messages/DebugLinkLayout.py @@ -15,6 +15,7 @@ class DebugLinkLayout(p.MessageType): def __init__( self, + *, lines: List[str] = None, ) -> None: self.lines = lines if lines is not None else [] diff --git a/python/src/trezorlib/messages/DebugLinkLog.py b/python/src/trezorlib/messages/DebugLinkLog.py index bbf58ae9d..86c18ef34 100644 --- a/python/src/trezorlib/messages/DebugLinkLog.py +++ b/python/src/trezorlib/messages/DebugLinkLog.py @@ -15,6 +15,7 @@ class DebugLinkLog(p.MessageType): def __init__( self, + *, level: int = None, bucket: str = None, text: str = None, @@ -26,7 +27,7 @@ class DebugLinkLog(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('level', p.UVarintType, 0), - 2: ('bucket', p.UnicodeType, 0), - 3: ('text', p.UnicodeType, 0), + 1: ('level', p.UVarintType, None), + 2: ('bucket', p.UnicodeType, None), + 3: ('text', p.UnicodeType, None), } diff --git a/python/src/trezorlib/messages/DebugLinkMemory.py b/python/src/trezorlib/messages/DebugLinkMemory.py index 72412409f..8a8a4291a 100644 --- a/python/src/trezorlib/messages/DebugLinkMemory.py +++ b/python/src/trezorlib/messages/DebugLinkMemory.py @@ -15,6 +15,7 @@ class DebugLinkMemory(p.MessageType): def __init__( self, + *, memory: bytes = None, ) -> None: self.memory = memory @@ -22,5 +23,5 @@ class DebugLinkMemory(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('memory', p.BytesType, 0), + 1: ('memory', p.BytesType, None), } diff --git a/python/src/trezorlib/messages/DebugLinkMemoryRead.py b/python/src/trezorlib/messages/DebugLinkMemoryRead.py index 1181c0c19..e9e261c0a 100644 --- a/python/src/trezorlib/messages/DebugLinkMemoryRead.py +++ b/python/src/trezorlib/messages/DebugLinkMemoryRead.py @@ -15,6 +15,7 @@ class DebugLinkMemoryRead(p.MessageType): def __init__( self, + *, address: int = None, length: int = None, ) -> None: @@ -24,6 +25,6 @@ class DebugLinkMemoryRead(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('address', p.UVarintType, 0), - 2: ('length', p.UVarintType, 0), + 1: ('address', p.UVarintType, None), + 2: ('length', p.UVarintType, None), } diff --git a/python/src/trezorlib/messages/DebugLinkMemoryWrite.py b/python/src/trezorlib/messages/DebugLinkMemoryWrite.py index 12dca69e4..2563607d8 100644 --- a/python/src/trezorlib/messages/DebugLinkMemoryWrite.py +++ b/python/src/trezorlib/messages/DebugLinkMemoryWrite.py @@ -15,6 +15,7 @@ class DebugLinkMemoryWrite(p.MessageType): def __init__( self, + *, address: int = None, memory: bytes = None, flash: bool = None, @@ -26,7 +27,7 @@ class DebugLinkMemoryWrite(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('address', p.UVarintType, 0), - 2: ('memory', p.BytesType, 0), - 3: ('flash', p.BoolType, 0), + 1: ('address', p.UVarintType, None), + 2: ('memory', p.BytesType, None), + 3: ('flash', p.BoolType, None), } diff --git a/python/src/trezorlib/messages/DebugLinkRecordScreen.py b/python/src/trezorlib/messages/DebugLinkRecordScreen.py index 1ff12e53f..e18d08490 100644 --- a/python/src/trezorlib/messages/DebugLinkRecordScreen.py +++ b/python/src/trezorlib/messages/DebugLinkRecordScreen.py @@ -15,6 +15,7 @@ class DebugLinkRecordScreen(p.MessageType): def __init__( self, + *, target_directory: str = None, ) -> None: self.target_directory = target_directory @@ -22,5 +23,5 @@ class DebugLinkRecordScreen(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('target_directory', p.UnicodeType, 0), + 1: ('target_directory', p.UnicodeType, None), } diff --git a/python/src/trezorlib/messages/DebugLinkReseedRandom.py b/python/src/trezorlib/messages/DebugLinkReseedRandom.py index 5b13f2a37..65b7ce028 100644 --- a/python/src/trezorlib/messages/DebugLinkReseedRandom.py +++ b/python/src/trezorlib/messages/DebugLinkReseedRandom.py @@ -15,6 +15,7 @@ class DebugLinkReseedRandom(p.MessageType): def __init__( self, + *, value: int = None, ) -> None: self.value = value @@ -22,5 +23,5 @@ class DebugLinkReseedRandom(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('value', p.UVarintType, 0), + 1: ('value', p.UVarintType, None), } diff --git a/python/src/trezorlib/messages/DebugLinkShowText.py b/python/src/trezorlib/messages/DebugLinkShowText.py index aaa0f6581..e6d3b79f6 100644 --- a/python/src/trezorlib/messages/DebugLinkShowText.py +++ b/python/src/trezorlib/messages/DebugLinkShowText.py @@ -17,21 +17,22 @@ class DebugLinkShowText(p.MessageType): def __init__( self, - header_text: str = None, + *, body_text: List[DebugLinkShowTextItem] = None, + header_text: str = None, header_icon: str = None, icon_color: str = None, ) -> None: - self.header_text = header_text self.body_text = body_text if body_text is not None else [] + self.header_text = header_text self.header_icon = header_icon self.icon_color = icon_color @classmethod def get_fields(cls) -> Dict: return { - 1: ('header_text', p.UnicodeType, 0), + 1: ('header_text', p.UnicodeType, None), 2: ('body_text', DebugLinkShowTextItem, p.FLAG_REPEATED), - 3: ('header_icon', p.UnicodeType, 0), - 4: ('icon_color', p.UnicodeType, 0), + 3: ('header_icon', p.UnicodeType, None), + 4: ('icon_color', p.UnicodeType, None), } diff --git a/python/src/trezorlib/messages/DebugLinkShowTextItem.py b/python/src/trezorlib/messages/DebugLinkShowTextItem.py index 99598dbdb..a8af170df 100644 --- a/python/src/trezorlib/messages/DebugLinkShowTextItem.py +++ b/python/src/trezorlib/messages/DebugLinkShowTextItem.py @@ -15,6 +15,7 @@ class DebugLinkShowTextItem(p.MessageType): def __init__( self, + *, style: EnumTypeDebugLinkShowTextStyle = None, content: str = None, ) -> None: @@ -24,6 +25,6 @@ class DebugLinkShowTextItem(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('style', p.EnumType("DebugLinkShowTextStyle", (0, 1, 2, 4, 5, 6)), 0), - 2: ('content', p.UnicodeType, 0), + 1: ('style', p.EnumType("DebugLinkShowTextStyle", (0, 1, 2, 4, 5, 6)), None), + 2: ('content', p.UnicodeType, None), } diff --git a/python/src/trezorlib/messages/DebugLinkState.py b/python/src/trezorlib/messages/DebugLinkState.py index a0548c6a7..8a8fbf731 100644 --- a/python/src/trezorlib/messages/DebugLinkState.py +++ b/python/src/trezorlib/messages/DebugLinkState.py @@ -17,6 +17,8 @@ class DebugLinkState(p.MessageType): def __init__( self, + *, + layout_lines: List[str] = None, layout: bytes = None, pin: str = None, matrix: str = None, @@ -29,8 +31,8 @@ class DebugLinkState(p.MessageType): recovery_word_pos: int = None, reset_word_pos: int = None, mnemonic_type: int = None, - layout_lines: List[str] = None, ) -> None: + self.layout_lines = layout_lines if layout_lines is not None else [] self.layout = layout self.pin = pin self.matrix = matrix @@ -43,22 +45,21 @@ class DebugLinkState(p.MessageType): self.recovery_word_pos = recovery_word_pos self.reset_word_pos = reset_word_pos self.mnemonic_type = mnemonic_type - self.layout_lines = layout_lines if layout_lines is not None else [] @classmethod def get_fields(cls) -> Dict: return { - 1: ('layout', p.BytesType, 0), - 2: ('pin', p.UnicodeType, 0), - 3: ('matrix', p.UnicodeType, 0), - 4: ('mnemonic_secret', p.BytesType, 0), - 5: ('node', HDNodeType, 0), - 6: ('passphrase_protection', p.BoolType, 0), - 7: ('reset_word', p.UnicodeType, 0), - 8: ('reset_entropy', p.BytesType, 0), - 9: ('recovery_fake_word', p.UnicodeType, 0), - 10: ('recovery_word_pos', p.UVarintType, 0), - 11: ('reset_word_pos', p.UVarintType, 0), - 12: ('mnemonic_type', p.UVarintType, 0), + 1: ('layout', p.BytesType, None), + 2: ('pin', p.UnicodeType, None), + 3: ('matrix', p.UnicodeType, None), + 4: ('mnemonic_secret', p.BytesType, None), + 5: ('node', HDNodeType, None), + 6: ('passphrase_protection', p.BoolType, None), + 7: ('reset_word', p.UnicodeType, None), + 8: ('reset_entropy', p.BytesType, None), + 9: ('recovery_fake_word', p.UnicodeType, None), + 10: ('recovery_word_pos', p.UVarintType, None), + 11: ('reset_word_pos', p.UVarintType, None), + 12: ('mnemonic_type', p.UVarintType, None), 13: ('layout_lines', p.UnicodeType, p.FLAG_REPEATED), } diff --git a/python/src/trezorlib/messages/DebugLinkWatchLayout.py b/python/src/trezorlib/messages/DebugLinkWatchLayout.py index d303336f9..e6215ad0c 100644 --- a/python/src/trezorlib/messages/DebugLinkWatchLayout.py +++ b/python/src/trezorlib/messages/DebugLinkWatchLayout.py @@ -15,6 +15,7 @@ class DebugLinkWatchLayout(p.MessageType): def __init__( self, + *, watch: bool = None, ) -> None: self.watch = watch @@ -22,5 +23,5 @@ class DebugLinkWatchLayout(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('watch', p.BoolType, 0), + 1: ('watch', p.BoolType, None), } diff --git a/python/src/trezorlib/messages/DebugMoneroDiagAck.py b/python/src/trezorlib/messages/DebugMoneroDiagAck.py index 6f6a24abe..5ec6c40e3 100644 --- a/python/src/trezorlib/messages/DebugMoneroDiagAck.py +++ b/python/src/trezorlib/messages/DebugMoneroDiagAck.py @@ -15,27 +15,28 @@ class DebugMoneroDiagAck(p.MessageType): def __init__( self, + *, + pd: List[int] = None, ins: int = None, p1: int = None, p2: int = None, - pd: List[int] = None, data1: bytes = None, data2: bytes = None, ) -> None: + self.pd = pd if pd is not None else [] self.ins = ins self.p1 = p1 self.p2 = p2 - self.pd = pd if pd is not None else [] self.data1 = data1 self.data2 = data2 @classmethod def get_fields(cls) -> Dict: return { - 1: ('ins', p.UVarintType, 0), - 2: ('p1', p.UVarintType, 0), - 3: ('p2', p.UVarintType, 0), + 1: ('ins', p.UVarintType, None), + 2: ('p1', p.UVarintType, None), + 3: ('p2', p.UVarintType, None), 4: ('pd', p.UVarintType, p.FLAG_REPEATED), - 5: ('data1', p.BytesType, 0), - 6: ('data2', p.BytesType, 0), + 5: ('data1', p.BytesType, None), + 6: ('data2', p.BytesType, None), } diff --git a/python/src/trezorlib/messages/DebugMoneroDiagRequest.py b/python/src/trezorlib/messages/DebugMoneroDiagRequest.py index fa7d1e121..da5f33ba0 100644 --- a/python/src/trezorlib/messages/DebugMoneroDiagRequest.py +++ b/python/src/trezorlib/messages/DebugMoneroDiagRequest.py @@ -15,27 +15,28 @@ class DebugMoneroDiagRequest(p.MessageType): def __init__( self, + *, + pd: List[int] = None, ins: int = None, p1: int = None, p2: int = None, - pd: List[int] = None, data1: bytes = None, data2: bytes = None, ) -> None: + self.pd = pd if pd is not None else [] self.ins = ins self.p1 = p1 self.p2 = p2 - self.pd = pd if pd is not None else [] self.data1 = data1 self.data2 = data2 @classmethod def get_fields(cls) -> Dict: return { - 1: ('ins', p.UVarintType, 0), - 2: ('p1', p.UVarintType, 0), - 3: ('p2', p.UVarintType, 0), + 1: ('ins', p.UVarintType, None), + 2: ('p1', p.UVarintType, None), + 3: ('p2', p.UVarintType, None), 4: ('pd', p.UVarintType, p.FLAG_REPEATED), - 5: ('data1', p.BytesType, 0), - 6: ('data2', p.BytesType, 0), + 5: ('data1', p.BytesType, None), + 6: ('data2', p.BytesType, None), } diff --git a/python/src/trezorlib/messages/Deprecated_PassphraseStateRequest.py b/python/src/trezorlib/messages/Deprecated_PassphraseStateRequest.py index 4ca29bb51..579957ff0 100644 --- a/python/src/trezorlib/messages/Deprecated_PassphraseStateRequest.py +++ b/python/src/trezorlib/messages/Deprecated_PassphraseStateRequest.py @@ -15,6 +15,7 @@ class Deprecated_PassphraseStateRequest(p.MessageType): def __init__( self, + *, state: bytes = None, ) -> None: self.state = state @@ -22,5 +23,5 @@ class Deprecated_PassphraseStateRequest(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('state', p.BytesType, 0), + 1: ('state', p.BytesType, None), } diff --git a/python/src/trezorlib/messages/ECDHSessionKey.py b/python/src/trezorlib/messages/ECDHSessionKey.py index 6b6af3948..930932de0 100644 --- a/python/src/trezorlib/messages/ECDHSessionKey.py +++ b/python/src/trezorlib/messages/ECDHSessionKey.py @@ -15,6 +15,7 @@ class ECDHSessionKey(p.MessageType): def __init__( self, + *, session_key: bytes = None, ) -> None: self.session_key = session_key @@ -22,5 +23,5 @@ class ECDHSessionKey(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('session_key', p.BytesType, 0), + 1: ('session_key', p.BytesType, None), } diff --git a/python/src/trezorlib/messages/Entropy.py b/python/src/trezorlib/messages/Entropy.py index cb4f351f8..8c8c53cbf 100644 --- a/python/src/trezorlib/messages/Entropy.py +++ b/python/src/trezorlib/messages/Entropy.py @@ -15,12 +15,13 @@ class Entropy(p.MessageType): def __init__( self, - entropy: bytes = None, + *, + entropy: bytes, ) -> None: self.entropy = entropy @classmethod def get_fields(cls) -> Dict: return { - 1: ('entropy', p.BytesType, 0), # required + 1: ('entropy', p.BytesType, p.FLAG_REQUIRED), } diff --git a/python/src/trezorlib/messages/EntropyAck.py b/python/src/trezorlib/messages/EntropyAck.py index 760e70e41..0e5ac296c 100644 --- a/python/src/trezorlib/messages/EntropyAck.py +++ b/python/src/trezorlib/messages/EntropyAck.py @@ -15,6 +15,7 @@ class EntropyAck(p.MessageType): def __init__( self, + *, entropy: bytes = None, ) -> None: self.entropy = entropy @@ -22,5 +23,5 @@ class EntropyAck(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('entropy', p.BytesType, 0), + 1: ('entropy', p.BytesType, None), } diff --git a/python/src/trezorlib/messages/EosActionBuyRam.py b/python/src/trezorlib/messages/EosActionBuyRam.py index 112f43478..05ed4dcfe 100644 --- a/python/src/trezorlib/messages/EosActionBuyRam.py +++ b/python/src/trezorlib/messages/EosActionBuyRam.py @@ -16,6 +16,7 @@ class EosActionBuyRam(p.MessageType): def __init__( self, + *, payer: int = None, receiver: int = None, quantity: EosAsset = None, @@ -27,7 +28,7 @@ class EosActionBuyRam(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('payer', p.UVarintType, 0), - 2: ('receiver', p.UVarintType, 0), - 3: ('quantity', EosAsset, 0), + 1: ('payer', p.UVarintType, None), + 2: ('receiver', p.UVarintType, None), + 3: ('quantity', EosAsset, None), } diff --git a/python/src/trezorlib/messages/EosActionBuyRamBytes.py b/python/src/trezorlib/messages/EosActionBuyRamBytes.py index 55f06967c..1d5addcc0 100644 --- a/python/src/trezorlib/messages/EosActionBuyRamBytes.py +++ b/python/src/trezorlib/messages/EosActionBuyRamBytes.py @@ -14,6 +14,7 @@ class EosActionBuyRamBytes(p.MessageType): def __init__( self, + *, payer: int = None, receiver: int = None, bytes: int = None, @@ -25,7 +26,7 @@ class EosActionBuyRamBytes(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('payer', p.UVarintType, 0), - 2: ('receiver', p.UVarintType, 0), - 3: ('bytes', p.UVarintType, 0), + 1: ('payer', p.UVarintType, None), + 2: ('receiver', p.UVarintType, None), + 3: ('bytes', p.UVarintType, None), } diff --git a/python/src/trezorlib/messages/EosActionCommon.py b/python/src/trezorlib/messages/EosActionCommon.py index 1da11051e..90d664bfe 100644 --- a/python/src/trezorlib/messages/EosActionCommon.py +++ b/python/src/trezorlib/messages/EosActionCommon.py @@ -16,18 +16,19 @@ class EosActionCommon(p.MessageType): def __init__( self, + *, + authorization: List[EosPermissionLevel] = None, account: int = None, name: int = None, - authorization: List[EosPermissionLevel] = None, ) -> None: + self.authorization = authorization if authorization is not None else [] self.account = account self.name = name - self.authorization = authorization if authorization is not None else [] @classmethod def get_fields(cls) -> Dict: return { - 1: ('account', p.UVarintType, 0), - 2: ('name', p.UVarintType, 0), + 1: ('account', p.UVarintType, None), + 2: ('name', p.UVarintType, None), 3: ('authorization', EosPermissionLevel, p.FLAG_REPEATED), } diff --git a/python/src/trezorlib/messages/EosActionDelegate.py b/python/src/trezorlib/messages/EosActionDelegate.py index 70eb4b4ca..fc9b1e888 100644 --- a/python/src/trezorlib/messages/EosActionDelegate.py +++ b/python/src/trezorlib/messages/EosActionDelegate.py @@ -16,6 +16,7 @@ class EosActionDelegate(p.MessageType): def __init__( self, + *, sender: int = None, receiver: int = None, net_quantity: EosAsset = None, @@ -31,9 +32,9 @@ class EosActionDelegate(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('sender', p.UVarintType, 0), - 2: ('receiver', p.UVarintType, 0), - 3: ('net_quantity', EosAsset, 0), - 4: ('cpu_quantity', EosAsset, 0), - 5: ('transfer', p.BoolType, 0), + 1: ('sender', p.UVarintType, None), + 2: ('receiver', p.UVarintType, None), + 3: ('net_quantity', EosAsset, None), + 4: ('cpu_quantity', EosAsset, None), + 5: ('transfer', p.BoolType, None), } diff --git a/python/src/trezorlib/messages/EosActionDeleteAuth.py b/python/src/trezorlib/messages/EosActionDeleteAuth.py index 6d9c7f1cc..7b5089742 100644 --- a/python/src/trezorlib/messages/EosActionDeleteAuth.py +++ b/python/src/trezorlib/messages/EosActionDeleteAuth.py @@ -14,6 +14,7 @@ class EosActionDeleteAuth(p.MessageType): def __init__( self, + *, account: int = None, permission: int = None, ) -> None: @@ -23,6 +24,6 @@ class EosActionDeleteAuth(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('account', p.UVarintType, 0), - 2: ('permission', p.UVarintType, 0), + 1: ('account', p.UVarintType, None), + 2: ('permission', p.UVarintType, None), } diff --git a/python/src/trezorlib/messages/EosActionLinkAuth.py b/python/src/trezorlib/messages/EosActionLinkAuth.py index 65cf61601..82a0ca53c 100644 --- a/python/src/trezorlib/messages/EosActionLinkAuth.py +++ b/python/src/trezorlib/messages/EosActionLinkAuth.py @@ -14,6 +14,7 @@ class EosActionLinkAuth(p.MessageType): def __init__( self, + *, account: int = None, code: int = None, type: int = None, @@ -27,8 +28,8 @@ class EosActionLinkAuth(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('account', p.UVarintType, 0), - 2: ('code', p.UVarintType, 0), - 3: ('type', p.UVarintType, 0), - 4: ('requirement', p.UVarintType, 0), + 1: ('account', p.UVarintType, None), + 2: ('code', p.UVarintType, None), + 3: ('type', p.UVarintType, None), + 4: ('requirement', p.UVarintType, None), } diff --git a/python/src/trezorlib/messages/EosActionNewAccount.py b/python/src/trezorlib/messages/EosActionNewAccount.py index 5300727c2..89e432b72 100644 --- a/python/src/trezorlib/messages/EosActionNewAccount.py +++ b/python/src/trezorlib/messages/EosActionNewAccount.py @@ -16,6 +16,7 @@ class EosActionNewAccount(p.MessageType): def __init__( self, + *, creator: int = None, name: int = None, owner: EosAuthorization = None, @@ -29,8 +30,8 @@ class EosActionNewAccount(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('creator', p.UVarintType, 0), - 2: ('name', p.UVarintType, 0), - 3: ('owner', EosAuthorization, 0), - 4: ('active', EosAuthorization, 0), + 1: ('creator', p.UVarintType, None), + 2: ('name', p.UVarintType, None), + 3: ('owner', EosAuthorization, None), + 4: ('active', EosAuthorization, None), } diff --git a/python/src/trezorlib/messages/EosActionRefund.py b/python/src/trezorlib/messages/EosActionRefund.py index 3ff89f112..95626072c 100644 --- a/python/src/trezorlib/messages/EosActionRefund.py +++ b/python/src/trezorlib/messages/EosActionRefund.py @@ -14,6 +14,7 @@ class EosActionRefund(p.MessageType): def __init__( self, + *, owner: int = None, ) -> None: self.owner = owner @@ -21,5 +22,5 @@ class EosActionRefund(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('owner', p.UVarintType, 0), + 1: ('owner', p.UVarintType, None), } diff --git a/python/src/trezorlib/messages/EosActionSellRam.py b/python/src/trezorlib/messages/EosActionSellRam.py index 4809538df..8f283fb48 100644 --- a/python/src/trezorlib/messages/EosActionSellRam.py +++ b/python/src/trezorlib/messages/EosActionSellRam.py @@ -14,6 +14,7 @@ class EosActionSellRam(p.MessageType): def __init__( self, + *, account: int = None, bytes: int = None, ) -> None: @@ -23,6 +24,6 @@ class EosActionSellRam(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('account', p.UVarintType, 0), - 2: ('bytes', p.UVarintType, 0), + 1: ('account', p.UVarintType, None), + 2: ('bytes', p.UVarintType, None), } diff --git a/python/src/trezorlib/messages/EosActionTransfer.py b/python/src/trezorlib/messages/EosActionTransfer.py index f9c4977ca..e5e484a1d 100644 --- a/python/src/trezorlib/messages/EosActionTransfer.py +++ b/python/src/trezorlib/messages/EosActionTransfer.py @@ -16,6 +16,7 @@ class EosActionTransfer(p.MessageType): def __init__( self, + *, sender: int = None, receiver: int = None, quantity: EosAsset = None, @@ -29,8 +30,8 @@ class EosActionTransfer(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('sender', p.UVarintType, 0), - 2: ('receiver', p.UVarintType, 0), - 3: ('quantity', EosAsset, 0), - 4: ('memo', p.UnicodeType, 0), + 1: ('sender', p.UVarintType, None), + 2: ('receiver', p.UVarintType, None), + 3: ('quantity', EosAsset, None), + 4: ('memo', p.UnicodeType, None), } diff --git a/python/src/trezorlib/messages/EosActionUndelegate.py b/python/src/trezorlib/messages/EosActionUndelegate.py index 946944f70..0982d83d5 100644 --- a/python/src/trezorlib/messages/EosActionUndelegate.py +++ b/python/src/trezorlib/messages/EosActionUndelegate.py @@ -16,6 +16,7 @@ class EosActionUndelegate(p.MessageType): def __init__( self, + *, sender: int = None, receiver: int = None, net_quantity: EosAsset = None, @@ -29,8 +30,8 @@ class EosActionUndelegate(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('sender', p.UVarintType, 0), - 2: ('receiver', p.UVarintType, 0), - 3: ('net_quantity', EosAsset, 0), - 4: ('cpu_quantity', EosAsset, 0), + 1: ('sender', p.UVarintType, None), + 2: ('receiver', p.UVarintType, None), + 3: ('net_quantity', EosAsset, None), + 4: ('cpu_quantity', EosAsset, None), } diff --git a/python/src/trezorlib/messages/EosActionUnknown.py b/python/src/trezorlib/messages/EosActionUnknown.py index 6b1227d62..ae10cc9c1 100644 --- a/python/src/trezorlib/messages/EosActionUnknown.py +++ b/python/src/trezorlib/messages/EosActionUnknown.py @@ -14,6 +14,7 @@ class EosActionUnknown(p.MessageType): def __init__( self, + *, data_size: int = None, data_chunk: bytes = None, ) -> None: @@ -23,6 +24,6 @@ class EosActionUnknown(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('data_size', p.UVarintType, 0), - 2: ('data_chunk', p.BytesType, 0), + 1: ('data_size', p.UVarintType, None), + 2: ('data_chunk', p.BytesType, None), } diff --git a/python/src/trezorlib/messages/EosActionUnlinkAuth.py b/python/src/trezorlib/messages/EosActionUnlinkAuth.py index c48bda7b9..491b5d7e2 100644 --- a/python/src/trezorlib/messages/EosActionUnlinkAuth.py +++ b/python/src/trezorlib/messages/EosActionUnlinkAuth.py @@ -14,6 +14,7 @@ class EosActionUnlinkAuth(p.MessageType): def __init__( self, + *, account: int = None, code: int = None, type: int = None, @@ -25,7 +26,7 @@ class EosActionUnlinkAuth(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('account', p.UVarintType, 0), - 2: ('code', p.UVarintType, 0), - 3: ('type', p.UVarintType, 0), + 1: ('account', p.UVarintType, None), + 2: ('code', p.UVarintType, None), + 3: ('type', p.UVarintType, None), } diff --git a/python/src/trezorlib/messages/EosActionUpdateAuth.py b/python/src/trezorlib/messages/EosActionUpdateAuth.py index b0f023776..f34606851 100644 --- a/python/src/trezorlib/messages/EosActionUpdateAuth.py +++ b/python/src/trezorlib/messages/EosActionUpdateAuth.py @@ -16,6 +16,7 @@ class EosActionUpdateAuth(p.MessageType): def __init__( self, + *, account: int = None, permission: int = None, parent: int = None, @@ -29,8 +30,8 @@ class EosActionUpdateAuth(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('account', p.UVarintType, 0), - 2: ('permission', p.UVarintType, 0), - 3: ('parent', p.UVarintType, 0), - 4: ('auth', EosAuthorization, 0), + 1: ('account', p.UVarintType, None), + 2: ('permission', p.UVarintType, None), + 3: ('parent', p.UVarintType, None), + 4: ('auth', EosAuthorization, None), } diff --git a/python/src/trezorlib/messages/EosActionVoteProducer.py b/python/src/trezorlib/messages/EosActionVoteProducer.py index c630e54d1..81666e836 100644 --- a/python/src/trezorlib/messages/EosActionVoteProducer.py +++ b/python/src/trezorlib/messages/EosActionVoteProducer.py @@ -14,18 +14,19 @@ class EosActionVoteProducer(p.MessageType): def __init__( self, + *, + producers: List[int] = None, voter: int = None, proxy: int = None, - producers: List[int] = None, ) -> None: + self.producers = producers if producers is not None else [] self.voter = voter self.proxy = proxy - self.producers = producers if producers is not None else [] @classmethod def get_fields(cls) -> Dict: return { - 1: ('voter', p.UVarintType, 0), - 2: ('proxy', p.UVarintType, 0), + 1: ('voter', p.UVarintType, None), + 2: ('proxy', p.UVarintType, None), 3: ('producers', p.UVarintType, p.FLAG_REPEATED), } diff --git a/python/src/trezorlib/messages/EosAsset.py b/python/src/trezorlib/messages/EosAsset.py index d0ef5f817..159605b8a 100644 --- a/python/src/trezorlib/messages/EosAsset.py +++ b/python/src/trezorlib/messages/EosAsset.py @@ -14,6 +14,7 @@ class EosAsset(p.MessageType): def __init__( self, + *, amount: int = None, symbol: int = None, ) -> None: @@ -23,6 +24,6 @@ class EosAsset(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('amount', p.SVarintType, 0), - 2: ('symbol', p.UVarintType, 0), + 1: ('amount', p.SVarintType, None), + 2: ('symbol', p.UVarintType, None), } diff --git a/python/src/trezorlib/messages/EosAuthorization.py b/python/src/trezorlib/messages/EosAuthorization.py index c448a2cb6..24b0e0a2a 100644 --- a/python/src/trezorlib/messages/EosAuthorization.py +++ b/python/src/trezorlib/messages/EosAuthorization.py @@ -18,20 +18,21 @@ class EosAuthorization(p.MessageType): def __init__( self, - threshold: int = None, + *, keys: List[EosAuthorizationKey] = None, accounts: List[EosAuthorizationAccount] = None, waits: List[EosAuthorizationWait] = None, + threshold: int = None, ) -> None: - self.threshold = threshold self.keys = keys if keys is not None else [] self.accounts = accounts if accounts is not None else [] self.waits = waits if waits is not None else [] + self.threshold = threshold @classmethod def get_fields(cls) -> Dict: return { - 1: ('threshold', p.UVarintType, 0), + 1: ('threshold', p.UVarintType, None), 2: ('keys', EosAuthorizationKey, p.FLAG_REPEATED), 3: ('accounts', EosAuthorizationAccount, p.FLAG_REPEATED), 4: ('waits', EosAuthorizationWait, p.FLAG_REPEATED), diff --git a/python/src/trezorlib/messages/EosAuthorizationAccount.py b/python/src/trezorlib/messages/EosAuthorizationAccount.py index 0d3a986e4..f00d94005 100644 --- a/python/src/trezorlib/messages/EosAuthorizationAccount.py +++ b/python/src/trezorlib/messages/EosAuthorizationAccount.py @@ -16,6 +16,7 @@ class EosAuthorizationAccount(p.MessageType): def __init__( self, + *, account: EosPermissionLevel = None, weight: int = None, ) -> None: @@ -25,6 +26,6 @@ class EosAuthorizationAccount(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('account', EosPermissionLevel, 0), - 2: ('weight', p.UVarintType, 0), + 1: ('account', EosPermissionLevel, None), + 2: ('weight', p.UVarintType, None), } diff --git a/python/src/trezorlib/messages/EosAuthorizationKey.py b/python/src/trezorlib/messages/EosAuthorizationKey.py index 8894d6e5e..2defc7716 100644 --- a/python/src/trezorlib/messages/EosAuthorizationKey.py +++ b/python/src/trezorlib/messages/EosAuthorizationKey.py @@ -14,21 +14,22 @@ class EosAuthorizationKey(p.MessageType): def __init__( self, + *, + address_n: List[int] = None, type: int = None, key: bytes = None, - address_n: List[int] = None, weight: int = None, ) -> None: + self.address_n = address_n if address_n is not None else [] self.type = type self.key = key - self.address_n = address_n if address_n is not None else [] self.weight = weight @classmethod def get_fields(cls) -> Dict: return { - 1: ('type', p.UVarintType, 0), - 2: ('key', p.BytesType, 0), + 1: ('type', p.UVarintType, None), + 2: ('key', p.BytesType, None), 3: ('address_n', p.UVarintType, p.FLAG_REPEATED), - 4: ('weight', p.UVarintType, 0), + 4: ('weight', p.UVarintType, None), } diff --git a/python/src/trezorlib/messages/EosAuthorizationWait.py b/python/src/trezorlib/messages/EosAuthorizationWait.py index 000dbe148..ee9eae86e 100644 --- a/python/src/trezorlib/messages/EosAuthorizationWait.py +++ b/python/src/trezorlib/messages/EosAuthorizationWait.py @@ -14,6 +14,7 @@ class EosAuthorizationWait(p.MessageType): def __init__( self, + *, wait_sec: int = None, weight: int = None, ) -> None: @@ -23,6 +24,6 @@ class EosAuthorizationWait(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('wait_sec', p.UVarintType, 0), - 2: ('weight', p.UVarintType, 0), + 1: ('wait_sec', p.UVarintType, None), + 2: ('weight', p.UVarintType, None), } diff --git a/python/src/trezorlib/messages/EosGetPublicKey.py b/python/src/trezorlib/messages/EosGetPublicKey.py index 19a6f66e4..d566ad352 100644 --- a/python/src/trezorlib/messages/EosGetPublicKey.py +++ b/python/src/trezorlib/messages/EosGetPublicKey.py @@ -15,6 +15,7 @@ class EosGetPublicKey(p.MessageType): def __init__( self, + *, address_n: List[int] = None, show_display: bool = None, ) -> None: @@ -25,5 +26,5 @@ class EosGetPublicKey(p.MessageType): def get_fields(cls) -> Dict: return { 1: ('address_n', p.UVarintType, p.FLAG_REPEATED), - 2: ('show_display', p.BoolType, 0), + 2: ('show_display', p.BoolType, None), } diff --git a/python/src/trezorlib/messages/EosPermissionLevel.py b/python/src/trezorlib/messages/EosPermissionLevel.py index f2bcd23ad..0f357a1ab 100644 --- a/python/src/trezorlib/messages/EosPermissionLevel.py +++ b/python/src/trezorlib/messages/EosPermissionLevel.py @@ -14,6 +14,7 @@ class EosPermissionLevel(p.MessageType): def __init__( self, + *, actor: int = None, permission: int = None, ) -> None: @@ -23,6 +24,6 @@ class EosPermissionLevel(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('actor', p.UVarintType, 0), - 2: ('permission', p.UVarintType, 0), + 1: ('actor', p.UVarintType, None), + 2: ('permission', p.UVarintType, None), } diff --git a/python/src/trezorlib/messages/EosPublicKey.py b/python/src/trezorlib/messages/EosPublicKey.py index 6ad41cd97..fc34368c0 100644 --- a/python/src/trezorlib/messages/EosPublicKey.py +++ b/python/src/trezorlib/messages/EosPublicKey.py @@ -15,6 +15,7 @@ class EosPublicKey(p.MessageType): def __init__( self, + *, wif_public_key: str = None, raw_public_key: bytes = None, ) -> None: @@ -24,6 +25,6 @@ class EosPublicKey(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('wif_public_key', p.UnicodeType, 0), - 2: ('raw_public_key', p.BytesType, 0), + 1: ('wif_public_key', p.UnicodeType, None), + 2: ('raw_public_key', p.BytesType, None), } diff --git a/python/src/trezorlib/messages/EosSignTx.py b/python/src/trezorlib/messages/EosSignTx.py index 02b17701e..80702d092 100644 --- a/python/src/trezorlib/messages/EosSignTx.py +++ b/python/src/trezorlib/messages/EosSignTx.py @@ -17,6 +17,7 @@ class EosSignTx(p.MessageType): def __init__( self, + *, address_n: List[int] = None, chain_id: bytes = None, header: EosTxHeader = None, @@ -31,7 +32,7 @@ class EosSignTx(p.MessageType): def get_fields(cls) -> Dict: return { 1: ('address_n', p.UVarintType, p.FLAG_REPEATED), - 2: ('chain_id', p.BytesType, 0), - 3: ('header', EosTxHeader, 0), - 4: ('num_actions', p.UVarintType, 0), + 2: ('chain_id', p.BytesType, None), + 3: ('header', EosTxHeader, None), + 4: ('num_actions', p.UVarintType, None), } diff --git a/python/src/trezorlib/messages/EosSignedTx.py b/python/src/trezorlib/messages/EosSignedTx.py index 626f87158..1bd8bc848 100644 --- a/python/src/trezorlib/messages/EosSignedTx.py +++ b/python/src/trezorlib/messages/EosSignedTx.py @@ -15,6 +15,7 @@ class EosSignedTx(p.MessageType): def __init__( self, + *, signature: str = None, ) -> None: self.signature = signature @@ -22,5 +23,5 @@ class EosSignedTx(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('signature', p.UnicodeType, 0), + 1: ('signature', p.UnicodeType, None), } diff --git a/python/src/trezorlib/messages/EosTxActionAck.py b/python/src/trezorlib/messages/EosTxActionAck.py index b9625ffc0..9f81ba357 100644 --- a/python/src/trezorlib/messages/EosTxActionAck.py +++ b/python/src/trezorlib/messages/EosTxActionAck.py @@ -31,6 +31,7 @@ class EosTxActionAck(p.MessageType): def __init__( self, + *, common: EosActionCommon = None, transfer: EosActionTransfer = None, delegate: EosActionDelegate = None, @@ -66,19 +67,19 @@ class EosTxActionAck(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('common', EosActionCommon, 0), - 2: ('transfer', EosActionTransfer, 0), - 3: ('delegate', EosActionDelegate, 0), - 4: ('undelegate', EosActionUndelegate, 0), - 5: ('refund', EosActionRefund, 0), - 6: ('buy_ram', EosActionBuyRam, 0), - 7: ('buy_ram_bytes', EosActionBuyRamBytes, 0), - 8: ('sell_ram', EosActionSellRam, 0), - 9: ('vote_producer', EosActionVoteProducer, 0), - 10: ('update_auth', EosActionUpdateAuth, 0), - 11: ('delete_auth', EosActionDeleteAuth, 0), - 12: ('link_auth', EosActionLinkAuth, 0), - 13: ('unlink_auth', EosActionUnlinkAuth, 0), - 14: ('new_account', EosActionNewAccount, 0), - 15: ('unknown', EosActionUnknown, 0), + 1: ('common', EosActionCommon, None), + 2: ('transfer', EosActionTransfer, None), + 3: ('delegate', EosActionDelegate, None), + 4: ('undelegate', EosActionUndelegate, None), + 5: ('refund', EosActionRefund, None), + 6: ('buy_ram', EosActionBuyRam, None), + 7: ('buy_ram_bytes', EosActionBuyRamBytes, None), + 8: ('sell_ram', EosActionSellRam, None), + 9: ('vote_producer', EosActionVoteProducer, None), + 10: ('update_auth', EosActionUpdateAuth, None), + 11: ('delete_auth', EosActionDeleteAuth, None), + 12: ('link_auth', EosActionLinkAuth, None), + 13: ('unlink_auth', EosActionUnlinkAuth, None), + 14: ('new_account', EosActionNewAccount, None), + 15: ('unknown', EosActionUnknown, None), } diff --git a/python/src/trezorlib/messages/EosTxActionRequest.py b/python/src/trezorlib/messages/EosTxActionRequest.py index 636b91ddc..26fb36903 100644 --- a/python/src/trezorlib/messages/EosTxActionRequest.py +++ b/python/src/trezorlib/messages/EosTxActionRequest.py @@ -15,6 +15,7 @@ class EosTxActionRequest(p.MessageType): def __init__( self, + *, data_size: int = None, ) -> None: self.data_size = data_size @@ -22,5 +23,5 @@ class EosTxActionRequest(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('data_size', p.UVarintType, 0), + 1: ('data_size', p.UVarintType, None), } diff --git a/python/src/trezorlib/messages/EosTxHeader.py b/python/src/trezorlib/messages/EosTxHeader.py index 3db777bc1..fc2f6a28b 100644 --- a/python/src/trezorlib/messages/EosTxHeader.py +++ b/python/src/trezorlib/messages/EosTxHeader.py @@ -14,12 +14,13 @@ class EosTxHeader(p.MessageType): def __init__( self, - expiration: int = None, - ref_block_num: int = None, - ref_block_prefix: int = None, - max_net_usage_words: int = None, - max_cpu_usage_ms: int = None, - delay_sec: int = None, + *, + expiration: int, + ref_block_num: int, + ref_block_prefix: int, + max_net_usage_words: int, + max_cpu_usage_ms: int, + delay_sec: int, ) -> None: self.expiration = expiration self.ref_block_num = ref_block_num @@ -31,10 +32,10 @@ class EosTxHeader(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('expiration', p.UVarintType, 0), # required - 2: ('ref_block_num', p.UVarintType, 0), # required - 3: ('ref_block_prefix', p.UVarintType, 0), # required - 4: ('max_net_usage_words', p.UVarintType, 0), # required - 5: ('max_cpu_usage_ms', p.UVarintType, 0), # required - 6: ('delay_sec', p.UVarintType, 0), # required + 1: ('expiration', p.UVarintType, p.FLAG_REQUIRED), + 2: ('ref_block_num', p.UVarintType, p.FLAG_REQUIRED), + 3: ('ref_block_prefix', p.UVarintType, p.FLAG_REQUIRED), + 4: ('max_net_usage_words', p.UVarintType, p.FLAG_REQUIRED), + 5: ('max_cpu_usage_ms', p.UVarintType, p.FLAG_REQUIRED), + 6: ('delay_sec', p.UVarintType, p.FLAG_REQUIRED), } diff --git a/python/src/trezorlib/messages/EthereumAddress.py b/python/src/trezorlib/messages/EthereumAddress.py index 68522abbc..b09d2c396 100644 --- a/python/src/trezorlib/messages/EthereumAddress.py +++ b/python/src/trezorlib/messages/EthereumAddress.py @@ -15,6 +15,7 @@ class EthereumAddress(p.MessageType): def __init__( self, + *, _old_address: bytes = None, address: str = None, ) -> None: @@ -24,6 +25,6 @@ class EthereumAddress(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('_old_address', p.BytesType, 0), - 2: ('address', p.UnicodeType, 0), + 1: ('_old_address', p.BytesType, None), + 2: ('address', p.UnicodeType, None), } diff --git a/python/src/trezorlib/messages/EthereumGetAddress.py b/python/src/trezorlib/messages/EthereumGetAddress.py index 9e8a08448..c6631fb68 100644 --- a/python/src/trezorlib/messages/EthereumGetAddress.py +++ b/python/src/trezorlib/messages/EthereumGetAddress.py @@ -15,6 +15,7 @@ class EthereumGetAddress(p.MessageType): def __init__( self, + *, address_n: List[int] = None, show_display: bool = None, ) -> None: @@ -25,5 +26,5 @@ class EthereumGetAddress(p.MessageType): def get_fields(cls) -> Dict: return { 1: ('address_n', p.UVarintType, p.FLAG_REPEATED), - 2: ('show_display', p.BoolType, 0), + 2: ('show_display', p.BoolType, None), } diff --git a/python/src/trezorlib/messages/EthereumGetPublicKey.py b/python/src/trezorlib/messages/EthereumGetPublicKey.py index 950987d4b..34bba4382 100644 --- a/python/src/trezorlib/messages/EthereumGetPublicKey.py +++ b/python/src/trezorlib/messages/EthereumGetPublicKey.py @@ -15,6 +15,7 @@ class EthereumGetPublicKey(p.MessageType): def __init__( self, + *, address_n: List[int] = None, show_display: bool = None, ) -> None: @@ -25,5 +26,5 @@ class EthereumGetPublicKey(p.MessageType): def get_fields(cls) -> Dict: return { 1: ('address_n', p.UVarintType, p.FLAG_REPEATED), - 2: ('show_display', p.BoolType, 0), + 2: ('show_display', p.BoolType, None), } diff --git a/python/src/trezorlib/messages/EthereumMessageSignature.py b/python/src/trezorlib/messages/EthereumMessageSignature.py index 2ce3b6756..cc16507f8 100644 --- a/python/src/trezorlib/messages/EthereumMessageSignature.py +++ b/python/src/trezorlib/messages/EthereumMessageSignature.py @@ -15,6 +15,7 @@ class EthereumMessageSignature(p.MessageType): def __init__( self, + *, signature: bytes = None, address: str = None, ) -> None: @@ -24,6 +25,6 @@ class EthereumMessageSignature(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 2: ('signature', p.BytesType, 0), - 3: ('address', p.UnicodeType, 0), + 2: ('signature', p.BytesType, None), + 3: ('address', p.UnicodeType, None), } diff --git a/python/src/trezorlib/messages/EthereumPublicKey.py b/python/src/trezorlib/messages/EthereumPublicKey.py index a6f01c0a6..d3d96c5ec 100644 --- a/python/src/trezorlib/messages/EthereumPublicKey.py +++ b/python/src/trezorlib/messages/EthereumPublicKey.py @@ -17,6 +17,7 @@ class EthereumPublicKey(p.MessageType): def __init__( self, + *, node: HDNodeType = None, xpub: str = None, ) -> None: @@ -26,6 +27,6 @@ class EthereumPublicKey(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('node', HDNodeType, 0), - 2: ('xpub', p.UnicodeType, 0), + 1: ('node', HDNodeType, None), + 2: ('xpub', p.UnicodeType, None), } diff --git a/python/src/trezorlib/messages/EthereumSignMessage.py b/python/src/trezorlib/messages/EthereumSignMessage.py index 2f85584ff..e32a82813 100644 --- a/python/src/trezorlib/messages/EthereumSignMessage.py +++ b/python/src/trezorlib/messages/EthereumSignMessage.py @@ -15,6 +15,7 @@ class EthereumSignMessage(p.MessageType): def __init__( self, + *, address_n: List[int] = None, message: bytes = None, ) -> None: @@ -25,5 +26,5 @@ class EthereumSignMessage(p.MessageType): def get_fields(cls) -> Dict: return { 1: ('address_n', p.UVarintType, p.FLAG_REPEATED), - 2: ('message', p.BytesType, 0), + 2: ('message', p.BytesType, None), } diff --git a/python/src/trezorlib/messages/EthereumSignTx.py b/python/src/trezorlib/messages/EthereumSignTx.py index 848e2dfff..d8c16f4a8 100644 --- a/python/src/trezorlib/messages/EthereumSignTx.py +++ b/python/src/trezorlib/messages/EthereumSignTx.py @@ -15,6 +15,7 @@ class EthereumSignTx(p.MessageType): def __init__( self, + *, address_n: List[int] = None, nonce: bytes = None, gas_price: bytes = None, @@ -41,13 +42,13 @@ class EthereumSignTx(p.MessageType): def get_fields(cls) -> Dict: return { 1: ('address_n', p.UVarintType, p.FLAG_REPEATED), - 2: ('nonce', p.BytesType, 0), - 3: ('gas_price', p.BytesType, 0), - 4: ('gas_limit', p.BytesType, 0), - 11: ('to', p.UnicodeType, 0), - 6: ('value', p.BytesType, 0), - 7: ('data_initial_chunk', p.BytesType, 0), - 8: ('data_length', p.UVarintType, 0), - 9: ('chain_id', p.UVarintType, 0), - 10: ('tx_type', p.UVarintType, 0), + 2: ('nonce', p.BytesType, None), + 3: ('gas_price', p.BytesType, None), + 4: ('gas_limit', p.BytesType, None), + 11: ('to', p.UnicodeType, None), + 6: ('value', p.BytesType, None), + 7: ('data_initial_chunk', p.BytesType, None), + 8: ('data_length', p.UVarintType, None), + 9: ('chain_id', p.UVarintType, None), + 10: ('tx_type', p.UVarintType, None), } diff --git a/python/src/trezorlib/messages/EthereumTxAck.py b/python/src/trezorlib/messages/EthereumTxAck.py index 8e6e4313b..fc7bbbb4b 100644 --- a/python/src/trezorlib/messages/EthereumTxAck.py +++ b/python/src/trezorlib/messages/EthereumTxAck.py @@ -15,6 +15,7 @@ class EthereumTxAck(p.MessageType): def __init__( self, + *, data_chunk: bytes = None, ) -> None: self.data_chunk = data_chunk @@ -22,5 +23,5 @@ class EthereumTxAck(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('data_chunk', p.BytesType, 0), + 1: ('data_chunk', p.BytesType, None), } diff --git a/python/src/trezorlib/messages/EthereumTxRequest.py b/python/src/trezorlib/messages/EthereumTxRequest.py index e2f494241..56710a019 100644 --- a/python/src/trezorlib/messages/EthereumTxRequest.py +++ b/python/src/trezorlib/messages/EthereumTxRequest.py @@ -15,6 +15,7 @@ class EthereumTxRequest(p.MessageType): def __init__( self, + *, data_length: int = None, signature_v: int = None, signature_r: bytes = None, @@ -28,8 +29,8 @@ class EthereumTxRequest(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('data_length', p.UVarintType, 0), - 2: ('signature_v', p.UVarintType, 0), - 3: ('signature_r', p.BytesType, 0), - 4: ('signature_s', p.BytesType, 0), + 1: ('data_length', p.UVarintType, None), + 2: ('signature_v', p.UVarintType, None), + 3: ('signature_r', p.BytesType, None), + 4: ('signature_s', p.BytesType, None), } diff --git a/python/src/trezorlib/messages/EthereumVerifyMessage.py b/python/src/trezorlib/messages/EthereumVerifyMessage.py index 2104f44dd..f3b2f0746 100644 --- a/python/src/trezorlib/messages/EthereumVerifyMessage.py +++ b/python/src/trezorlib/messages/EthereumVerifyMessage.py @@ -15,6 +15,7 @@ class EthereumVerifyMessage(p.MessageType): def __init__( self, + *, signature: bytes = None, message: bytes = None, address: str = None, @@ -26,7 +27,7 @@ class EthereumVerifyMessage(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 2: ('signature', p.BytesType, 0), - 3: ('message', p.BytesType, 0), - 4: ('address', p.UnicodeType, 0), + 2: ('signature', p.BytesType, None), + 3: ('message', p.BytesType, None), + 4: ('address', p.UnicodeType, None), } diff --git a/python/src/trezorlib/messages/Failure.py b/python/src/trezorlib/messages/Failure.py index bba2a2d52..d26cc3cb1 100644 --- a/python/src/trezorlib/messages/Failure.py +++ b/python/src/trezorlib/messages/Failure.py @@ -16,6 +16,7 @@ class Failure(p.MessageType): def __init__( self, + *, code: EnumTypeFailureType = None, message: str = None, ) -> None: @@ -25,6 +26,6 @@ class Failure(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('code', p.EnumType("FailureType", (1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 99)), 0), - 2: ('message', p.UnicodeType, 0), + 1: ('code', p.EnumType("FailureType", (1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 99)), None), + 2: ('message', p.UnicodeType, None), } diff --git a/python/src/trezorlib/messages/Features.py b/python/src/trezorlib/messages/Features.py index b6a32e304..9f173f0a7 100644 --- a/python/src/trezorlib/messages/Features.py +++ b/python/src/trezorlib/messages/Features.py @@ -18,6 +18,8 @@ class Features(p.MessageType): def __init__( self, + *, + capabilities: List[EnumTypeCapability] = None, vendor: str = None, major_version: int = None, minor_version: int = None, @@ -45,7 +47,6 @@ class Features(p.MessageType): unfinished_backup: bool = None, no_backup: bool = None, recovery_mode: bool = None, - capabilities: List[EnumTypeCapability] = None, backup_type: EnumTypeBackupType = None, sd_card_present: bool = None, sd_protection: bool = None, @@ -54,6 +55,7 @@ class Features(p.MessageType): passphrase_always_on_device: bool = None, safety_checks: EnumTypeSafetyCheckLevel = None, ) -> None: + self.capabilities = capabilities if capabilities is not None else [] self.vendor = vendor self.major_version = major_version self.minor_version = minor_version @@ -81,7 +83,6 @@ class Features(p.MessageType): self.unfinished_backup = unfinished_backup self.no_backup = no_backup self.recovery_mode = recovery_mode - self.capabilities = capabilities if capabilities is not None else [] self.backup_type = backup_type self.sd_card_present = sd_card_present self.sd_protection = sd_protection @@ -93,39 +94,39 @@ class Features(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('vendor', p.UnicodeType, 0), - 2: ('major_version', p.UVarintType, 0), - 3: ('minor_version', p.UVarintType, 0), - 4: ('patch_version', p.UVarintType, 0), - 5: ('bootloader_mode', p.BoolType, 0), - 6: ('device_id', p.UnicodeType, 0), - 7: ('pin_protection', p.BoolType, 0), - 8: ('passphrase_protection', p.BoolType, 0), - 9: ('language', p.UnicodeType, 0), - 10: ('label', p.UnicodeType, 0), - 12: ('initialized', p.BoolType, 0), - 13: ('revision', p.BytesType, 0), - 14: ('bootloader_hash', p.BytesType, 0), - 15: ('imported', p.BoolType, 0), - 16: ('unlocked', p.BoolType, 0), - 18: ('firmware_present', p.BoolType, 0), - 19: ('needs_backup', p.BoolType, 0), - 20: ('flags', p.UVarintType, 0), - 21: ('model', p.UnicodeType, 0), - 22: ('fw_major', p.UVarintType, 0), - 23: ('fw_minor', p.UVarintType, 0), - 24: ('fw_patch', p.UVarintType, 0), - 25: ('fw_vendor', p.UnicodeType, 0), - 26: ('fw_vendor_keys', p.BytesType, 0), - 27: ('unfinished_backup', p.BoolType, 0), - 28: ('no_backup', p.BoolType, 0), - 29: ('recovery_mode', p.BoolType, 0), + 1: ('vendor', p.UnicodeType, None), + 2: ('major_version', p.UVarintType, None), + 3: ('minor_version', p.UVarintType, None), + 4: ('patch_version', p.UVarintType, None), + 5: ('bootloader_mode', p.BoolType, None), + 6: ('device_id', p.UnicodeType, None), + 7: ('pin_protection', p.BoolType, None), + 8: ('passphrase_protection', p.BoolType, None), + 9: ('language', p.UnicodeType, None), + 10: ('label', p.UnicodeType, None), + 12: ('initialized', p.BoolType, None), + 13: ('revision', p.BytesType, None), + 14: ('bootloader_hash', p.BytesType, None), + 15: ('imported', p.BoolType, None), + 16: ('unlocked', p.BoolType, None), + 18: ('firmware_present', p.BoolType, None), + 19: ('needs_backup', p.BoolType, None), + 20: ('flags', p.UVarintType, None), + 21: ('model', p.UnicodeType, None), + 22: ('fw_major', p.UVarintType, None), + 23: ('fw_minor', p.UVarintType, None), + 24: ('fw_patch', p.UVarintType, None), + 25: ('fw_vendor', p.UnicodeType, None), + 26: ('fw_vendor_keys', p.BytesType, None), + 27: ('unfinished_backup', p.BoolType, None), + 28: ('no_backup', p.BoolType, None), + 29: ('recovery_mode', p.BoolType, None), 30: ('capabilities', p.EnumType("Capability", (1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17)), p.FLAG_REPEATED), - 31: ('backup_type', p.EnumType("BackupType", (0, 1, 2)), 0), - 32: ('sd_card_present', p.BoolType, 0), - 33: ('sd_protection', p.BoolType, 0), - 34: ('wipe_code_protection', p.BoolType, 0), - 35: ('session_id', p.BytesType, 0), - 36: ('passphrase_always_on_device', p.BoolType, 0), - 37: ('safety_checks', p.EnumType("SafetyCheckLevel", (0, 1, 2)), 0), + 31: ('backup_type', p.EnumType("BackupType", (0, 1, 2)), None), + 32: ('sd_card_present', p.BoolType, None), + 33: ('sd_protection', p.BoolType, None), + 34: ('wipe_code_protection', p.BoolType, None), + 35: ('session_id', p.BytesType, None), + 36: ('passphrase_always_on_device', p.BoolType, None), + 37: ('safety_checks', p.EnumType("SafetyCheckLevel", (0, 1, 2)), None), } diff --git a/python/src/trezorlib/messages/FirmwareErase.py b/python/src/trezorlib/messages/FirmwareErase.py index 4658f2b46..f5a4e8d33 100644 --- a/python/src/trezorlib/messages/FirmwareErase.py +++ b/python/src/trezorlib/messages/FirmwareErase.py @@ -15,6 +15,7 @@ class FirmwareErase(p.MessageType): def __init__( self, + *, length: int = None, ) -> None: self.length = length @@ -22,5 +23,5 @@ class FirmwareErase(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('length', p.UVarintType, 0), + 1: ('length', p.UVarintType, None), } diff --git a/python/src/trezorlib/messages/FirmwareRequest.py b/python/src/trezorlib/messages/FirmwareRequest.py index ffa6ecb4f..649019333 100644 --- a/python/src/trezorlib/messages/FirmwareRequest.py +++ b/python/src/trezorlib/messages/FirmwareRequest.py @@ -15,6 +15,7 @@ class FirmwareRequest(p.MessageType): def __init__( self, + *, offset: int = None, length: int = None, ) -> None: @@ -24,6 +25,6 @@ class FirmwareRequest(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('offset', p.UVarintType, 0), - 2: ('length', p.UVarintType, 0), + 1: ('offset', p.UVarintType, None), + 2: ('length', p.UVarintType, None), } diff --git a/python/src/trezorlib/messages/FirmwareUpload.py b/python/src/trezorlib/messages/FirmwareUpload.py index 06041a063..34a406e36 100644 --- a/python/src/trezorlib/messages/FirmwareUpload.py +++ b/python/src/trezorlib/messages/FirmwareUpload.py @@ -15,7 +15,8 @@ class FirmwareUpload(p.MessageType): def __init__( self, - payload: bytes = None, + *, + payload: bytes, hash: bytes = None, ) -> None: self.payload = payload @@ -24,6 +25,6 @@ class FirmwareUpload(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('payload', p.BytesType, 0), # required - 2: ('hash', p.BytesType, 0), + 1: ('payload', p.BytesType, p.FLAG_REQUIRED), + 2: ('hash', p.BytesType, None), } diff --git a/python/src/trezorlib/messages/GetAddress.py b/python/src/trezorlib/messages/GetAddress.py index 4bfcc0ebc..b77946a42 100644 --- a/python/src/trezorlib/messages/GetAddress.py +++ b/python/src/trezorlib/messages/GetAddress.py @@ -18,11 +18,12 @@ class GetAddress(p.MessageType): def __init__( self, + *, address_n: List[int] = None, - coin_name: str = None, + coin_name: str = "Bitcoin", show_display: bool = None, multisig: MultisigRedeemScriptType = None, - script_type: EnumTypeInputScriptType = None, + script_type: EnumTypeInputScriptType = 0, ) -> None: self.address_n = address_n if address_n is not None else [] self.coin_name = coin_name @@ -34,8 +35,8 @@ class GetAddress(p.MessageType): def get_fields(cls) -> Dict: return { 1: ('address_n', p.UVarintType, p.FLAG_REPEATED), - 2: ('coin_name', p.UnicodeType, 0), # default=Bitcoin - 3: ('show_display', p.BoolType, 0), - 4: ('multisig', MultisigRedeemScriptType, 0), + 2: ('coin_name', p.UnicodeType, "Bitcoin"), # default=Bitcoin + 3: ('show_display', p.BoolType, None), + 4: ('multisig', MultisigRedeemScriptType, None), 5: ('script_type', p.EnumType("InputScriptType", (0, 1, 2, 3, 4)), 0), # default=SPENDADDRESS } diff --git a/python/src/trezorlib/messages/GetECDHSessionKey.py b/python/src/trezorlib/messages/GetECDHSessionKey.py index 12e56b04c..46b9b3165 100644 --- a/python/src/trezorlib/messages/GetECDHSessionKey.py +++ b/python/src/trezorlib/messages/GetECDHSessionKey.py @@ -17,6 +17,7 @@ class GetECDHSessionKey(p.MessageType): def __init__( self, + *, identity: IdentityType = None, peer_public_key: bytes = None, ecdsa_curve_name: str = None, @@ -28,7 +29,7 @@ class GetECDHSessionKey(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('identity', IdentityType, 0), - 2: ('peer_public_key', p.BytesType, 0), - 3: ('ecdsa_curve_name', p.UnicodeType, 0), + 1: ('identity', IdentityType, None), + 2: ('peer_public_key', p.BytesType, None), + 3: ('ecdsa_curve_name', p.UnicodeType, None), } diff --git a/python/src/trezorlib/messages/GetEntropy.py b/python/src/trezorlib/messages/GetEntropy.py index 835a98cd3..bc0628fe5 100644 --- a/python/src/trezorlib/messages/GetEntropy.py +++ b/python/src/trezorlib/messages/GetEntropy.py @@ -15,12 +15,13 @@ class GetEntropy(p.MessageType): def __init__( self, - size: int = None, + *, + size: int, ) -> None: self.size = size @classmethod def get_fields(cls) -> Dict: return { - 1: ('size', p.UVarintType, 0), # required + 1: ('size', p.UVarintType, p.FLAG_REQUIRED), } diff --git a/python/src/trezorlib/messages/GetOwnershipId.py b/python/src/trezorlib/messages/GetOwnershipId.py index ef8b05b8f..548ad5ad9 100644 --- a/python/src/trezorlib/messages/GetOwnershipId.py +++ b/python/src/trezorlib/messages/GetOwnershipId.py @@ -18,10 +18,11 @@ class GetOwnershipId(p.MessageType): def __init__( self, + *, address_n: List[int] = None, - coin_name: str = None, + coin_name: str = "Bitcoin", multisig: MultisigRedeemScriptType = None, - script_type: EnumTypeInputScriptType = None, + script_type: EnumTypeInputScriptType = 0, ) -> None: self.address_n = address_n if address_n is not None else [] self.coin_name = coin_name @@ -32,7 +33,7 @@ class GetOwnershipId(p.MessageType): def get_fields(cls) -> Dict: return { 1: ('address_n', p.UVarintType, p.FLAG_REPEATED), - 2: ('coin_name', p.UnicodeType, 0), # default=Bitcoin - 3: ('multisig', MultisigRedeemScriptType, 0), + 2: ('coin_name', p.UnicodeType, "Bitcoin"), # default=Bitcoin + 3: ('multisig', MultisigRedeemScriptType, None), 4: ('script_type', p.EnumType("InputScriptType", (0, 1, 2, 3, 4)), 0), # default=SPENDADDRESS } diff --git a/python/src/trezorlib/messages/GetOwnershipProof.py b/python/src/trezorlib/messages/GetOwnershipProof.py index e8094f6ca..579373ac0 100644 --- a/python/src/trezorlib/messages/GetOwnershipProof.py +++ b/python/src/trezorlib/messages/GetOwnershipProof.py @@ -18,30 +18,31 @@ class GetOwnershipProof(p.MessageType): def __init__( self, + *, address_n: List[int] = None, - coin_name: str = None, - script_type: EnumTypeInputScriptType = None, - multisig: MultisigRedeemScriptType = None, - user_confirmation: bool = None, ownership_ids: List[bytes] = None, - commitment_data: bytes = None, + coin_name: str = "Bitcoin", + script_type: EnumTypeInputScriptType = 3, + multisig: MultisigRedeemScriptType = None, + user_confirmation: bool = False, + commitment_data: bytes = b"", ) -> None: self.address_n = address_n if address_n is not None else [] + self.ownership_ids = ownership_ids if ownership_ids is not None else [] self.coin_name = coin_name self.script_type = script_type self.multisig = multisig self.user_confirmation = user_confirmation - self.ownership_ids = ownership_ids if ownership_ids is not None else [] self.commitment_data = commitment_data @classmethod def get_fields(cls) -> Dict: return { 1: ('address_n', p.UVarintType, p.FLAG_REPEATED), - 2: ('coin_name', p.UnicodeType, 0), # default=Bitcoin - 3: ('script_type', p.EnumType("InputScriptType", (0, 1, 2, 3, 4)), 0), # default=SPENDWITNESS - 4: ('multisig', MultisigRedeemScriptType, 0), - 5: ('user_confirmation', p.BoolType, 0), + 2: ('coin_name', p.UnicodeType, "Bitcoin"), # default=Bitcoin + 3: ('script_type', p.EnumType("InputScriptType", (0, 1, 2, 3, 4)), 3), # default=SPENDWITNESS + 4: ('multisig', MultisigRedeemScriptType, None), + 5: ('user_confirmation', p.BoolType, False), # default=false 6: ('ownership_ids', p.BytesType, p.FLAG_REPEATED), - 7: ('commitment_data', p.BytesType, 0), + 7: ('commitment_data', p.BytesType, b""), # default= } diff --git a/python/src/trezorlib/messages/GetPublicKey.py b/python/src/trezorlib/messages/GetPublicKey.py index 02bbfa529..c6a7a309b 100644 --- a/python/src/trezorlib/messages/GetPublicKey.py +++ b/python/src/trezorlib/messages/GetPublicKey.py @@ -16,11 +16,12 @@ class GetPublicKey(p.MessageType): def __init__( self, + *, address_n: List[int] = None, ecdsa_curve_name: str = None, show_display: bool = None, - coin_name: str = None, - script_type: EnumTypeInputScriptType = None, + coin_name: str = "Bitcoin", + script_type: EnumTypeInputScriptType = 0, ) -> None: self.address_n = address_n if address_n is not None else [] self.ecdsa_curve_name = ecdsa_curve_name @@ -32,8 +33,8 @@ class GetPublicKey(p.MessageType): def get_fields(cls) -> Dict: return { 1: ('address_n', p.UVarintType, p.FLAG_REPEATED), - 2: ('ecdsa_curve_name', p.UnicodeType, 0), - 3: ('show_display', p.BoolType, 0), - 4: ('coin_name', p.UnicodeType, 0), # default=Bitcoin + 2: ('ecdsa_curve_name', p.UnicodeType, None), + 3: ('show_display', p.BoolType, None), + 4: ('coin_name', p.UnicodeType, "Bitcoin"), # default=Bitcoin 5: ('script_type', p.EnumType("InputScriptType", (0, 1, 2, 3, 4)), 0), # default=SPENDADDRESS } diff --git a/python/src/trezorlib/messages/HDNodePathType.py b/python/src/trezorlib/messages/HDNodePathType.py index 8636be971..d0a6585a7 100644 --- a/python/src/trezorlib/messages/HDNodePathType.py +++ b/python/src/trezorlib/messages/HDNodePathType.py @@ -16,15 +16,16 @@ class HDNodePathType(p.MessageType): def __init__( self, - node: HDNodeType = None, + *, + node: HDNodeType, address_n: List[int] = None, ) -> None: - self.node = node self.address_n = address_n if address_n is not None else [] + self.node = node @classmethod def get_fields(cls) -> Dict: return { - 1: ('node', HDNodeType, 0), # required + 1: ('node', HDNodeType, p.FLAG_REQUIRED), 2: ('address_n', p.UVarintType, p.FLAG_REPEATED), } diff --git a/python/src/trezorlib/messages/HDNodeType.py b/python/src/trezorlib/messages/HDNodeType.py index d0e14c0d9..1a0c01f4b 100644 --- a/python/src/trezorlib/messages/HDNodeType.py +++ b/python/src/trezorlib/messages/HDNodeType.py @@ -14,27 +14,28 @@ class HDNodeType(p.MessageType): def __init__( self, - depth: int = None, - fingerprint: int = None, - child_num: int = None, - chain_code: bytes = None, + *, + depth: int, + fingerprint: int, + child_num: int, + chain_code: bytes, + public_key: bytes, private_key: bytes = None, - public_key: bytes = None, ) -> None: self.depth = depth self.fingerprint = fingerprint self.child_num = child_num self.chain_code = chain_code - self.private_key = private_key self.public_key = public_key + self.private_key = private_key @classmethod def get_fields(cls) -> Dict: return { - 1: ('depth', p.UVarintType, 0), # required - 2: ('fingerprint', p.UVarintType, 0), # required - 3: ('child_num', p.UVarintType, 0), # required - 4: ('chain_code', p.BytesType, 0), # required - 5: ('private_key', p.BytesType, 0), - 6: ('public_key', p.BytesType, 0), + 1: ('depth', p.UVarintType, p.FLAG_REQUIRED), + 2: ('fingerprint', p.UVarintType, p.FLAG_REQUIRED), + 3: ('child_num', p.UVarintType, p.FLAG_REQUIRED), + 4: ('chain_code', p.BytesType, p.FLAG_REQUIRED), + 5: ('private_key', p.BytesType, None), + 6: ('public_key', p.BytesType, p.FLAG_REQUIRED), } diff --git a/python/src/trezorlib/messages/IdentityType.py b/python/src/trezorlib/messages/IdentityType.py index bf6b28f1a..6ec7190c6 100644 --- a/python/src/trezorlib/messages/IdentityType.py +++ b/python/src/trezorlib/messages/IdentityType.py @@ -14,12 +14,13 @@ class IdentityType(p.MessageType): def __init__( self, + *, proto: str = None, user: str = None, host: str = None, port: str = None, path: str = None, - index: int = None, + index: int = 0, ) -> None: self.proto = proto self.user = user @@ -31,10 +32,10 @@ class IdentityType(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('proto', p.UnicodeType, 0), - 2: ('user', p.UnicodeType, 0), - 3: ('host', p.UnicodeType, 0), - 4: ('port', p.UnicodeType, 0), - 5: ('path', p.UnicodeType, 0), + 1: ('proto', p.UnicodeType, None), + 2: ('user', p.UnicodeType, None), + 3: ('host', p.UnicodeType, None), + 4: ('port', p.UnicodeType, None), + 5: ('path', p.UnicodeType, None), 6: ('index', p.UVarintType, 0), # default=0 } diff --git a/python/src/trezorlib/messages/Initialize.py b/python/src/trezorlib/messages/Initialize.py index 3d8ca3810..7eb56aeb8 100644 --- a/python/src/trezorlib/messages/Initialize.py +++ b/python/src/trezorlib/messages/Initialize.py @@ -15,6 +15,7 @@ class Initialize(p.MessageType): def __init__( self, + *, session_id: bytes = None, ) -> None: self.session_id = session_id @@ -22,5 +23,5 @@ class Initialize(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('session_id', p.BytesType, 0), + 1: ('session_id', p.BytesType, None), } diff --git a/python/src/trezorlib/messages/LiskAddress.py b/python/src/trezorlib/messages/LiskAddress.py index 6501f2402..16c427129 100644 --- a/python/src/trezorlib/messages/LiskAddress.py +++ b/python/src/trezorlib/messages/LiskAddress.py @@ -15,6 +15,7 @@ class LiskAddress(p.MessageType): def __init__( self, + *, address: str = None, ) -> None: self.address = address @@ -22,5 +23,5 @@ class LiskAddress(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('address', p.UnicodeType, 0), + 1: ('address', p.UnicodeType, None), } diff --git a/python/src/trezorlib/messages/LiskDelegateType.py b/python/src/trezorlib/messages/LiskDelegateType.py index a5b5320db..804843fb6 100644 --- a/python/src/trezorlib/messages/LiskDelegateType.py +++ b/python/src/trezorlib/messages/LiskDelegateType.py @@ -14,6 +14,7 @@ class LiskDelegateType(p.MessageType): def __init__( self, + *, username: str = None, ) -> None: self.username = username @@ -21,5 +22,5 @@ class LiskDelegateType(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('username', p.UnicodeType, 0), + 1: ('username', p.UnicodeType, None), } diff --git a/python/src/trezorlib/messages/LiskGetAddress.py b/python/src/trezorlib/messages/LiskGetAddress.py index c233a0e5e..8ba0e4a12 100644 --- a/python/src/trezorlib/messages/LiskGetAddress.py +++ b/python/src/trezorlib/messages/LiskGetAddress.py @@ -15,6 +15,7 @@ class LiskGetAddress(p.MessageType): def __init__( self, + *, address_n: List[int] = None, show_display: bool = None, ) -> None: @@ -25,5 +26,5 @@ class LiskGetAddress(p.MessageType): def get_fields(cls) -> Dict: return { 1: ('address_n', p.UVarintType, p.FLAG_REPEATED), - 2: ('show_display', p.BoolType, 0), + 2: ('show_display', p.BoolType, None), } diff --git a/python/src/trezorlib/messages/LiskGetPublicKey.py b/python/src/trezorlib/messages/LiskGetPublicKey.py index d360e43da..a9905f38e 100644 --- a/python/src/trezorlib/messages/LiskGetPublicKey.py +++ b/python/src/trezorlib/messages/LiskGetPublicKey.py @@ -15,6 +15,7 @@ class LiskGetPublicKey(p.MessageType): def __init__( self, + *, address_n: List[int] = None, show_display: bool = None, ) -> None: @@ -25,5 +26,5 @@ class LiskGetPublicKey(p.MessageType): def get_fields(cls) -> Dict: return { 1: ('address_n', p.UVarintType, p.FLAG_REPEATED), - 2: ('show_display', p.BoolType, 0), + 2: ('show_display', p.BoolType, None), } diff --git a/python/src/trezorlib/messages/LiskMessageSignature.py b/python/src/trezorlib/messages/LiskMessageSignature.py index d0657cceb..948befadf 100644 --- a/python/src/trezorlib/messages/LiskMessageSignature.py +++ b/python/src/trezorlib/messages/LiskMessageSignature.py @@ -15,6 +15,7 @@ class LiskMessageSignature(p.MessageType): def __init__( self, + *, public_key: bytes = None, signature: bytes = None, ) -> None: @@ -24,6 +25,6 @@ class LiskMessageSignature(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('public_key', p.BytesType, 0), - 2: ('signature', p.BytesType, 0), + 1: ('public_key', p.BytesType, None), + 2: ('signature', p.BytesType, None), } diff --git a/python/src/trezorlib/messages/LiskMultisignatureType.py b/python/src/trezorlib/messages/LiskMultisignatureType.py index 17e32c22d..228a3c423 100644 --- a/python/src/trezorlib/messages/LiskMultisignatureType.py +++ b/python/src/trezorlib/messages/LiskMultisignatureType.py @@ -14,18 +14,19 @@ class LiskMultisignatureType(p.MessageType): def __init__( self, + *, + keys_group: List[str] = None, min: int = None, life_time: int = None, - keys_group: List[str] = None, ) -> None: + self.keys_group = keys_group if keys_group is not None else [] self.min = min self.life_time = life_time - self.keys_group = keys_group if keys_group is not None else [] @classmethod def get_fields(cls) -> Dict: return { - 1: ('min', p.UVarintType, 0), - 2: ('life_time', p.UVarintType, 0), + 1: ('min', p.UVarintType, None), + 2: ('life_time', p.UVarintType, None), 3: ('keys_group', p.UnicodeType, p.FLAG_REPEATED), } diff --git a/python/src/trezorlib/messages/LiskPublicKey.py b/python/src/trezorlib/messages/LiskPublicKey.py index 15e972654..13981de15 100644 --- a/python/src/trezorlib/messages/LiskPublicKey.py +++ b/python/src/trezorlib/messages/LiskPublicKey.py @@ -15,6 +15,7 @@ class LiskPublicKey(p.MessageType): def __init__( self, + *, public_key: bytes = None, ) -> None: self.public_key = public_key @@ -22,5 +23,5 @@ class LiskPublicKey(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('public_key', p.BytesType, 0), + 1: ('public_key', p.BytesType, None), } diff --git a/python/src/trezorlib/messages/LiskSignMessage.py b/python/src/trezorlib/messages/LiskSignMessage.py index 55c325bc3..ba7de53df 100644 --- a/python/src/trezorlib/messages/LiskSignMessage.py +++ b/python/src/trezorlib/messages/LiskSignMessage.py @@ -15,6 +15,7 @@ class LiskSignMessage(p.MessageType): def __init__( self, + *, address_n: List[int] = None, message: bytes = None, ) -> None: @@ -25,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, 0), + 2: ('message', p.BytesType, None), } diff --git a/python/src/trezorlib/messages/LiskSignTx.py b/python/src/trezorlib/messages/LiskSignTx.py index 8ed8d654d..3548f95f5 100644 --- a/python/src/trezorlib/messages/LiskSignTx.py +++ b/python/src/trezorlib/messages/LiskSignTx.py @@ -17,6 +17,7 @@ class LiskSignTx(p.MessageType): def __init__( self, + *, address_n: List[int] = None, transaction: LiskTransactionCommon = None, ) -> None: @@ -27,5 +28,5 @@ class LiskSignTx(p.MessageType): def get_fields(cls) -> Dict: return { 1: ('address_n', p.UVarintType, p.FLAG_REPEATED), - 2: ('transaction', LiskTransactionCommon, 0), + 2: ('transaction', LiskTransactionCommon, None), } diff --git a/python/src/trezorlib/messages/LiskSignatureType.py b/python/src/trezorlib/messages/LiskSignatureType.py index 26f7a6a74..65a99eeaf 100644 --- a/python/src/trezorlib/messages/LiskSignatureType.py +++ b/python/src/trezorlib/messages/LiskSignatureType.py @@ -14,6 +14,7 @@ class LiskSignatureType(p.MessageType): def __init__( self, + *, public_key: bytes = None, ) -> None: self.public_key = public_key @@ -21,5 +22,5 @@ class LiskSignatureType(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('public_key', p.BytesType, 0), + 1: ('public_key', p.BytesType, None), } diff --git a/python/src/trezorlib/messages/LiskSignedTx.py b/python/src/trezorlib/messages/LiskSignedTx.py index f7c5cabb9..4b978ec6f 100644 --- a/python/src/trezorlib/messages/LiskSignedTx.py +++ b/python/src/trezorlib/messages/LiskSignedTx.py @@ -15,6 +15,7 @@ class LiskSignedTx(p.MessageType): def __init__( self, + *, signature: bytes = None, ) -> None: self.signature = signature @@ -22,5 +23,5 @@ class LiskSignedTx(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('signature', p.BytesType, 0), + 1: ('signature', p.BytesType, None), } diff --git a/python/src/trezorlib/messages/LiskTransactionAsset.py b/python/src/trezorlib/messages/LiskTransactionAsset.py index 886f1b077..b98fc7ffd 100644 --- a/python/src/trezorlib/messages/LiskTransactionAsset.py +++ b/python/src/trezorlib/messages/LiskTransactionAsset.py @@ -18,24 +18,25 @@ class LiskTransactionAsset(p.MessageType): def __init__( self, + *, + votes: List[str] = None, signature: LiskSignatureType = None, delegate: LiskDelegateType = None, - votes: List[str] = None, multisignature: LiskMultisignatureType = None, data: str = None, ) -> None: + self.votes = votes if votes is not None else [] self.signature = signature self.delegate = delegate - self.votes = votes if votes is not None else [] self.multisignature = multisignature self.data = data @classmethod def get_fields(cls) -> Dict: return { - 1: ('signature', LiskSignatureType, 0), - 2: ('delegate', LiskDelegateType, 0), + 1: ('signature', LiskSignatureType, None), + 2: ('delegate', LiskDelegateType, None), 3: ('votes', p.UnicodeType, p.FLAG_REPEATED), - 4: ('multisignature', LiskMultisignatureType, 0), - 5: ('data', p.UnicodeType, 0), + 4: ('multisignature', LiskMultisignatureType, None), + 5: ('data', p.UnicodeType, None), } diff --git a/python/src/trezorlib/messages/LiskTransactionCommon.py b/python/src/trezorlib/messages/LiskTransactionCommon.py index ef237c703..5b86420f2 100644 --- a/python/src/trezorlib/messages/LiskTransactionCommon.py +++ b/python/src/trezorlib/messages/LiskTransactionCommon.py @@ -17,6 +17,7 @@ class LiskTransactionCommon(p.MessageType): def __init__( self, + *, type: EnumTypeLiskTransactionType = None, amount: int = None, fee: int = None, @@ -40,13 +41,13 @@ class LiskTransactionCommon(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('type', p.EnumType("LiskTransactionType", (0, 1, 2, 3, 4, 5, 6, 7)), 0), - 2: ('amount', p.UVarintType, 0), - 3: ('fee', p.UVarintType, 0), - 4: ('recipient_id', p.UnicodeType, 0), - 5: ('sender_public_key', p.BytesType, 0), - 6: ('requester_public_key', p.BytesType, 0), - 7: ('signature', p.BytesType, 0), - 8: ('timestamp', p.UVarintType, 0), - 9: ('asset', LiskTransactionAsset, 0), + 1: ('type', p.EnumType("LiskTransactionType", (0, 1, 2, 3, 4, 5, 6, 7)), None), + 2: ('amount', p.UVarintType, None), + 3: ('fee', p.UVarintType, None), + 4: ('recipient_id', p.UnicodeType, None), + 5: ('sender_public_key', p.BytesType, None), + 6: ('requester_public_key', p.BytesType, None), + 7: ('signature', p.BytesType, None), + 8: ('timestamp', p.UVarintType, None), + 9: ('asset', LiskTransactionAsset, None), } diff --git a/python/src/trezorlib/messages/LiskVerifyMessage.py b/python/src/trezorlib/messages/LiskVerifyMessage.py index 0b87f214a..cfa65c45d 100644 --- a/python/src/trezorlib/messages/LiskVerifyMessage.py +++ b/python/src/trezorlib/messages/LiskVerifyMessage.py @@ -15,6 +15,7 @@ class LiskVerifyMessage(p.MessageType): def __init__( self, + *, public_key: bytes = None, signature: bytes = None, message: bytes = None, @@ -26,7 +27,7 @@ class LiskVerifyMessage(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('public_key', p.BytesType, 0), - 2: ('signature', p.BytesType, 0), - 3: ('message', p.BytesType, 0), + 1: ('public_key', p.BytesType, None), + 2: ('signature', p.BytesType, None), + 3: ('message', p.BytesType, None), } diff --git a/python/src/trezorlib/messages/LoadDevice.py b/python/src/trezorlib/messages/LoadDevice.py index 0226453af..748848e98 100644 --- a/python/src/trezorlib/messages/LoadDevice.py +++ b/python/src/trezorlib/messages/LoadDevice.py @@ -15,10 +15,11 @@ class LoadDevice(p.MessageType): def __init__( self, + *, mnemonics: List[str] = None, pin: str = None, passphrase_protection: bool = None, - language: str = None, + language: str = "en-US", label: str = None, skip_checksum: bool = None, u2f_counter: int = None, @@ -39,12 +40,12 @@ class LoadDevice(p.MessageType): def get_fields(cls) -> Dict: return { 1: ('mnemonics', p.UnicodeType, p.FLAG_REPEATED), - 3: ('pin', p.UnicodeType, 0), - 4: ('passphrase_protection', p.BoolType, 0), - 5: ('language', p.UnicodeType, 0), # default=en-US - 6: ('label', p.UnicodeType, 0), - 7: ('skip_checksum', p.BoolType, 0), - 8: ('u2f_counter', p.UVarintType, 0), - 9: ('needs_backup', p.BoolType, 0), - 10: ('no_backup', p.BoolType, 0), + 3: ('pin', p.UnicodeType, None), + 4: ('passphrase_protection', p.BoolType, None), + 5: ('language', p.UnicodeType, "en-US"), # default=en-US + 6: ('label', p.UnicodeType, None), + 7: ('skip_checksum', p.BoolType, None), + 8: ('u2f_counter', p.UVarintType, None), + 9: ('needs_backup', p.BoolType, None), + 10: ('no_backup', p.BoolType, None), } diff --git a/python/src/trezorlib/messages/MessageSignature.py b/python/src/trezorlib/messages/MessageSignature.py index 912817016..c995a011d 100644 --- a/python/src/trezorlib/messages/MessageSignature.py +++ b/python/src/trezorlib/messages/MessageSignature.py @@ -15,6 +15,7 @@ class MessageSignature(p.MessageType): def __init__( self, + *, address: str = None, signature: bytes = None, ) -> None: @@ -24,6 +25,6 @@ class MessageSignature(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('address', p.UnicodeType, 0), - 2: ('signature', p.BytesType, 0), + 1: ('address', p.UnicodeType, None), + 2: ('signature', p.BytesType, None), } diff --git a/python/src/trezorlib/messages/MoneroAccountPublicAddress.py b/python/src/trezorlib/messages/MoneroAccountPublicAddress.py index 1a4c5ef62..88b6dcb8f 100644 --- a/python/src/trezorlib/messages/MoneroAccountPublicAddress.py +++ b/python/src/trezorlib/messages/MoneroAccountPublicAddress.py @@ -14,6 +14,7 @@ class MoneroAccountPublicAddress(p.MessageType): def __init__( self, + *, spend_public_key: bytes = None, view_public_key: bytes = None, ) -> None: @@ -23,6 +24,6 @@ class MoneroAccountPublicAddress(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('spend_public_key', p.BytesType, 0), - 2: ('view_public_key', p.BytesType, 0), + 1: ('spend_public_key', p.BytesType, None), + 2: ('view_public_key', p.BytesType, None), } diff --git a/python/src/trezorlib/messages/MoneroAddress.py b/python/src/trezorlib/messages/MoneroAddress.py index 3e0d6e46e..cbfea9385 100644 --- a/python/src/trezorlib/messages/MoneroAddress.py +++ b/python/src/trezorlib/messages/MoneroAddress.py @@ -15,6 +15,7 @@ class MoneroAddress(p.MessageType): def __init__( self, + *, address: bytes = None, ) -> None: self.address = address @@ -22,5 +23,5 @@ class MoneroAddress(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('address', p.BytesType, 0), + 1: ('address', p.BytesType, None), } diff --git a/python/src/trezorlib/messages/MoneroExportedKeyImage.py b/python/src/trezorlib/messages/MoneroExportedKeyImage.py index 9d8707f49..15df409da 100644 --- a/python/src/trezorlib/messages/MoneroExportedKeyImage.py +++ b/python/src/trezorlib/messages/MoneroExportedKeyImage.py @@ -14,6 +14,7 @@ class MoneroExportedKeyImage(p.MessageType): def __init__( self, + *, iv: bytes = None, blob: bytes = None, ) -> None: @@ -23,6 +24,6 @@ class MoneroExportedKeyImage(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('iv', p.BytesType, 0), - 3: ('blob', p.BytesType, 0), + 1: ('iv', p.BytesType, None), + 3: ('blob', p.BytesType, None), } diff --git a/python/src/trezorlib/messages/MoneroGetAddress.py b/python/src/trezorlib/messages/MoneroGetAddress.py index 229a3c865..a622cd63b 100644 --- a/python/src/trezorlib/messages/MoneroGetAddress.py +++ b/python/src/trezorlib/messages/MoneroGetAddress.py @@ -15,6 +15,7 @@ class MoneroGetAddress(p.MessageType): def __init__( self, + *, address_n: List[int] = None, show_display: bool = None, network_type: int = None, @@ -33,9 +34,9 @@ class MoneroGetAddress(p.MessageType): def get_fields(cls) -> Dict: return { 1: ('address_n', p.UVarintType, p.FLAG_REPEATED), - 2: ('show_display', p.BoolType, 0), - 3: ('network_type', p.UVarintType, 0), - 4: ('account', p.UVarintType, 0), - 5: ('minor', p.UVarintType, 0), - 6: ('payment_id', p.BytesType, 0), + 2: ('show_display', p.BoolType, None), + 3: ('network_type', p.UVarintType, None), + 4: ('account', p.UVarintType, None), + 5: ('minor', p.UVarintType, None), + 6: ('payment_id', p.BytesType, None), } diff --git a/python/src/trezorlib/messages/MoneroGetTxKeyAck.py b/python/src/trezorlib/messages/MoneroGetTxKeyAck.py index 04aa63a97..d6913c505 100644 --- a/python/src/trezorlib/messages/MoneroGetTxKeyAck.py +++ b/python/src/trezorlib/messages/MoneroGetTxKeyAck.py @@ -15,6 +15,7 @@ class MoneroGetTxKeyAck(p.MessageType): def __init__( self, + *, salt: bytes = None, tx_keys: bytes = None, tx_derivations: bytes = None, @@ -26,7 +27,7 @@ class MoneroGetTxKeyAck(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('salt', p.BytesType, 0), - 2: ('tx_keys', p.BytesType, 0), - 3: ('tx_derivations', p.BytesType, 0), + 1: ('salt', p.BytesType, None), + 2: ('tx_keys', p.BytesType, None), + 3: ('tx_derivations', p.BytesType, None), } diff --git a/python/src/trezorlib/messages/MoneroGetTxKeyRequest.py b/python/src/trezorlib/messages/MoneroGetTxKeyRequest.py index b935838df..089a17706 100644 --- a/python/src/trezorlib/messages/MoneroGetTxKeyRequest.py +++ b/python/src/trezorlib/messages/MoneroGetTxKeyRequest.py @@ -15,6 +15,7 @@ class MoneroGetTxKeyRequest(p.MessageType): def __init__( self, + *, address_n: List[int] = None, network_type: int = None, salt1: bytes = None, @@ -37,11 +38,11 @@ class MoneroGetTxKeyRequest(p.MessageType): def get_fields(cls) -> Dict: return { 1: ('address_n', p.UVarintType, p.FLAG_REPEATED), - 2: ('network_type', p.UVarintType, 0), - 3: ('salt1', p.BytesType, 0), - 4: ('salt2', p.BytesType, 0), - 5: ('tx_enc_keys', p.BytesType, 0), - 6: ('tx_prefix_hash', p.BytesType, 0), - 7: ('reason', p.UVarintType, 0), - 8: ('view_public_key', p.BytesType, 0), + 2: ('network_type', p.UVarintType, None), + 3: ('salt1', p.BytesType, None), + 4: ('salt2', p.BytesType, None), + 5: ('tx_enc_keys', p.BytesType, None), + 6: ('tx_prefix_hash', p.BytesType, None), + 7: ('reason', p.UVarintType, None), + 8: ('view_public_key', p.BytesType, None), } diff --git a/python/src/trezorlib/messages/MoneroGetWatchKey.py b/python/src/trezorlib/messages/MoneroGetWatchKey.py index 4042391fe..3d2ca972a 100644 --- a/python/src/trezorlib/messages/MoneroGetWatchKey.py +++ b/python/src/trezorlib/messages/MoneroGetWatchKey.py @@ -15,6 +15,7 @@ class MoneroGetWatchKey(p.MessageType): def __init__( self, + *, address_n: List[int] = None, network_type: int = None, ) -> None: @@ -25,5 +26,5 @@ class MoneroGetWatchKey(p.MessageType): def get_fields(cls) -> Dict: return { 1: ('address_n', p.UVarintType, p.FLAG_REPEATED), - 2: ('network_type', p.UVarintType, 0), + 2: ('network_type', p.UVarintType, None), } diff --git a/python/src/trezorlib/messages/MoneroKeyImageExportInitRequest.py b/python/src/trezorlib/messages/MoneroKeyImageExportInitRequest.py index a7b5e93c1..6d8a21a86 100644 --- a/python/src/trezorlib/messages/MoneroKeyImageExportInitRequest.py +++ b/python/src/trezorlib/messages/MoneroKeyImageExportInitRequest.py @@ -17,24 +17,25 @@ class MoneroKeyImageExportInitRequest(p.MessageType): def __init__( self, + *, + address_n: List[int] = None, + subs: List[MoneroSubAddressIndicesList] = None, num: int = None, hash: bytes = None, - address_n: List[int] = None, network_type: int = None, - subs: List[MoneroSubAddressIndicesList] = None, ) -> None: + self.address_n = address_n if address_n is not None else [] + self.subs = subs if subs is not None else [] self.num = num self.hash = hash - self.address_n = address_n if address_n is not None else [] self.network_type = network_type - self.subs = subs if subs is not None else [] @classmethod def get_fields(cls) -> Dict: return { - 1: ('num', p.UVarintType, 0), - 2: ('hash', p.BytesType, 0), + 1: ('num', p.UVarintType, None), + 2: ('hash', p.BytesType, None), 3: ('address_n', p.UVarintType, p.FLAG_REPEATED), - 4: ('network_type', p.UVarintType, 0), + 4: ('network_type', p.UVarintType, None), 5: ('subs', MoneroSubAddressIndicesList, p.FLAG_REPEATED), } diff --git a/python/src/trezorlib/messages/MoneroKeyImageSyncFinalAck.py b/python/src/trezorlib/messages/MoneroKeyImageSyncFinalAck.py index e6ff1ccf0..99b962597 100644 --- a/python/src/trezorlib/messages/MoneroKeyImageSyncFinalAck.py +++ b/python/src/trezorlib/messages/MoneroKeyImageSyncFinalAck.py @@ -15,6 +15,7 @@ class MoneroKeyImageSyncFinalAck(p.MessageType): def __init__( self, + *, enc_key: bytes = None, ) -> None: self.enc_key = enc_key @@ -22,5 +23,5 @@ class MoneroKeyImageSyncFinalAck(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('enc_key', p.BytesType, 0), + 1: ('enc_key', p.BytesType, None), } diff --git a/python/src/trezorlib/messages/MoneroKeyImageSyncStepAck.py b/python/src/trezorlib/messages/MoneroKeyImageSyncStepAck.py index 50dd33ff7..2bea8b23a 100644 --- a/python/src/trezorlib/messages/MoneroKeyImageSyncStepAck.py +++ b/python/src/trezorlib/messages/MoneroKeyImageSyncStepAck.py @@ -17,6 +17,7 @@ class MoneroKeyImageSyncStepAck(p.MessageType): def __init__( self, + *, kis: List[MoneroExportedKeyImage] = None, ) -> None: self.kis = kis if kis is not None else [] diff --git a/python/src/trezorlib/messages/MoneroKeyImageSyncStepRequest.py b/python/src/trezorlib/messages/MoneroKeyImageSyncStepRequest.py index a865ba53a..18e370c35 100644 --- a/python/src/trezorlib/messages/MoneroKeyImageSyncStepRequest.py +++ b/python/src/trezorlib/messages/MoneroKeyImageSyncStepRequest.py @@ -17,6 +17,7 @@ class MoneroKeyImageSyncStepRequest(p.MessageType): def __init__( self, + *, tdis: List[MoneroTransferDetails] = None, ) -> None: self.tdis = tdis if tdis is not None else [] diff --git a/python/src/trezorlib/messages/MoneroLiveRefreshStartRequest.py b/python/src/trezorlib/messages/MoneroLiveRefreshStartRequest.py index 0eb390c55..f7c008234 100644 --- a/python/src/trezorlib/messages/MoneroLiveRefreshStartRequest.py +++ b/python/src/trezorlib/messages/MoneroLiveRefreshStartRequest.py @@ -15,6 +15,7 @@ class MoneroLiveRefreshStartRequest(p.MessageType): def __init__( self, + *, address_n: List[int] = None, network_type: int = None, ) -> None: @@ -25,5 +26,5 @@ class MoneroLiveRefreshStartRequest(p.MessageType): def get_fields(cls) -> Dict: return { 1: ('address_n', p.UVarintType, p.FLAG_REPEATED), - 2: ('network_type', p.UVarintType, 0), + 2: ('network_type', p.UVarintType, None), } diff --git a/python/src/trezorlib/messages/MoneroLiveRefreshStepAck.py b/python/src/trezorlib/messages/MoneroLiveRefreshStepAck.py index 13e2b501f..d0c3a8735 100644 --- a/python/src/trezorlib/messages/MoneroLiveRefreshStepAck.py +++ b/python/src/trezorlib/messages/MoneroLiveRefreshStepAck.py @@ -15,6 +15,7 @@ class MoneroLiveRefreshStepAck(p.MessageType): def __init__( self, + *, salt: bytes = None, key_image: bytes = None, ) -> None: @@ -24,6 +25,6 @@ class MoneroLiveRefreshStepAck(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('salt', p.BytesType, 0), - 2: ('key_image', p.BytesType, 0), + 1: ('salt', p.BytesType, None), + 2: ('key_image', p.BytesType, None), } diff --git a/python/src/trezorlib/messages/MoneroLiveRefreshStepRequest.py b/python/src/trezorlib/messages/MoneroLiveRefreshStepRequest.py index 06049441a..870c8ee60 100644 --- a/python/src/trezorlib/messages/MoneroLiveRefreshStepRequest.py +++ b/python/src/trezorlib/messages/MoneroLiveRefreshStepRequest.py @@ -15,6 +15,7 @@ class MoneroLiveRefreshStepRequest(p.MessageType): def __init__( self, + *, out_key: bytes = None, recv_deriv: bytes = None, real_out_idx: int = None, @@ -30,9 +31,9 @@ class MoneroLiveRefreshStepRequest(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('out_key', p.BytesType, 0), - 2: ('recv_deriv', p.BytesType, 0), - 3: ('real_out_idx', p.UVarintType, 0), - 4: ('sub_addr_major', p.UVarintType, 0), - 5: ('sub_addr_minor', p.UVarintType, 0), + 1: ('out_key', p.BytesType, None), + 2: ('recv_deriv', p.BytesType, None), + 3: ('real_out_idx', p.UVarintType, None), + 4: ('sub_addr_major', p.UVarintType, None), + 5: ('sub_addr_minor', p.UVarintType, None), } diff --git a/python/src/trezorlib/messages/MoneroMultisigKLRki.py b/python/src/trezorlib/messages/MoneroMultisigKLRki.py index c7adbf5d6..f8e78b0a7 100644 --- a/python/src/trezorlib/messages/MoneroMultisigKLRki.py +++ b/python/src/trezorlib/messages/MoneroMultisigKLRki.py @@ -14,6 +14,7 @@ class MoneroMultisigKLRki(p.MessageType): def __init__( self, + *, K: bytes = None, L: bytes = None, R: bytes = None, @@ -27,8 +28,8 @@ class MoneroMultisigKLRki(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('K', p.BytesType, 0), - 2: ('L', p.BytesType, 0), - 3: ('R', p.BytesType, 0), - 4: ('ki', p.BytesType, 0), + 1: ('K', p.BytesType, None), + 2: ('L', p.BytesType, None), + 3: ('R', p.BytesType, None), + 4: ('ki', p.BytesType, None), } diff --git a/python/src/trezorlib/messages/MoneroOutputEntry.py b/python/src/trezorlib/messages/MoneroOutputEntry.py index f24eb7796..915059f38 100644 --- a/python/src/trezorlib/messages/MoneroOutputEntry.py +++ b/python/src/trezorlib/messages/MoneroOutputEntry.py @@ -16,6 +16,7 @@ class MoneroOutputEntry(p.MessageType): def __init__( self, + *, idx: int = None, key: MoneroRctKeyPublic = None, ) -> None: @@ -25,6 +26,6 @@ class MoneroOutputEntry(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('idx', p.UVarintType, 0), - 2: ('key', MoneroRctKeyPublic, 0), + 1: ('idx', p.UVarintType, None), + 2: ('key', MoneroRctKeyPublic, None), } diff --git a/python/src/trezorlib/messages/MoneroRctKeyPublic.py b/python/src/trezorlib/messages/MoneroRctKeyPublic.py index 250a97a2d..580e90e20 100644 --- a/python/src/trezorlib/messages/MoneroRctKeyPublic.py +++ b/python/src/trezorlib/messages/MoneroRctKeyPublic.py @@ -14,6 +14,7 @@ class MoneroRctKeyPublic(p.MessageType): def __init__( self, + *, dest: bytes = None, commitment: bytes = None, ) -> None: @@ -23,6 +24,6 @@ class MoneroRctKeyPublic(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('dest', p.BytesType, 0), - 2: ('commitment', p.BytesType, 0), + 1: ('dest', p.BytesType, None), + 2: ('commitment', p.BytesType, None), } diff --git a/python/src/trezorlib/messages/MoneroRingCtSig.py b/python/src/trezorlib/messages/MoneroRingCtSig.py index 051134d13..b7fe2fb38 100644 --- a/python/src/trezorlib/messages/MoneroRingCtSig.py +++ b/python/src/trezorlib/messages/MoneroRingCtSig.py @@ -14,6 +14,7 @@ class MoneroRingCtSig(p.MessageType): def __init__( self, + *, txn_fee: int = None, message: bytes = None, rv_type: int = None, @@ -25,7 +26,7 @@ class MoneroRingCtSig(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('txn_fee', p.UVarintType, 0), - 2: ('message', p.BytesType, 0), - 3: ('rv_type', p.UVarintType, 0), + 1: ('txn_fee', p.UVarintType, None), + 2: ('message', p.BytesType, None), + 3: ('rv_type', p.UVarintType, None), } diff --git a/python/src/trezorlib/messages/MoneroSubAddressIndicesList.py b/python/src/trezorlib/messages/MoneroSubAddressIndicesList.py index c74cea642..a1398040d 100644 --- a/python/src/trezorlib/messages/MoneroSubAddressIndicesList.py +++ b/python/src/trezorlib/messages/MoneroSubAddressIndicesList.py @@ -14,15 +14,16 @@ class MoneroSubAddressIndicesList(p.MessageType): def __init__( self, - account: int = None, + *, minor_indices: List[int] = None, + account: int = None, ) -> None: - self.account = account self.minor_indices = minor_indices if minor_indices is not None else [] + self.account = account @classmethod def get_fields(cls) -> Dict: return { - 1: ('account', p.UVarintType, 0), + 1: ('account', p.UVarintType, None), 2: ('minor_indices', p.UVarintType, p.FLAG_REPEATED), } diff --git a/python/src/trezorlib/messages/MoneroTransactionAllInputsSetAck.py b/python/src/trezorlib/messages/MoneroTransactionAllInputsSetAck.py index 33ac79184..6eb4b4459 100644 --- a/python/src/trezorlib/messages/MoneroTransactionAllInputsSetAck.py +++ b/python/src/trezorlib/messages/MoneroTransactionAllInputsSetAck.py @@ -17,6 +17,7 @@ class MoneroTransactionAllInputsSetAck(p.MessageType): def __init__( self, + *, rsig_data: MoneroTransactionRsigData = None, ) -> None: self.rsig_data = rsig_data @@ -24,5 +25,5 @@ class MoneroTransactionAllInputsSetAck(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('rsig_data', MoneroTransactionRsigData, 0), + 1: ('rsig_data', MoneroTransactionRsigData, None), } diff --git a/python/src/trezorlib/messages/MoneroTransactionAllOutSetAck.py b/python/src/trezorlib/messages/MoneroTransactionAllOutSetAck.py index d16063b21..c37884d43 100644 --- a/python/src/trezorlib/messages/MoneroTransactionAllOutSetAck.py +++ b/python/src/trezorlib/messages/MoneroTransactionAllOutSetAck.py @@ -17,6 +17,7 @@ class MoneroTransactionAllOutSetAck(p.MessageType): def __init__( self, + *, extra: bytes = None, tx_prefix_hash: bytes = None, rv: MoneroRingCtSig = None, @@ -30,8 +31,8 @@ class MoneroTransactionAllOutSetAck(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('extra', p.BytesType, 0), - 2: ('tx_prefix_hash', p.BytesType, 0), - 4: ('rv', MoneroRingCtSig, 0), - 5: ('full_message_hash', p.BytesType, 0), + 1: ('extra', p.BytesType, None), + 2: ('tx_prefix_hash', p.BytesType, None), + 4: ('rv', MoneroRingCtSig, None), + 5: ('full_message_hash', p.BytesType, None), } diff --git a/python/src/trezorlib/messages/MoneroTransactionAllOutSetRequest.py b/python/src/trezorlib/messages/MoneroTransactionAllOutSetRequest.py index b6bf2393a..0650fb70c 100644 --- a/python/src/trezorlib/messages/MoneroTransactionAllOutSetRequest.py +++ b/python/src/trezorlib/messages/MoneroTransactionAllOutSetRequest.py @@ -17,6 +17,7 @@ class MoneroTransactionAllOutSetRequest(p.MessageType): def __init__( self, + *, rsig_data: MoneroTransactionRsigData = None, ) -> None: self.rsig_data = rsig_data @@ -24,5 +25,5 @@ class MoneroTransactionAllOutSetRequest(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('rsig_data', MoneroTransactionRsigData, 0), + 1: ('rsig_data', MoneroTransactionRsigData, None), } diff --git a/python/src/trezorlib/messages/MoneroTransactionData.py b/python/src/trezorlib/messages/MoneroTransactionData.py index d46c2294d..84c6093b1 100644 --- a/python/src/trezorlib/messages/MoneroTransactionData.py +++ b/python/src/trezorlib/messages/MoneroTransactionData.py @@ -17,34 +17,35 @@ class MoneroTransactionData(p.MessageType): def __init__( self, + *, + outputs: List[MoneroTransactionDestinationEntry] = None, + minor_indices: List[int] = None, + integrated_indices: List[int] = None, version: int = None, payment_id: bytes = None, unlock_time: int = None, - outputs: List[MoneroTransactionDestinationEntry] = None, change_dts: MoneroTransactionDestinationEntry = None, num_inputs: int = None, mixin: int = None, fee: int = None, account: int = None, - minor_indices: List[int] = None, rsig_data: MoneroTransactionRsigData = None, - integrated_indices: List[int] = None, client_version: int = None, hard_fork: int = None, monero_version: bytes = None, ) -> None: + self.outputs = outputs if outputs is not None else [] + self.minor_indices = minor_indices if minor_indices is not None else [] + self.integrated_indices = integrated_indices if integrated_indices is not None else [] self.version = version self.payment_id = payment_id self.unlock_time = unlock_time - self.outputs = outputs if outputs is not None else [] self.change_dts = change_dts self.num_inputs = num_inputs self.mixin = mixin self.fee = fee self.account = account - self.minor_indices = minor_indices if minor_indices is not None else [] self.rsig_data = rsig_data - self.integrated_indices = integrated_indices if integrated_indices is not None else [] self.client_version = client_version self.hard_fork = hard_fork self.monero_version = monero_version @@ -52,19 +53,19 @@ class MoneroTransactionData(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('version', p.UVarintType, 0), - 2: ('payment_id', p.BytesType, 0), - 3: ('unlock_time', p.UVarintType, 0), + 1: ('version', p.UVarintType, None), + 2: ('payment_id', p.BytesType, None), + 3: ('unlock_time', p.UVarintType, None), 4: ('outputs', MoneroTransactionDestinationEntry, p.FLAG_REPEATED), - 5: ('change_dts', MoneroTransactionDestinationEntry, 0), - 6: ('num_inputs', p.UVarintType, 0), - 7: ('mixin', p.UVarintType, 0), - 8: ('fee', p.UVarintType, 0), - 9: ('account', p.UVarintType, 0), + 5: ('change_dts', MoneroTransactionDestinationEntry, None), + 6: ('num_inputs', p.UVarintType, None), + 7: ('mixin', p.UVarintType, None), + 8: ('fee', p.UVarintType, None), + 9: ('account', p.UVarintType, None), 10: ('minor_indices', p.UVarintType, p.FLAG_REPEATED), - 11: ('rsig_data', MoneroTransactionRsigData, 0), + 11: ('rsig_data', MoneroTransactionRsigData, None), 12: ('integrated_indices', p.UVarintType, p.FLAG_REPEATED), - 13: ('client_version', p.UVarintType, 0), - 14: ('hard_fork', p.UVarintType, 0), - 15: ('monero_version', p.BytesType, 0), + 13: ('client_version', p.UVarintType, None), + 14: ('hard_fork', p.UVarintType, None), + 15: ('monero_version', p.BytesType, None), } diff --git a/python/src/trezorlib/messages/MoneroTransactionDestinationEntry.py b/python/src/trezorlib/messages/MoneroTransactionDestinationEntry.py index 18bee8a7d..5d805417d 100644 --- a/python/src/trezorlib/messages/MoneroTransactionDestinationEntry.py +++ b/python/src/trezorlib/messages/MoneroTransactionDestinationEntry.py @@ -16,6 +16,7 @@ class MoneroTransactionDestinationEntry(p.MessageType): def __init__( self, + *, amount: int = None, addr: MoneroAccountPublicAddress = None, is_subaddress: bool = None, @@ -31,9 +32,9 @@ class MoneroTransactionDestinationEntry(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('amount', p.UVarintType, 0), - 2: ('addr', MoneroAccountPublicAddress, 0), - 3: ('is_subaddress', p.BoolType, 0), - 4: ('original', p.BytesType, 0), - 5: ('is_integrated', p.BoolType, 0), + 1: ('amount', p.UVarintType, None), + 2: ('addr', MoneroAccountPublicAddress, None), + 3: ('is_subaddress', p.BoolType, None), + 4: ('original', p.BytesType, None), + 5: ('is_integrated', p.BoolType, None), } diff --git a/python/src/trezorlib/messages/MoneroTransactionFinalAck.py b/python/src/trezorlib/messages/MoneroTransactionFinalAck.py index f5f2fce1d..422705029 100644 --- a/python/src/trezorlib/messages/MoneroTransactionFinalAck.py +++ b/python/src/trezorlib/messages/MoneroTransactionFinalAck.py @@ -15,6 +15,7 @@ class MoneroTransactionFinalAck(p.MessageType): def __init__( self, + *, cout_key: bytes = None, salt: bytes = None, rand_mult: bytes = None, @@ -30,9 +31,9 @@ class MoneroTransactionFinalAck(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('cout_key', p.BytesType, 0), - 2: ('salt', p.BytesType, 0), - 3: ('rand_mult', p.BytesType, 0), - 4: ('tx_enc_keys', p.BytesType, 0), - 5: ('opening_key', p.BytesType, 0), + 1: ('cout_key', p.BytesType, None), + 2: ('salt', p.BytesType, None), + 3: ('rand_mult', p.BytesType, None), + 4: ('tx_enc_keys', p.BytesType, None), + 5: ('opening_key', p.BytesType, None), } diff --git a/python/src/trezorlib/messages/MoneroTransactionInitAck.py b/python/src/trezorlib/messages/MoneroTransactionInitAck.py index b4f44ff50..380b28f3f 100644 --- a/python/src/trezorlib/messages/MoneroTransactionInitAck.py +++ b/python/src/trezorlib/messages/MoneroTransactionInitAck.py @@ -17,6 +17,7 @@ class MoneroTransactionInitAck(p.MessageType): def __init__( self, + *, hmacs: List[bytes] = None, rsig_data: MoneroTransactionRsigData = None, ) -> None: @@ -27,5 +28,5 @@ class MoneroTransactionInitAck(p.MessageType): def get_fields(cls) -> Dict: return { 1: ('hmacs', p.BytesType, p.FLAG_REPEATED), - 2: ('rsig_data', MoneroTransactionRsigData, 0), + 2: ('rsig_data', MoneroTransactionRsigData, None), } diff --git a/python/src/trezorlib/messages/MoneroTransactionInitRequest.py b/python/src/trezorlib/messages/MoneroTransactionInitRequest.py index f3d202bab..2e092a27e 100644 --- a/python/src/trezorlib/messages/MoneroTransactionInitRequest.py +++ b/python/src/trezorlib/messages/MoneroTransactionInitRequest.py @@ -17,21 +17,22 @@ class MoneroTransactionInitRequest(p.MessageType): def __init__( self, - version: int = None, + *, address_n: List[int] = None, + version: int = None, network_type: int = None, tsx_data: MoneroTransactionData = None, ) -> None: - self.version = version self.address_n = address_n if address_n is not None else [] + self.version = version self.network_type = network_type self.tsx_data = tsx_data @classmethod def get_fields(cls) -> Dict: return { - 1: ('version', p.UVarintType, 0), + 1: ('version', p.UVarintType, None), 2: ('address_n', p.UVarintType, p.FLAG_REPEATED), - 3: ('network_type', p.UVarintType, 0), - 4: ('tsx_data', MoneroTransactionData, 0), + 3: ('network_type', p.UVarintType, None), + 4: ('tsx_data', MoneroTransactionData, None), } diff --git a/python/src/trezorlib/messages/MoneroTransactionInputViniRequest.py b/python/src/trezorlib/messages/MoneroTransactionInputViniRequest.py index c62f29a52..aa2e90897 100644 --- a/python/src/trezorlib/messages/MoneroTransactionInputViniRequest.py +++ b/python/src/trezorlib/messages/MoneroTransactionInputViniRequest.py @@ -17,6 +17,7 @@ class MoneroTransactionInputViniRequest(p.MessageType): def __init__( self, + *, src_entr: MoneroTransactionSourceEntry = None, vini: bytes = None, vini_hmac: bytes = None, @@ -34,10 +35,10 @@ class MoneroTransactionInputViniRequest(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('src_entr', MoneroTransactionSourceEntry, 0), - 2: ('vini', p.BytesType, 0), - 3: ('vini_hmac', p.BytesType, 0), - 4: ('pseudo_out', p.BytesType, 0), - 5: ('pseudo_out_hmac', p.BytesType, 0), - 6: ('orig_idx', p.UVarintType, 0), + 1: ('src_entr', MoneroTransactionSourceEntry, None), + 2: ('vini', p.BytesType, None), + 3: ('vini_hmac', p.BytesType, None), + 4: ('pseudo_out', p.BytesType, None), + 5: ('pseudo_out_hmac', p.BytesType, None), + 6: ('orig_idx', p.UVarintType, None), } diff --git a/python/src/trezorlib/messages/MoneroTransactionInputsPermutationRequest.py b/python/src/trezorlib/messages/MoneroTransactionInputsPermutationRequest.py index 86e23b345..2f6c68328 100644 --- a/python/src/trezorlib/messages/MoneroTransactionInputsPermutationRequest.py +++ b/python/src/trezorlib/messages/MoneroTransactionInputsPermutationRequest.py @@ -15,6 +15,7 @@ class MoneroTransactionInputsPermutationRequest(p.MessageType): def __init__( self, + *, perm: List[int] = None, ) -> None: self.perm = perm if perm is not None else [] diff --git a/python/src/trezorlib/messages/MoneroTransactionRsigData.py b/python/src/trezorlib/messages/MoneroTransactionRsigData.py index 924bb8c9d..fd5cd877a 100644 --- a/python/src/trezorlib/messages/MoneroTransactionRsigData.py +++ b/python/src/trezorlib/messages/MoneroTransactionRsigData.py @@ -14,30 +14,31 @@ class MoneroTransactionRsigData(p.MessageType): def __init__( self, + *, + grouping: List[int] = None, + rsig_parts: List[bytes] = None, rsig_type: int = None, offload_type: int = None, - grouping: List[int] = None, mask: bytes = None, rsig: bytes = None, - rsig_parts: List[bytes] = None, bp_version: int = None, ) -> None: + self.grouping = grouping if grouping is not None else [] + self.rsig_parts = rsig_parts if rsig_parts is not None else [] self.rsig_type = rsig_type self.offload_type = offload_type - self.grouping = grouping if grouping is not None else [] self.mask = mask self.rsig = rsig - self.rsig_parts = rsig_parts if rsig_parts is not None else [] self.bp_version = bp_version @classmethod def get_fields(cls) -> Dict: return { - 1: ('rsig_type', p.UVarintType, 0), - 2: ('offload_type', p.UVarintType, 0), + 1: ('rsig_type', p.UVarintType, None), + 2: ('offload_type', p.UVarintType, None), 3: ('grouping', p.UVarintType, p.FLAG_REPEATED), - 4: ('mask', p.BytesType, 0), - 5: ('rsig', p.BytesType, 0), + 4: ('mask', p.BytesType, None), + 5: ('rsig', p.BytesType, None), 6: ('rsig_parts', p.BytesType, p.FLAG_REPEATED), - 7: ('bp_version', p.UVarintType, 0), + 7: ('bp_version', p.UVarintType, None), } diff --git a/python/src/trezorlib/messages/MoneroTransactionSetInputAck.py b/python/src/trezorlib/messages/MoneroTransactionSetInputAck.py index 4c42f9470..679831a7b 100644 --- a/python/src/trezorlib/messages/MoneroTransactionSetInputAck.py +++ b/python/src/trezorlib/messages/MoneroTransactionSetInputAck.py @@ -15,6 +15,7 @@ class MoneroTransactionSetInputAck(p.MessageType): def __init__( self, + *, vini: bytes = None, vini_hmac: bytes = None, pseudo_out: bytes = None, @@ -32,10 +33,10 @@ class MoneroTransactionSetInputAck(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('vini', p.BytesType, 0), - 2: ('vini_hmac', p.BytesType, 0), - 3: ('pseudo_out', p.BytesType, 0), - 4: ('pseudo_out_hmac', p.BytesType, 0), - 5: ('pseudo_out_alpha', p.BytesType, 0), - 6: ('spend_key', p.BytesType, 0), + 1: ('vini', p.BytesType, None), + 2: ('vini_hmac', p.BytesType, None), + 3: ('pseudo_out', p.BytesType, None), + 4: ('pseudo_out_hmac', p.BytesType, None), + 5: ('pseudo_out_alpha', p.BytesType, None), + 6: ('spend_key', p.BytesType, None), } diff --git a/python/src/trezorlib/messages/MoneroTransactionSetInputRequest.py b/python/src/trezorlib/messages/MoneroTransactionSetInputRequest.py index c1e8fd411..ca1e9ae98 100644 --- a/python/src/trezorlib/messages/MoneroTransactionSetInputRequest.py +++ b/python/src/trezorlib/messages/MoneroTransactionSetInputRequest.py @@ -17,6 +17,7 @@ class MoneroTransactionSetInputRequest(p.MessageType): def __init__( self, + *, src_entr: MoneroTransactionSourceEntry = None, ) -> None: self.src_entr = src_entr @@ -24,5 +25,5 @@ class MoneroTransactionSetInputRequest(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('src_entr', MoneroTransactionSourceEntry, 0), + 1: ('src_entr', MoneroTransactionSourceEntry, None), } diff --git a/python/src/trezorlib/messages/MoneroTransactionSetOutputAck.py b/python/src/trezorlib/messages/MoneroTransactionSetOutputAck.py index b53398641..1dc0930cc 100644 --- a/python/src/trezorlib/messages/MoneroTransactionSetOutputAck.py +++ b/python/src/trezorlib/messages/MoneroTransactionSetOutputAck.py @@ -17,6 +17,7 @@ class MoneroTransactionSetOutputAck(p.MessageType): def __init__( self, + *, tx_out: bytes = None, vouti_hmac: bytes = None, rsig_data: MoneroTransactionRsigData = None, @@ -32,9 +33,9 @@ class MoneroTransactionSetOutputAck(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('tx_out', p.BytesType, 0), - 2: ('vouti_hmac', p.BytesType, 0), - 3: ('rsig_data', MoneroTransactionRsigData, 0), - 4: ('out_pk', p.BytesType, 0), - 5: ('ecdh_info', p.BytesType, 0), + 1: ('tx_out', p.BytesType, None), + 2: ('vouti_hmac', p.BytesType, None), + 3: ('rsig_data', MoneroTransactionRsigData, None), + 4: ('out_pk', p.BytesType, None), + 5: ('ecdh_info', p.BytesType, None), } diff --git a/python/src/trezorlib/messages/MoneroTransactionSetOutputRequest.py b/python/src/trezorlib/messages/MoneroTransactionSetOutputRequest.py index 6c4a671ce..6c613c94d 100644 --- a/python/src/trezorlib/messages/MoneroTransactionSetOutputRequest.py +++ b/python/src/trezorlib/messages/MoneroTransactionSetOutputRequest.py @@ -18,6 +18,7 @@ class MoneroTransactionSetOutputRequest(p.MessageType): def __init__( self, + *, dst_entr: MoneroTransactionDestinationEntry = None, dst_entr_hmac: bytes = None, rsig_data: MoneroTransactionRsigData = None, @@ -31,8 +32,8 @@ class MoneroTransactionSetOutputRequest(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('dst_entr', MoneroTransactionDestinationEntry, 0), - 2: ('dst_entr_hmac', p.BytesType, 0), - 3: ('rsig_data', MoneroTransactionRsigData, 0), - 4: ('is_offloaded_bp', p.BoolType, 0), + 1: ('dst_entr', MoneroTransactionDestinationEntry, None), + 2: ('dst_entr_hmac', p.BytesType, None), + 3: ('rsig_data', MoneroTransactionRsigData, None), + 4: ('is_offloaded_bp', p.BoolType, None), } diff --git a/python/src/trezorlib/messages/MoneroTransactionSignInputAck.py b/python/src/trezorlib/messages/MoneroTransactionSignInputAck.py index 61da74be0..a5022897b 100644 --- a/python/src/trezorlib/messages/MoneroTransactionSignInputAck.py +++ b/python/src/trezorlib/messages/MoneroTransactionSignInputAck.py @@ -15,6 +15,7 @@ class MoneroTransactionSignInputAck(p.MessageType): def __init__( self, + *, signature: bytes = None, pseudo_out: bytes = None, ) -> None: @@ -24,6 +25,6 @@ class MoneroTransactionSignInputAck(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('signature', p.BytesType, 0), - 2: ('pseudo_out', p.BytesType, 0), + 1: ('signature', p.BytesType, None), + 2: ('pseudo_out', p.BytesType, None), } diff --git a/python/src/trezorlib/messages/MoneroTransactionSignInputRequest.py b/python/src/trezorlib/messages/MoneroTransactionSignInputRequest.py index 32f2e960f..05dbd0ef5 100644 --- a/python/src/trezorlib/messages/MoneroTransactionSignInputRequest.py +++ b/python/src/trezorlib/messages/MoneroTransactionSignInputRequest.py @@ -17,6 +17,7 @@ class MoneroTransactionSignInputRequest(p.MessageType): def __init__( self, + *, src_entr: MoneroTransactionSourceEntry = None, vini: bytes = None, vini_hmac: bytes = None, @@ -38,12 +39,12 @@ class MoneroTransactionSignInputRequest(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('src_entr', MoneroTransactionSourceEntry, 0), - 2: ('vini', p.BytesType, 0), - 3: ('vini_hmac', p.BytesType, 0), - 4: ('pseudo_out', p.BytesType, 0), - 5: ('pseudo_out_hmac', p.BytesType, 0), - 6: ('pseudo_out_alpha', p.BytesType, 0), - 7: ('spend_key', p.BytesType, 0), - 8: ('orig_idx', p.UVarintType, 0), + 1: ('src_entr', MoneroTransactionSourceEntry, None), + 2: ('vini', p.BytesType, None), + 3: ('vini_hmac', p.BytesType, None), + 4: ('pseudo_out', p.BytesType, None), + 5: ('pseudo_out_hmac', p.BytesType, None), + 6: ('pseudo_out_alpha', p.BytesType, None), + 7: ('spend_key', p.BytesType, None), + 8: ('orig_idx', p.UVarintType, None), } diff --git a/python/src/trezorlib/messages/MoneroTransactionSourceEntry.py b/python/src/trezorlib/messages/MoneroTransactionSourceEntry.py index c7c300ee9..446e78b65 100644 --- a/python/src/trezorlib/messages/MoneroTransactionSourceEntry.py +++ b/python/src/trezorlib/messages/MoneroTransactionSourceEntry.py @@ -17,10 +17,11 @@ class MoneroTransactionSourceEntry(p.MessageType): def __init__( self, + *, outputs: List[MoneroOutputEntry] = None, + real_out_additional_tx_keys: List[bytes] = None, real_output: int = None, real_out_tx_key: bytes = None, - real_out_additional_tx_keys: List[bytes] = None, real_output_in_tx_index: int = None, amount: int = None, rct: bool = None, @@ -29,9 +30,9 @@ class MoneroTransactionSourceEntry(p.MessageType): subaddr_minor: int = None, ) -> None: self.outputs = outputs if outputs is not None else [] + self.real_out_additional_tx_keys = real_out_additional_tx_keys if real_out_additional_tx_keys is not None else [] self.real_output = real_output self.real_out_tx_key = real_out_tx_key - self.real_out_additional_tx_keys = real_out_additional_tx_keys if real_out_additional_tx_keys is not None else [] self.real_output_in_tx_index = real_output_in_tx_index self.amount = amount self.rct = rct @@ -43,13 +44,13 @@ class MoneroTransactionSourceEntry(p.MessageType): def get_fields(cls) -> Dict: return { 1: ('outputs', MoneroOutputEntry, p.FLAG_REPEATED), - 2: ('real_output', p.UVarintType, 0), - 3: ('real_out_tx_key', p.BytesType, 0), + 2: ('real_output', p.UVarintType, None), + 3: ('real_out_tx_key', p.BytesType, None), 4: ('real_out_additional_tx_keys', p.BytesType, p.FLAG_REPEATED), - 5: ('real_output_in_tx_index', p.UVarintType, 0), - 6: ('amount', p.UVarintType, 0), - 7: ('rct', p.BoolType, 0), - 8: ('mask', p.BytesType, 0), - 9: ('multisig_kLRki', MoneroMultisigKLRki, 0), - 10: ('subaddr_minor', p.UVarintType, 0), + 5: ('real_output_in_tx_index', p.UVarintType, None), + 6: ('amount', p.UVarintType, None), + 7: ('rct', p.BoolType, None), + 8: ('mask', p.BytesType, None), + 9: ('multisig_kLRki', MoneroMultisigKLRki, None), + 10: ('subaddr_minor', p.UVarintType, None), } diff --git a/python/src/trezorlib/messages/MoneroTransferDetails.py b/python/src/trezorlib/messages/MoneroTransferDetails.py index b86597e7f..7267a9bbb 100644 --- a/python/src/trezorlib/messages/MoneroTransferDetails.py +++ b/python/src/trezorlib/messages/MoneroTransferDetails.py @@ -14,16 +14,17 @@ class MoneroTransferDetails(p.MessageType): def __init__( self, + *, + additional_tx_pub_keys: List[bytes] = None, out_key: bytes = None, tx_pub_key: bytes = None, - additional_tx_pub_keys: List[bytes] = None, internal_output_index: int = None, sub_addr_major: int = None, sub_addr_minor: int = None, ) -> None: + self.additional_tx_pub_keys = additional_tx_pub_keys if additional_tx_pub_keys is not None else [] self.out_key = out_key self.tx_pub_key = tx_pub_key - self.additional_tx_pub_keys = additional_tx_pub_keys if additional_tx_pub_keys is not None else [] self.internal_output_index = internal_output_index self.sub_addr_major = sub_addr_major self.sub_addr_minor = sub_addr_minor @@ -31,10 +32,10 @@ class MoneroTransferDetails(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('out_key', p.BytesType, 0), - 2: ('tx_pub_key', p.BytesType, 0), + 1: ('out_key', p.BytesType, None), + 2: ('tx_pub_key', p.BytesType, None), 3: ('additional_tx_pub_keys', p.BytesType, p.FLAG_REPEATED), - 4: ('internal_output_index', p.UVarintType, 0), - 5: ('sub_addr_major', p.UVarintType, 0), - 6: ('sub_addr_minor', p.UVarintType, 0), + 4: ('internal_output_index', p.UVarintType, None), + 5: ('sub_addr_major', p.UVarintType, None), + 6: ('sub_addr_minor', p.UVarintType, None), } diff --git a/python/src/trezorlib/messages/MoneroWatchKey.py b/python/src/trezorlib/messages/MoneroWatchKey.py index 4695cdb81..e05254646 100644 --- a/python/src/trezorlib/messages/MoneroWatchKey.py +++ b/python/src/trezorlib/messages/MoneroWatchKey.py @@ -15,6 +15,7 @@ class MoneroWatchKey(p.MessageType): def __init__( self, + *, watch_key: bytes = None, address: bytes = None, ) -> None: @@ -24,6 +25,6 @@ class MoneroWatchKey(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('watch_key', p.BytesType, 0), - 2: ('address', p.BytesType, 0), + 1: ('watch_key', p.BytesType, None), + 2: ('address', p.BytesType, None), } diff --git a/python/src/trezorlib/messages/MultisigRedeemScriptType.py b/python/src/trezorlib/messages/MultisigRedeemScriptType.py index c4558b159..614e45b69 100644 --- a/python/src/trezorlib/messages/MultisigRedeemScriptType.py +++ b/python/src/trezorlib/messages/MultisigRedeemScriptType.py @@ -17,24 +17,25 @@ class MultisigRedeemScriptType(p.MessageType): def __init__( self, + *, + m: int, pubkeys: List[HDNodePathType] = None, signatures: List[bytes] = None, - m: int = None, nodes: List[HDNodeType] = None, address_n: List[int] = None, ) -> None: self.pubkeys = pubkeys if pubkeys is not None else [] self.signatures = signatures if signatures is not None else [] - self.m = m self.nodes = nodes if nodes is not None else [] self.address_n = address_n if address_n is not None else [] + self.m = m @classmethod def get_fields(cls) -> Dict: return { 1: ('pubkeys', HDNodePathType, p.FLAG_REPEATED), 2: ('signatures', p.BytesType, p.FLAG_REPEATED), - 3: ('m', p.UVarintType, 0), + 3: ('m', p.UVarintType, p.FLAG_REQUIRED), 4: ('nodes', HDNodeType, p.FLAG_REPEATED), 5: ('address_n', p.UVarintType, p.FLAG_REPEATED), } diff --git a/python/src/trezorlib/messages/NEMAddress.py b/python/src/trezorlib/messages/NEMAddress.py index 9c1831d02..2aa5c1e97 100644 --- a/python/src/trezorlib/messages/NEMAddress.py +++ b/python/src/trezorlib/messages/NEMAddress.py @@ -15,12 +15,13 @@ class NEMAddress(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, 0), # required + 1: ('address', p.UnicodeType, p.FLAG_REQUIRED), } diff --git a/python/src/trezorlib/messages/NEMAggregateModification.py b/python/src/trezorlib/messages/NEMAggregateModification.py index 604c2cf6a..1b03f7b84 100644 --- a/python/src/trezorlib/messages/NEMAggregateModification.py +++ b/python/src/trezorlib/messages/NEMAggregateModification.py @@ -16,6 +16,7 @@ class NEMAggregateModification(p.MessageType): def __init__( self, + *, modifications: List[NEMCosignatoryModification] = None, relative_change: int = None, ) -> None: @@ -26,5 +27,5 @@ class NEMAggregateModification(p.MessageType): def get_fields(cls) -> Dict: return { 1: ('modifications', NEMCosignatoryModification, p.FLAG_REPEATED), - 2: ('relative_change', p.SVarintType, 0), + 2: ('relative_change', p.SVarintType, None), } diff --git a/python/src/trezorlib/messages/NEMCosignatoryModification.py b/python/src/trezorlib/messages/NEMCosignatoryModification.py index 855bf3251..17dbd9623 100644 --- a/python/src/trezorlib/messages/NEMCosignatoryModification.py +++ b/python/src/trezorlib/messages/NEMCosignatoryModification.py @@ -15,6 +15,7 @@ class NEMCosignatoryModification(p.MessageType): def __init__( self, + *, type: EnumTypeNEMModificationType = None, public_key: bytes = None, ) -> None: @@ -24,6 +25,6 @@ class NEMCosignatoryModification(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('type', p.EnumType("NEMModificationType", (1, 2)), 0), - 2: ('public_key', p.BytesType, 0), + 1: ('type', p.EnumType("NEMModificationType", (1, 2)), None), + 2: ('public_key', p.BytesType, None), } diff --git a/python/src/trezorlib/messages/NEMDecryptMessage.py b/python/src/trezorlib/messages/NEMDecryptMessage.py index 70e5c3889..f8c809734 100644 --- a/python/src/trezorlib/messages/NEMDecryptMessage.py +++ b/python/src/trezorlib/messages/NEMDecryptMessage.py @@ -15,6 +15,7 @@ class NEMDecryptMessage(p.MessageType): def __init__( self, + *, address_n: List[int] = None, network: int = None, public_key: bytes = None, @@ -29,7 +30,7 @@ class NEMDecryptMessage(p.MessageType): def get_fields(cls) -> Dict: return { 1: ('address_n', p.UVarintType, p.FLAG_REPEATED), - 2: ('network', p.UVarintType, 0), - 3: ('public_key', p.BytesType, 0), - 4: ('payload', p.BytesType, 0), + 2: ('network', p.UVarintType, None), + 3: ('public_key', p.BytesType, None), + 4: ('payload', p.BytesType, None), } diff --git a/python/src/trezorlib/messages/NEMDecryptedMessage.py b/python/src/trezorlib/messages/NEMDecryptedMessage.py index 5647aef17..f55476d3c 100644 --- a/python/src/trezorlib/messages/NEMDecryptedMessage.py +++ b/python/src/trezorlib/messages/NEMDecryptedMessage.py @@ -15,6 +15,7 @@ class NEMDecryptedMessage(p.MessageType): def __init__( self, + *, payload: bytes = None, ) -> None: self.payload = payload @@ -22,5 +23,5 @@ class NEMDecryptedMessage(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('payload', p.BytesType, 0), + 1: ('payload', p.BytesType, None), } diff --git a/python/src/trezorlib/messages/NEMGetAddress.py b/python/src/trezorlib/messages/NEMGetAddress.py index 61a699b84..2fe0b87fe 100644 --- a/python/src/trezorlib/messages/NEMGetAddress.py +++ b/python/src/trezorlib/messages/NEMGetAddress.py @@ -15,6 +15,7 @@ class NEMGetAddress(p.MessageType): def __init__( self, + *, address_n: List[int] = None, network: int = None, show_display: bool = None, @@ -27,6 +28,6 @@ class NEMGetAddress(p.MessageType): def get_fields(cls) -> Dict: return { 1: ('address_n', p.UVarintType, p.FLAG_REPEATED), - 2: ('network', p.UVarintType, 0), - 3: ('show_display', p.BoolType, 0), + 2: ('network', p.UVarintType, None), + 3: ('show_display', p.BoolType, None), } diff --git a/python/src/trezorlib/messages/NEMImportanceTransfer.py b/python/src/trezorlib/messages/NEMImportanceTransfer.py index e0c1627c3..64edfc625 100644 --- a/python/src/trezorlib/messages/NEMImportanceTransfer.py +++ b/python/src/trezorlib/messages/NEMImportanceTransfer.py @@ -15,6 +15,7 @@ class NEMImportanceTransfer(p.MessageType): def __init__( self, + *, mode: EnumTypeNEMImportanceTransferMode = None, public_key: bytes = None, ) -> None: @@ -24,6 +25,6 @@ class NEMImportanceTransfer(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('mode', p.EnumType("NEMImportanceTransferMode", (1, 2)), 0), - 2: ('public_key', p.BytesType, 0), + 1: ('mode', p.EnumType("NEMImportanceTransferMode", (1, 2)), None), + 2: ('public_key', p.BytesType, None), } diff --git a/python/src/trezorlib/messages/NEMMosaic.py b/python/src/trezorlib/messages/NEMMosaic.py index 2864cc355..a8a756caa 100644 --- a/python/src/trezorlib/messages/NEMMosaic.py +++ b/python/src/trezorlib/messages/NEMMosaic.py @@ -14,6 +14,7 @@ class NEMMosaic(p.MessageType): def __init__( self, + *, namespace: str = None, mosaic: str = None, quantity: int = None, @@ -25,7 +26,7 @@ class NEMMosaic(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('namespace', p.UnicodeType, 0), - 2: ('mosaic', p.UnicodeType, 0), - 3: ('quantity', p.UVarintType, 0), + 1: ('namespace', p.UnicodeType, None), + 2: ('mosaic', p.UnicodeType, None), + 3: ('quantity', p.UVarintType, None), } diff --git a/python/src/trezorlib/messages/NEMMosaicCreation.py b/python/src/trezorlib/messages/NEMMosaicCreation.py index cbbe3c4e5..ea14df4a3 100644 --- a/python/src/trezorlib/messages/NEMMosaicCreation.py +++ b/python/src/trezorlib/messages/NEMMosaicCreation.py @@ -16,6 +16,7 @@ class NEMMosaicCreation(p.MessageType): def __init__( self, + *, definition: NEMMosaicDefinition = None, sink: str = None, fee: int = None, @@ -27,7 +28,7 @@ class NEMMosaicCreation(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('definition', NEMMosaicDefinition, 0), - 2: ('sink', p.UnicodeType, 0), - 3: ('fee', p.UVarintType, 0), + 1: ('definition', NEMMosaicDefinition, None), + 2: ('sink', p.UnicodeType, None), + 3: ('fee', p.UVarintType, None), } diff --git a/python/src/trezorlib/messages/NEMMosaicDefinition.py b/python/src/trezorlib/messages/NEMMosaicDefinition.py index 375c0cef1..bdbe135b5 100644 --- a/python/src/trezorlib/messages/NEMMosaicDefinition.py +++ b/python/src/trezorlib/messages/NEMMosaicDefinition.py @@ -15,6 +15,8 @@ class NEMMosaicDefinition(p.MessageType): def __init__( self, + *, + networks: List[int] = None, name: str = None, ticker: str = None, namespace: str = None, @@ -29,8 +31,8 @@ class NEMMosaicDefinition(p.MessageType): mutable_supply: bool = None, transferable: bool = None, description: str = None, - networks: List[int] = None, ) -> None: + self.networks = networks if networks is not None else [] self.name = name self.ticker = ticker self.namespace = namespace @@ -45,24 +47,23 @@ class NEMMosaicDefinition(p.MessageType): self.mutable_supply = mutable_supply self.transferable = transferable self.description = description - self.networks = networks if networks is not None else [] @classmethod def get_fields(cls) -> Dict: return { - 1: ('name', p.UnicodeType, 0), - 2: ('ticker', p.UnicodeType, 0), - 3: ('namespace', p.UnicodeType, 0), - 4: ('mosaic', p.UnicodeType, 0), - 5: ('divisibility', p.UVarintType, 0), - 6: ('levy', p.EnumType("NEMMosaicLevy", (1, 2)), 0), - 7: ('fee', p.UVarintType, 0), - 8: ('levy_address', p.UnicodeType, 0), - 9: ('levy_namespace', p.UnicodeType, 0), - 10: ('levy_mosaic', p.UnicodeType, 0), - 11: ('supply', p.UVarintType, 0), - 12: ('mutable_supply', p.BoolType, 0), - 13: ('transferable', p.BoolType, 0), - 14: ('description', p.UnicodeType, 0), + 1: ('name', p.UnicodeType, None), + 2: ('ticker', p.UnicodeType, None), + 3: ('namespace', p.UnicodeType, None), + 4: ('mosaic', p.UnicodeType, None), + 5: ('divisibility', p.UVarintType, None), + 6: ('levy', p.EnumType("NEMMosaicLevy", (1, 2)), None), + 7: ('fee', p.UVarintType, None), + 8: ('levy_address', p.UnicodeType, None), + 9: ('levy_namespace', p.UnicodeType, None), + 10: ('levy_mosaic', p.UnicodeType, None), + 11: ('supply', p.UVarintType, None), + 12: ('mutable_supply', p.BoolType, None), + 13: ('transferable', p.BoolType, None), + 14: ('description', p.UnicodeType, None), 15: ('networks', p.UVarintType, p.FLAG_REPEATED), } diff --git a/python/src/trezorlib/messages/NEMMosaicSupplyChange.py b/python/src/trezorlib/messages/NEMMosaicSupplyChange.py index de66ef935..89a21880a 100644 --- a/python/src/trezorlib/messages/NEMMosaicSupplyChange.py +++ b/python/src/trezorlib/messages/NEMMosaicSupplyChange.py @@ -15,6 +15,7 @@ class NEMMosaicSupplyChange(p.MessageType): def __init__( self, + *, namespace: str = None, mosaic: str = None, type: EnumTypeNEMSupplyChangeType = None, @@ -28,8 +29,8 @@ class NEMMosaicSupplyChange(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('namespace', p.UnicodeType, 0), - 2: ('mosaic', p.UnicodeType, 0), - 3: ('type', p.EnumType("NEMSupplyChangeType", (1, 2)), 0), - 4: ('delta', p.UVarintType, 0), + 1: ('namespace', p.UnicodeType, None), + 2: ('mosaic', p.UnicodeType, None), + 3: ('type', p.EnumType("NEMSupplyChangeType", (1, 2)), None), + 4: ('delta', p.UVarintType, None), } diff --git a/python/src/trezorlib/messages/NEMProvisionNamespace.py b/python/src/trezorlib/messages/NEMProvisionNamespace.py index 3bf754674..788c59531 100644 --- a/python/src/trezorlib/messages/NEMProvisionNamespace.py +++ b/python/src/trezorlib/messages/NEMProvisionNamespace.py @@ -14,6 +14,7 @@ class NEMProvisionNamespace(p.MessageType): def __init__( self, + *, namespace: str = None, parent: str = None, sink: str = None, @@ -27,8 +28,8 @@ class NEMProvisionNamespace(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('namespace', p.UnicodeType, 0), - 2: ('parent', p.UnicodeType, 0), - 3: ('sink', p.UnicodeType, 0), - 4: ('fee', p.UVarintType, 0), + 1: ('namespace', p.UnicodeType, None), + 2: ('parent', p.UnicodeType, None), + 3: ('sink', p.UnicodeType, None), + 4: ('fee', p.UVarintType, None), } diff --git a/python/src/trezorlib/messages/NEMSignTx.py b/python/src/trezorlib/messages/NEMSignTx.py index 6d4e6a8da..4a4a826bc 100644 --- a/python/src/trezorlib/messages/NEMSignTx.py +++ b/python/src/trezorlib/messages/NEMSignTx.py @@ -23,6 +23,7 @@ class NEMSignTx(p.MessageType): def __init__( self, + *, transaction: NEMTransactionCommon = None, multisig: NEMTransactionCommon = None, transfer: NEMTransfer = None, @@ -46,13 +47,13 @@ class NEMSignTx(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('transaction', NEMTransactionCommon, 0), - 2: ('multisig', NEMTransactionCommon, 0), - 3: ('transfer', NEMTransfer, 0), - 4: ('cosigning', p.BoolType, 0), - 5: ('provision_namespace', NEMProvisionNamespace, 0), - 6: ('mosaic_creation', NEMMosaicCreation, 0), - 7: ('supply_change', NEMMosaicSupplyChange, 0), - 8: ('aggregate_modification', NEMAggregateModification, 0), - 9: ('importance_transfer', NEMImportanceTransfer, 0), + 1: ('transaction', NEMTransactionCommon, None), + 2: ('multisig', NEMTransactionCommon, None), + 3: ('transfer', NEMTransfer, None), + 4: ('cosigning', p.BoolType, None), + 5: ('provision_namespace', NEMProvisionNamespace, None), + 6: ('mosaic_creation', NEMMosaicCreation, None), + 7: ('supply_change', NEMMosaicSupplyChange, None), + 8: ('aggregate_modification', NEMAggregateModification, None), + 9: ('importance_transfer', NEMImportanceTransfer, None), } diff --git a/python/src/trezorlib/messages/NEMSignedTx.py b/python/src/trezorlib/messages/NEMSignedTx.py index 2dc9859b6..007e850c9 100644 --- a/python/src/trezorlib/messages/NEMSignedTx.py +++ b/python/src/trezorlib/messages/NEMSignedTx.py @@ -15,6 +15,7 @@ class NEMSignedTx(p.MessageType): def __init__( self, + *, data: bytes = None, signature: bytes = None, ) -> None: @@ -24,6 +25,6 @@ class NEMSignedTx(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('data', p.BytesType, 0), - 2: ('signature', p.BytesType, 0), + 1: ('data', p.BytesType, None), + 2: ('signature', p.BytesType, None), } diff --git a/python/src/trezorlib/messages/NEMTransactionCommon.py b/python/src/trezorlib/messages/NEMTransactionCommon.py index 14afd73c8..d8bcbe0cc 100644 --- a/python/src/trezorlib/messages/NEMTransactionCommon.py +++ b/python/src/trezorlib/messages/NEMTransactionCommon.py @@ -14,6 +14,7 @@ class NEMTransactionCommon(p.MessageType): def __init__( self, + *, address_n: List[int] = None, network: int = None, timestamp: int = None, @@ -32,9 +33,9 @@ class NEMTransactionCommon(p.MessageType): def get_fields(cls) -> Dict: return { 1: ('address_n', p.UVarintType, p.FLAG_REPEATED), - 2: ('network', p.UVarintType, 0), - 3: ('timestamp', p.UVarintType, 0), - 4: ('fee', p.UVarintType, 0), - 5: ('deadline', p.UVarintType, 0), - 6: ('signer', p.BytesType, 0), + 2: ('network', p.UVarintType, None), + 3: ('timestamp', p.UVarintType, None), + 4: ('fee', p.UVarintType, None), + 5: ('deadline', p.UVarintType, None), + 6: ('signer', p.BytesType, None), } diff --git a/python/src/trezorlib/messages/NEMTransfer.py b/python/src/trezorlib/messages/NEMTransfer.py index d9e901b68..7af35383e 100644 --- a/python/src/trezorlib/messages/NEMTransfer.py +++ b/python/src/trezorlib/messages/NEMTransfer.py @@ -16,24 +16,25 @@ class NEMTransfer(p.MessageType): def __init__( self, + *, + mosaics: List[NEMMosaic] = None, recipient: str = None, amount: int = None, payload: bytes = None, public_key: bytes = None, - mosaics: List[NEMMosaic] = None, ) -> None: + self.mosaics = mosaics if mosaics is not None else [] self.recipient = recipient self.amount = amount self.payload = payload self.public_key = public_key - self.mosaics = mosaics if mosaics is not None else [] @classmethod def get_fields(cls) -> Dict: return { - 1: ('recipient', p.UnicodeType, 0), - 2: ('amount', p.UVarintType, 0), - 3: ('payload', p.BytesType, 0), - 4: ('public_key', p.BytesType, 0), + 1: ('recipient', p.UnicodeType, None), + 2: ('amount', p.UVarintType, None), + 3: ('payload', p.BytesType, None), + 4: ('public_key', p.BytesType, None), 5: ('mosaics', NEMMosaic, p.FLAG_REPEATED), } diff --git a/python/src/trezorlib/messages/NextU2FCounter.py b/python/src/trezorlib/messages/NextU2FCounter.py index 42e547f60..8433f8488 100644 --- a/python/src/trezorlib/messages/NextU2FCounter.py +++ b/python/src/trezorlib/messages/NextU2FCounter.py @@ -15,6 +15,7 @@ class NextU2FCounter(p.MessageType): def __init__( self, + *, u2f_counter: int = None, ) -> None: self.u2f_counter = u2f_counter @@ -22,5 +23,5 @@ class NextU2FCounter(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('u2f_counter', p.UVarintType, 0), + 1: ('u2f_counter', p.UVarintType, None), } diff --git a/python/src/trezorlib/messages/OwnershipId.py b/python/src/trezorlib/messages/OwnershipId.py index 23d71df69..dcffb16b8 100644 --- a/python/src/trezorlib/messages/OwnershipId.py +++ b/python/src/trezorlib/messages/OwnershipId.py @@ -15,12 +15,13 @@ class OwnershipId(p.MessageType): def __init__( self, - ownership_id: bytes = None, + *, + ownership_id: bytes, ) -> None: self.ownership_id = ownership_id @classmethod def get_fields(cls) -> Dict: return { - 1: ('ownership_id', p.BytesType, 0), # required + 1: ('ownership_id', p.BytesType, p.FLAG_REQUIRED), } diff --git a/python/src/trezorlib/messages/OwnershipProof.py b/python/src/trezorlib/messages/OwnershipProof.py index b32cf367a..eca7fbfb1 100644 --- a/python/src/trezorlib/messages/OwnershipProof.py +++ b/python/src/trezorlib/messages/OwnershipProof.py @@ -15,8 +15,9 @@ class OwnershipProof(p.MessageType): def __init__( self, - ownership_proof: bytes = None, - signature: bytes = None, + *, + ownership_proof: bytes, + signature: bytes, ) -> None: self.ownership_proof = ownership_proof self.signature = signature @@ -24,6 +25,6 @@ class OwnershipProof(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('ownership_proof', p.BytesType, 0), # required - 2: ('signature', p.BytesType, 0), # required + 1: ('ownership_proof', p.BytesType, p.FLAG_REQUIRED), + 2: ('signature', p.BytesType, p.FLAG_REQUIRED), } diff --git a/python/src/trezorlib/messages/PassphraseAck.py b/python/src/trezorlib/messages/PassphraseAck.py index ef00fa78e..9370e6914 100644 --- a/python/src/trezorlib/messages/PassphraseAck.py +++ b/python/src/trezorlib/messages/PassphraseAck.py @@ -15,6 +15,7 @@ class PassphraseAck(p.MessageType): def __init__( self, + *, passphrase: str = None, _state: bytes = None, on_device: bool = None, @@ -26,7 +27,7 @@ class PassphraseAck(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('passphrase', p.UnicodeType, 0), - 2: ('_state', p.BytesType, 0), - 3: ('on_device', p.BoolType, 0), + 1: ('passphrase', p.UnicodeType, None), + 2: ('_state', p.BytesType, None), + 3: ('on_device', p.BoolType, None), } diff --git a/python/src/trezorlib/messages/PassphraseRequest.py b/python/src/trezorlib/messages/PassphraseRequest.py index 903c0dfc2..c65034a7a 100644 --- a/python/src/trezorlib/messages/PassphraseRequest.py +++ b/python/src/trezorlib/messages/PassphraseRequest.py @@ -15,6 +15,7 @@ class PassphraseRequest(p.MessageType): def __init__( self, + *, _on_device: bool = None, ) -> None: self._on_device = _on_device @@ -22,5 +23,5 @@ class PassphraseRequest(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('_on_device', p.BoolType, 0), + 1: ('_on_device', p.BoolType, None), } diff --git a/python/src/trezorlib/messages/PinMatrixAck.py b/python/src/trezorlib/messages/PinMatrixAck.py index 2d093efa1..910988cf1 100644 --- a/python/src/trezorlib/messages/PinMatrixAck.py +++ b/python/src/trezorlib/messages/PinMatrixAck.py @@ -15,12 +15,13 @@ class PinMatrixAck(p.MessageType): def __init__( self, - pin: str = None, + *, + pin: str, ) -> None: self.pin = pin @classmethod def get_fields(cls) -> Dict: return { - 1: ('pin', p.UnicodeType, 0), # required + 1: ('pin', p.UnicodeType, p.FLAG_REQUIRED), } diff --git a/python/src/trezorlib/messages/PinMatrixRequest.py b/python/src/trezorlib/messages/PinMatrixRequest.py index 12882e128..5d3d5a194 100644 --- a/python/src/trezorlib/messages/PinMatrixRequest.py +++ b/python/src/trezorlib/messages/PinMatrixRequest.py @@ -16,6 +16,7 @@ class PinMatrixRequest(p.MessageType): def __init__( self, + *, type: EnumTypePinMatrixRequestType = None, ) -> None: self.type = type @@ -23,5 +24,5 @@ class PinMatrixRequest(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('type', p.EnumType("PinMatrixRequestType", (1, 2, 3, 4, 5)), 0), + 1: ('type', p.EnumType("PinMatrixRequestType", (1, 2, 3, 4, 5)), None), } diff --git a/python/src/trezorlib/messages/Ping.py b/python/src/trezorlib/messages/Ping.py index 763c8ea98..2f3f77632 100644 --- a/python/src/trezorlib/messages/Ping.py +++ b/python/src/trezorlib/messages/Ping.py @@ -15,6 +15,7 @@ class Ping(p.MessageType): def __init__( self, + *, message: str = None, button_protection: bool = None, ) -> None: @@ -24,6 +25,6 @@ class Ping(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('message', p.UnicodeType, 0), - 2: ('button_protection', p.BoolType, 0), + 1: ('message', p.UnicodeType, None), + 2: ('button_protection', p.BoolType, None), } diff --git a/python/src/trezorlib/messages/PublicKey.py b/python/src/trezorlib/messages/PublicKey.py index 3c2b7a672..5efaf5092 100644 --- a/python/src/trezorlib/messages/PublicKey.py +++ b/python/src/trezorlib/messages/PublicKey.py @@ -17,6 +17,7 @@ class PublicKey(p.MessageType): def __init__( self, + *, node: HDNodeType = None, xpub: str = None, ) -> None: @@ -26,6 +27,6 @@ class PublicKey(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('node', HDNodeType, 0), - 2: ('xpub', p.UnicodeType, 0), + 1: ('node', HDNodeType, None), + 2: ('xpub', p.UnicodeType, None), } diff --git a/python/src/trezorlib/messages/RecoveryDevice.py b/python/src/trezorlib/messages/RecoveryDevice.py index 380b03260..a4f6b69bc 100644 --- a/python/src/trezorlib/messages/RecoveryDevice.py +++ b/python/src/trezorlib/messages/RecoveryDevice.py @@ -16,6 +16,7 @@ class RecoveryDevice(p.MessageType): def __init__( self, + *, word_count: int = None, passphrase_protection: bool = None, pin_protection: bool = None, @@ -39,13 +40,13 @@ class RecoveryDevice(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('word_count', p.UVarintType, 0), - 2: ('passphrase_protection', p.BoolType, 0), - 3: ('pin_protection', p.BoolType, 0), - 4: ('language', p.UnicodeType, 0), # default=en-US - 5: ('label', p.UnicodeType, 0), - 6: ('enforce_wordlist', p.BoolType, 0), - 8: ('type', p.EnumType("RecoveryDeviceType", (0, 1)), 0), - 9: ('u2f_counter', p.UVarintType, 0), - 10: ('dry_run', p.BoolType, 0), + 1: ('word_count', p.UVarintType, None), + 2: ('passphrase_protection', p.BoolType, None), + 3: ('pin_protection', p.BoolType, None), + 4: ('language', p.UnicodeType, None), + 5: ('label', p.UnicodeType, None), + 6: ('enforce_wordlist', p.BoolType, None), + 8: ('type', p.EnumType("RecoveryDeviceType", (0, 1)), None), + 9: ('u2f_counter', p.UVarintType, None), + 10: ('dry_run', p.BoolType, None), } diff --git a/python/src/trezorlib/messages/ResetDevice.py b/python/src/trezorlib/messages/ResetDevice.py index 123f55a31..e8a29d524 100644 --- a/python/src/trezorlib/messages/ResetDevice.py +++ b/python/src/trezorlib/messages/ResetDevice.py @@ -16,16 +16,17 @@ class ResetDevice(p.MessageType): def __init__( self, + *, display_random: bool = None, - strength: int = None, + strength: int = 256, passphrase_protection: bool = None, pin_protection: bool = None, - language: str = None, + language: str = "en-US", label: str = None, u2f_counter: int = None, skip_backup: bool = None, no_backup: bool = None, - backup_type: EnumTypeBackupType = None, + backup_type: EnumTypeBackupType = 0, ) -> None: self.display_random = display_random self.strength = strength @@ -41,14 +42,14 @@ class ResetDevice(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('display_random', p.BoolType, 0), - 2: ('strength', p.UVarintType, 0), # default=256 - 3: ('passphrase_protection', p.BoolType, 0), - 4: ('pin_protection', p.BoolType, 0), - 5: ('language', p.UnicodeType, 0), # default=en-US - 6: ('label', p.UnicodeType, 0), - 7: ('u2f_counter', p.UVarintType, 0), - 8: ('skip_backup', p.BoolType, 0), - 9: ('no_backup', p.BoolType, 0), + 1: ('display_random', p.BoolType, None), + 2: ('strength', p.UVarintType, 256), # default=256 + 3: ('passphrase_protection', p.BoolType, None), + 4: ('pin_protection', p.BoolType, None), + 5: ('language', p.UnicodeType, "en-US"), # default=en-US + 6: ('label', p.UnicodeType, None), + 7: ('u2f_counter', p.UVarintType, None), + 8: ('skip_backup', p.BoolType, None), + 9: ('no_backup', p.BoolType, None), 10: ('backup_type', p.EnumType("BackupType", (0, 1, 2)), 0), # default=Bip39 } diff --git a/python/src/trezorlib/messages/RippleAddress.py b/python/src/trezorlib/messages/RippleAddress.py index 1ba81d032..e4ef3e4ef 100644 --- a/python/src/trezorlib/messages/RippleAddress.py +++ b/python/src/trezorlib/messages/RippleAddress.py @@ -15,6 +15,7 @@ class RippleAddress(p.MessageType): def __init__( self, + *, address: str = None, ) -> None: self.address = address @@ -22,5 +23,5 @@ class RippleAddress(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('address', p.UnicodeType, 0), + 1: ('address', p.UnicodeType, None), } diff --git a/python/src/trezorlib/messages/RippleGetAddress.py b/python/src/trezorlib/messages/RippleGetAddress.py index d78372db2..f55c5c61f 100644 --- a/python/src/trezorlib/messages/RippleGetAddress.py +++ b/python/src/trezorlib/messages/RippleGetAddress.py @@ -15,6 +15,7 @@ class RippleGetAddress(p.MessageType): def __init__( self, + *, address_n: List[int] = None, show_display: bool = None, ) -> None: @@ -25,5 +26,5 @@ class RippleGetAddress(p.MessageType): def get_fields(cls) -> Dict: return { 1: ('address_n', p.UVarintType, p.FLAG_REPEATED), - 2: ('show_display', p.BoolType, 0), + 2: ('show_display', p.BoolType, None), } diff --git a/python/src/trezorlib/messages/RipplePayment.py b/python/src/trezorlib/messages/RipplePayment.py index 3d1d2ede7..1197d4fd8 100644 --- a/python/src/trezorlib/messages/RipplePayment.py +++ b/python/src/trezorlib/messages/RipplePayment.py @@ -14,6 +14,7 @@ class RipplePayment(p.MessageType): def __init__( self, + *, amount: int = None, destination: str = None, destination_tag: int = None, @@ -25,7 +26,7 @@ class RipplePayment(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('amount', p.UVarintType, 0), - 2: ('destination', p.UnicodeType, 0), - 3: ('destination_tag', p.UVarintType, 0), + 1: ('amount', p.UVarintType, None), + 2: ('destination', p.UnicodeType, None), + 3: ('destination_tag', p.UVarintType, None), } diff --git a/python/src/trezorlib/messages/RippleSignTx.py b/python/src/trezorlib/messages/RippleSignTx.py index 9f262e776..20fa5e7c6 100644 --- a/python/src/trezorlib/messages/RippleSignTx.py +++ b/python/src/trezorlib/messages/RippleSignTx.py @@ -17,6 +17,7 @@ class RippleSignTx(p.MessageType): def __init__( self, + *, address_n: List[int] = None, fee: int = None, flags: int = None, @@ -35,9 +36,9 @@ class RippleSignTx(p.MessageType): def get_fields(cls) -> Dict: return { 1: ('address_n', p.UVarintType, p.FLAG_REPEATED), - 2: ('fee', p.UVarintType, 0), - 3: ('flags', p.UVarintType, 0), - 4: ('sequence', p.UVarintType, 0), - 5: ('last_ledger_sequence', p.UVarintType, 0), - 6: ('payment', RipplePayment, 0), + 2: ('fee', p.UVarintType, None), + 3: ('flags', p.UVarintType, None), + 4: ('sequence', p.UVarintType, None), + 5: ('last_ledger_sequence', p.UVarintType, None), + 6: ('payment', RipplePayment, None), } diff --git a/python/src/trezorlib/messages/RippleSignedTx.py b/python/src/trezorlib/messages/RippleSignedTx.py index e9c0386d8..133807594 100644 --- a/python/src/trezorlib/messages/RippleSignedTx.py +++ b/python/src/trezorlib/messages/RippleSignedTx.py @@ -15,6 +15,7 @@ class RippleSignedTx(p.MessageType): def __init__( self, + *, signature: bytes = None, serialized_tx: bytes = None, ) -> None: @@ -24,6 +25,6 @@ class RippleSignedTx(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('signature', p.BytesType, 0), - 2: ('serialized_tx', p.BytesType, 0), + 1: ('signature', p.BytesType, None), + 2: ('serialized_tx', p.BytesType, None), } diff --git a/python/src/trezorlib/messages/SdProtect.py b/python/src/trezorlib/messages/SdProtect.py index 423cbf33d..73590def2 100644 --- a/python/src/trezorlib/messages/SdProtect.py +++ b/python/src/trezorlib/messages/SdProtect.py @@ -16,6 +16,7 @@ class SdProtect(p.MessageType): def __init__( self, + *, operation: EnumTypeSdProtectOperationType = None, ) -> None: self.operation = operation @@ -23,5 +24,5 @@ class SdProtect(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('operation', p.EnumType("SdProtectOperationType", (0, 1, 2)), 0), + 1: ('operation', p.EnumType("SdProtectOperationType", (0, 1, 2)), None), } diff --git a/python/src/trezorlib/messages/SelfTest.py b/python/src/trezorlib/messages/SelfTest.py index fa5f7dcef..4cd7d20c8 100644 --- a/python/src/trezorlib/messages/SelfTest.py +++ b/python/src/trezorlib/messages/SelfTest.py @@ -15,6 +15,7 @@ class SelfTest(p.MessageType): def __init__( self, + *, payload: bytes = None, ) -> None: self.payload = payload @@ -22,5 +23,5 @@ class SelfTest(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('payload', p.BytesType, 0), + 1: ('payload', p.BytesType, None), } diff --git a/python/src/trezorlib/messages/SetU2FCounter.py b/python/src/trezorlib/messages/SetU2FCounter.py index d5102fa79..26c259780 100644 --- a/python/src/trezorlib/messages/SetU2FCounter.py +++ b/python/src/trezorlib/messages/SetU2FCounter.py @@ -15,6 +15,7 @@ class SetU2FCounter(p.MessageType): def __init__( self, + *, u2f_counter: int = None, ) -> None: self.u2f_counter = u2f_counter @@ -22,5 +23,5 @@ class SetU2FCounter(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('u2f_counter', p.UVarintType, 0), + 1: ('u2f_counter', p.UVarintType, None), } diff --git a/python/src/trezorlib/messages/SignIdentity.py b/python/src/trezorlib/messages/SignIdentity.py index 4c008cfbd..4b02b41ac 100644 --- a/python/src/trezorlib/messages/SignIdentity.py +++ b/python/src/trezorlib/messages/SignIdentity.py @@ -17,6 +17,7 @@ class SignIdentity(p.MessageType): def __init__( self, + *, identity: IdentityType = None, challenge_hidden: bytes = None, challenge_visual: str = None, @@ -30,8 +31,8 @@ class SignIdentity(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('identity', IdentityType, 0), - 2: ('challenge_hidden', p.BytesType, 0), - 3: ('challenge_visual', p.UnicodeType, 0), - 4: ('ecdsa_curve_name', p.UnicodeType, 0), + 1: ('identity', IdentityType, None), + 2: ('challenge_hidden', p.BytesType, None), + 3: ('challenge_visual', p.UnicodeType, None), + 4: ('ecdsa_curve_name', p.UnicodeType, None), } diff --git a/python/src/trezorlib/messages/SignMessage.py b/python/src/trezorlib/messages/SignMessage.py index 2e560247e..7e20ad346 100644 --- a/python/src/trezorlib/messages/SignMessage.py +++ b/python/src/trezorlib/messages/SignMessage.py @@ -16,10 +16,11 @@ class SignMessage(p.MessageType): def __init__( self, + *, + message: bytes, address_n: List[int] = None, - message: bytes = None, - coin_name: str = None, - script_type: EnumTypeInputScriptType = None, + coin_name: str = "Bitcoin", + script_type: EnumTypeInputScriptType = 0, ) -> None: self.address_n = address_n if address_n is not None else [] self.message = message @@ -30,7 +31,7 @@ class SignMessage(p.MessageType): def get_fields(cls) -> Dict: return { 1: ('address_n', p.UVarintType, p.FLAG_REPEATED), - 2: ('message', p.BytesType, 0), # required - 3: ('coin_name', p.UnicodeType, 0), # default=Bitcoin + 2: ('message', p.BytesType, p.FLAG_REQUIRED), + 3: ('coin_name', p.UnicodeType, "Bitcoin"), # default=Bitcoin 4: ('script_type', p.EnumType("InputScriptType", (0, 1, 2, 3, 4)), 0), # default=SPENDADDRESS } diff --git a/python/src/trezorlib/messages/SignTx.py b/python/src/trezorlib/messages/SignTx.py index c34c04bb1..eb3c6ed91 100644 --- a/python/src/trezorlib/messages/SignTx.py +++ b/python/src/trezorlib/messages/SignTx.py @@ -15,11 +15,12 @@ class SignTx(p.MessageType): def __init__( self, - outputs_count: int = None, - inputs_count: int = None, - coin_name: str = None, - version: int = None, - lock_time: int = None, + *, + outputs_count: int, + inputs_count: int, + coin_name: str = "Bitcoin", + version: int = 1, + lock_time: int = 0, expiry: int = None, overwintered: bool = None, version_group_id: int = None, @@ -40,14 +41,14 @@ class SignTx(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('outputs_count', p.UVarintType, 0), # required - 2: ('inputs_count', p.UVarintType, 0), # required - 3: ('coin_name', p.UnicodeType, 0), # default=Bitcoin - 4: ('version', p.UVarintType, 0), # default=1 + 1: ('outputs_count', p.UVarintType, p.FLAG_REQUIRED), + 2: ('inputs_count', p.UVarintType, p.FLAG_REQUIRED), + 3: ('coin_name', p.UnicodeType, "Bitcoin"), # default=Bitcoin + 4: ('version', p.UVarintType, 1), # default=1 5: ('lock_time', p.UVarintType, 0), # default=0 - 6: ('expiry', p.UVarintType, 0), - 7: ('overwintered', p.BoolType, 0), - 8: ('version_group_id', p.UVarintType, 0), - 9: ('timestamp', p.UVarintType, 0), - 10: ('branch_id', p.UVarintType, 0), + 6: ('expiry', p.UVarintType, None), + 7: ('overwintered', p.BoolType, None), + 8: ('version_group_id', p.UVarintType, None), + 9: ('timestamp', p.UVarintType, None), + 10: ('branch_id', p.UVarintType, None), } diff --git a/python/src/trezorlib/messages/SignedIdentity.py b/python/src/trezorlib/messages/SignedIdentity.py index b986b7ae2..f69cbe2d4 100644 --- a/python/src/trezorlib/messages/SignedIdentity.py +++ b/python/src/trezorlib/messages/SignedIdentity.py @@ -15,6 +15,7 @@ class SignedIdentity(p.MessageType): def __init__( self, + *, address: str = None, public_key: bytes = None, signature: bytes = None, @@ -26,7 +27,7 @@ class SignedIdentity(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('address', p.UnicodeType, 0), - 2: ('public_key', p.BytesType, 0), - 3: ('signature', p.BytesType, 0), + 1: ('address', p.UnicodeType, None), + 2: ('public_key', p.BytesType, None), + 3: ('signature', p.BytesType, None), } diff --git a/python/src/trezorlib/messages/StellarAccountMergeOp.py b/python/src/trezorlib/messages/StellarAccountMergeOp.py index 2354ee229..75995d2f2 100644 --- a/python/src/trezorlib/messages/StellarAccountMergeOp.py +++ b/python/src/trezorlib/messages/StellarAccountMergeOp.py @@ -15,6 +15,7 @@ class StellarAccountMergeOp(p.MessageType): def __init__( self, + *, source_account: str = None, destination_account: str = None, ) -> None: @@ -24,6 +25,6 @@ class StellarAccountMergeOp(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('source_account', p.UnicodeType, 0), - 2: ('destination_account', p.UnicodeType, 0), + 1: ('source_account', p.UnicodeType, None), + 2: ('destination_account', p.UnicodeType, None), } diff --git a/python/src/trezorlib/messages/StellarAddress.py b/python/src/trezorlib/messages/StellarAddress.py index 7e5e1d640..1aecd88a2 100644 --- a/python/src/trezorlib/messages/StellarAddress.py +++ b/python/src/trezorlib/messages/StellarAddress.py @@ -15,6 +15,7 @@ class StellarAddress(p.MessageType): def __init__( self, + *, address: str = None, ) -> None: self.address = address @@ -22,5 +23,5 @@ class StellarAddress(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('address', p.UnicodeType, 0), + 1: ('address', p.UnicodeType, None), } diff --git a/python/src/trezorlib/messages/StellarAllowTrustOp.py b/python/src/trezorlib/messages/StellarAllowTrustOp.py index af76584fd..59aa2e8c0 100644 --- a/python/src/trezorlib/messages/StellarAllowTrustOp.py +++ b/python/src/trezorlib/messages/StellarAllowTrustOp.py @@ -15,6 +15,7 @@ class StellarAllowTrustOp(p.MessageType): def __init__( self, + *, source_account: str = None, trusted_account: str = None, asset_type: int = None, @@ -30,9 +31,9 @@ class StellarAllowTrustOp(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('source_account', p.UnicodeType, 0), - 2: ('trusted_account', p.UnicodeType, 0), - 3: ('asset_type', p.UVarintType, 0), - 4: ('asset_code', p.UnicodeType, 0), - 5: ('is_authorized', p.UVarintType, 0), + 1: ('source_account', p.UnicodeType, None), + 2: ('trusted_account', p.UnicodeType, None), + 3: ('asset_type', p.UVarintType, None), + 4: ('asset_code', p.UnicodeType, None), + 5: ('is_authorized', p.UVarintType, None), } diff --git a/python/src/trezorlib/messages/StellarAssetType.py b/python/src/trezorlib/messages/StellarAssetType.py index 472322a8d..5021e4d44 100644 --- a/python/src/trezorlib/messages/StellarAssetType.py +++ b/python/src/trezorlib/messages/StellarAssetType.py @@ -14,6 +14,7 @@ class StellarAssetType(p.MessageType): def __init__( self, + *, type: int = None, code: str = None, issuer: str = None, @@ -25,7 +26,7 @@ class StellarAssetType(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('type', p.UVarintType, 0), - 2: ('code', p.UnicodeType, 0), - 3: ('issuer', p.UnicodeType, 0), + 1: ('type', p.UVarintType, None), + 2: ('code', p.UnicodeType, None), + 3: ('issuer', p.UnicodeType, None), } diff --git a/python/src/trezorlib/messages/StellarBumpSequenceOp.py b/python/src/trezorlib/messages/StellarBumpSequenceOp.py index a9b11318c..e54d59adf 100644 --- a/python/src/trezorlib/messages/StellarBumpSequenceOp.py +++ b/python/src/trezorlib/messages/StellarBumpSequenceOp.py @@ -15,6 +15,7 @@ class StellarBumpSequenceOp(p.MessageType): def __init__( self, + *, source_account: str = None, bump_to: int = None, ) -> None: @@ -24,6 +25,6 @@ class StellarBumpSequenceOp(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('source_account', p.UnicodeType, 0), - 2: ('bump_to', p.UVarintType, 0), + 1: ('source_account', p.UnicodeType, None), + 2: ('bump_to', p.UVarintType, None), } diff --git a/python/src/trezorlib/messages/StellarChangeTrustOp.py b/python/src/trezorlib/messages/StellarChangeTrustOp.py index 0d484d020..98f4512f1 100644 --- a/python/src/trezorlib/messages/StellarChangeTrustOp.py +++ b/python/src/trezorlib/messages/StellarChangeTrustOp.py @@ -17,6 +17,7 @@ class StellarChangeTrustOp(p.MessageType): def __init__( self, + *, source_account: str = None, asset: StellarAssetType = None, limit: int = None, @@ -28,7 +29,7 @@ class StellarChangeTrustOp(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('source_account', p.UnicodeType, 0), - 2: ('asset', StellarAssetType, 0), - 3: ('limit', p.UVarintType, 0), + 1: ('source_account', p.UnicodeType, None), + 2: ('asset', StellarAssetType, None), + 3: ('limit', p.UVarintType, None), } diff --git a/python/src/trezorlib/messages/StellarCreateAccountOp.py b/python/src/trezorlib/messages/StellarCreateAccountOp.py index bffc2dd1d..e667ee51e 100644 --- a/python/src/trezorlib/messages/StellarCreateAccountOp.py +++ b/python/src/trezorlib/messages/StellarCreateAccountOp.py @@ -15,6 +15,7 @@ class StellarCreateAccountOp(p.MessageType): def __init__( self, + *, source_account: str = None, new_account: str = None, starting_balance: int = None, @@ -26,7 +27,7 @@ class StellarCreateAccountOp(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('source_account', p.UnicodeType, 0), - 2: ('new_account', p.UnicodeType, 0), - 3: ('starting_balance', p.SVarintType, 0), + 1: ('source_account', p.UnicodeType, None), + 2: ('new_account', p.UnicodeType, None), + 3: ('starting_balance', p.SVarintType, None), } diff --git a/python/src/trezorlib/messages/StellarCreatePassiveOfferOp.py b/python/src/trezorlib/messages/StellarCreatePassiveOfferOp.py index 1457ae115..08e4743b1 100644 --- a/python/src/trezorlib/messages/StellarCreatePassiveOfferOp.py +++ b/python/src/trezorlib/messages/StellarCreatePassiveOfferOp.py @@ -17,6 +17,7 @@ class StellarCreatePassiveOfferOp(p.MessageType): def __init__( self, + *, source_account: str = None, selling_asset: StellarAssetType = None, buying_asset: StellarAssetType = None, @@ -34,10 +35,10 @@ class StellarCreatePassiveOfferOp(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('source_account', p.UnicodeType, 0), - 2: ('selling_asset', StellarAssetType, 0), - 3: ('buying_asset', StellarAssetType, 0), - 4: ('amount', p.SVarintType, 0), - 5: ('price_n', p.UVarintType, 0), - 6: ('price_d', p.UVarintType, 0), + 1: ('source_account', p.UnicodeType, None), + 2: ('selling_asset', StellarAssetType, None), + 3: ('buying_asset', StellarAssetType, None), + 4: ('amount', p.SVarintType, None), + 5: ('price_n', p.UVarintType, None), + 6: ('price_d', p.UVarintType, None), } diff --git a/python/src/trezorlib/messages/StellarGetAddress.py b/python/src/trezorlib/messages/StellarGetAddress.py index cee2fe306..12dd2b01b 100644 --- a/python/src/trezorlib/messages/StellarGetAddress.py +++ b/python/src/trezorlib/messages/StellarGetAddress.py @@ -15,6 +15,7 @@ class StellarGetAddress(p.MessageType): def __init__( self, + *, address_n: List[int] = None, show_display: bool = None, ) -> None: @@ -25,5 +26,5 @@ class StellarGetAddress(p.MessageType): def get_fields(cls) -> Dict: return { 1: ('address_n', p.UVarintType, p.FLAG_REPEATED), - 2: ('show_display', p.BoolType, 0), + 2: ('show_display', p.BoolType, None), } diff --git a/python/src/trezorlib/messages/StellarManageDataOp.py b/python/src/trezorlib/messages/StellarManageDataOp.py index 499c96498..59c543022 100644 --- a/python/src/trezorlib/messages/StellarManageDataOp.py +++ b/python/src/trezorlib/messages/StellarManageDataOp.py @@ -15,6 +15,7 @@ class StellarManageDataOp(p.MessageType): def __init__( self, + *, source_account: str = None, key: str = None, value: bytes = None, @@ -26,7 +27,7 @@ class StellarManageDataOp(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('source_account', p.UnicodeType, 0), - 2: ('key', p.UnicodeType, 0), - 3: ('value', p.BytesType, 0), + 1: ('source_account', p.UnicodeType, None), + 2: ('key', p.UnicodeType, None), + 3: ('value', p.BytesType, None), } diff --git a/python/src/trezorlib/messages/StellarManageOfferOp.py b/python/src/trezorlib/messages/StellarManageOfferOp.py index c71a0f6c9..145e287aa 100644 --- a/python/src/trezorlib/messages/StellarManageOfferOp.py +++ b/python/src/trezorlib/messages/StellarManageOfferOp.py @@ -17,6 +17,7 @@ class StellarManageOfferOp(p.MessageType): def __init__( self, + *, source_account: str = None, selling_asset: StellarAssetType = None, buying_asset: StellarAssetType = None, @@ -36,11 +37,11 @@ class StellarManageOfferOp(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('source_account', p.UnicodeType, 0), - 2: ('selling_asset', StellarAssetType, 0), - 3: ('buying_asset', StellarAssetType, 0), - 4: ('amount', p.SVarintType, 0), - 5: ('price_n', p.UVarintType, 0), - 6: ('price_d', p.UVarintType, 0), - 7: ('offer_id', p.UVarintType, 0), + 1: ('source_account', p.UnicodeType, None), + 2: ('selling_asset', StellarAssetType, None), + 3: ('buying_asset', StellarAssetType, None), + 4: ('amount', p.SVarintType, None), + 5: ('price_n', p.UVarintType, None), + 6: ('price_d', p.UVarintType, None), + 7: ('offer_id', p.UVarintType, None), } diff --git a/python/src/trezorlib/messages/StellarPathPaymentOp.py b/python/src/trezorlib/messages/StellarPathPaymentOp.py index f33fa2a09..c5b3fbb69 100644 --- a/python/src/trezorlib/messages/StellarPathPaymentOp.py +++ b/python/src/trezorlib/messages/StellarPathPaymentOp.py @@ -17,30 +17,31 @@ class StellarPathPaymentOp(p.MessageType): def __init__( self, + *, + paths: List[StellarAssetType] = None, source_account: str = None, send_asset: StellarAssetType = None, send_max: int = None, destination_account: str = None, destination_asset: StellarAssetType = None, destination_amount: int = None, - paths: List[StellarAssetType] = None, ) -> None: + self.paths = paths if paths is not None else [] self.source_account = source_account self.send_asset = send_asset self.send_max = send_max self.destination_account = destination_account self.destination_asset = destination_asset self.destination_amount = destination_amount - self.paths = paths if paths is not None else [] @classmethod def get_fields(cls) -> Dict: return { - 1: ('source_account', p.UnicodeType, 0), - 2: ('send_asset', StellarAssetType, 0), - 3: ('send_max', p.SVarintType, 0), - 4: ('destination_account', p.UnicodeType, 0), - 5: ('destination_asset', StellarAssetType, 0), - 6: ('destination_amount', p.SVarintType, 0), + 1: ('source_account', p.UnicodeType, None), + 2: ('send_asset', StellarAssetType, None), + 3: ('send_max', p.SVarintType, None), + 4: ('destination_account', p.UnicodeType, None), + 5: ('destination_asset', StellarAssetType, None), + 6: ('destination_amount', p.SVarintType, None), 7: ('paths', StellarAssetType, p.FLAG_REPEATED), } diff --git a/python/src/trezorlib/messages/StellarPaymentOp.py b/python/src/trezorlib/messages/StellarPaymentOp.py index 8bc90de97..660f653cb 100644 --- a/python/src/trezorlib/messages/StellarPaymentOp.py +++ b/python/src/trezorlib/messages/StellarPaymentOp.py @@ -17,6 +17,7 @@ class StellarPaymentOp(p.MessageType): def __init__( self, + *, source_account: str = None, destination_account: str = None, asset: StellarAssetType = None, @@ -30,8 +31,8 @@ class StellarPaymentOp(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('source_account', p.UnicodeType, 0), - 2: ('destination_account', p.UnicodeType, 0), - 3: ('asset', StellarAssetType, 0), - 4: ('amount', p.SVarintType, 0), + 1: ('source_account', p.UnicodeType, None), + 2: ('destination_account', p.UnicodeType, None), + 3: ('asset', StellarAssetType, None), + 4: ('amount', p.SVarintType, None), } diff --git a/python/src/trezorlib/messages/StellarSetOptionsOp.py b/python/src/trezorlib/messages/StellarSetOptionsOp.py index 1989c9435..b2f9cce45 100644 --- a/python/src/trezorlib/messages/StellarSetOptionsOp.py +++ b/python/src/trezorlib/messages/StellarSetOptionsOp.py @@ -15,6 +15,7 @@ class StellarSetOptionsOp(p.MessageType): def __init__( self, + *, source_account: str = None, inflation_destination_account: str = None, clear_flags: int = None, @@ -44,16 +45,16 @@ class StellarSetOptionsOp(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('source_account', p.UnicodeType, 0), - 2: ('inflation_destination_account', p.UnicodeType, 0), - 3: ('clear_flags', p.UVarintType, 0), - 4: ('set_flags', p.UVarintType, 0), - 5: ('master_weight', p.UVarintType, 0), - 6: ('low_threshold', p.UVarintType, 0), - 7: ('medium_threshold', p.UVarintType, 0), - 8: ('high_threshold', p.UVarintType, 0), - 9: ('home_domain', p.UnicodeType, 0), - 10: ('signer_type', p.UVarintType, 0), - 11: ('signer_key', p.BytesType, 0), - 12: ('signer_weight', p.UVarintType, 0), + 1: ('source_account', p.UnicodeType, None), + 2: ('inflation_destination_account', p.UnicodeType, None), + 3: ('clear_flags', p.UVarintType, None), + 4: ('set_flags', p.UVarintType, None), + 5: ('master_weight', p.UVarintType, None), + 6: ('low_threshold', p.UVarintType, None), + 7: ('medium_threshold', p.UVarintType, None), + 8: ('high_threshold', p.UVarintType, None), + 9: ('home_domain', p.UnicodeType, None), + 10: ('signer_type', p.UVarintType, None), + 11: ('signer_key', p.BytesType, None), + 12: ('signer_weight', p.UVarintType, None), } diff --git a/python/src/trezorlib/messages/StellarSignTx.py b/python/src/trezorlib/messages/StellarSignTx.py index 4d0567675..a91bf7bcc 100644 --- a/python/src/trezorlib/messages/StellarSignTx.py +++ b/python/src/trezorlib/messages/StellarSignTx.py @@ -15,6 +15,7 @@ class StellarSignTx(p.MessageType): def __init__( self, + *, address_n: List[int] = None, network_passphrase: str = None, source_account: str = None, @@ -45,15 +46,15 @@ class StellarSignTx(p.MessageType): def get_fields(cls) -> Dict: return { 2: ('address_n', p.UVarintType, p.FLAG_REPEATED), - 3: ('network_passphrase', p.UnicodeType, 0), - 4: ('source_account', p.UnicodeType, 0), - 5: ('fee', p.UVarintType, 0), - 6: ('sequence_number', p.UVarintType, 0), - 8: ('timebounds_start', p.UVarintType, 0), - 9: ('timebounds_end', p.UVarintType, 0), - 10: ('memo_type', p.UVarintType, 0), - 11: ('memo_text', p.UnicodeType, 0), - 12: ('memo_id', p.UVarintType, 0), - 13: ('memo_hash', p.BytesType, 0), - 14: ('num_operations', p.UVarintType, 0), + 3: ('network_passphrase', p.UnicodeType, None), + 4: ('source_account', p.UnicodeType, None), + 5: ('fee', p.UVarintType, None), + 6: ('sequence_number', p.UVarintType, None), + 8: ('timebounds_start', p.UVarintType, None), + 9: ('timebounds_end', p.UVarintType, None), + 10: ('memo_type', p.UVarintType, None), + 11: ('memo_text', p.UnicodeType, None), + 12: ('memo_id', p.UVarintType, None), + 13: ('memo_hash', p.BytesType, None), + 14: ('num_operations', p.UVarintType, None), } diff --git a/python/src/trezorlib/messages/StellarSignedTx.py b/python/src/trezorlib/messages/StellarSignedTx.py index 2a47e691f..c53879bcc 100644 --- a/python/src/trezorlib/messages/StellarSignedTx.py +++ b/python/src/trezorlib/messages/StellarSignedTx.py @@ -15,6 +15,7 @@ class StellarSignedTx(p.MessageType): def __init__( self, + *, public_key: bytes = None, signature: bytes = None, ) -> None: @@ -24,6 +25,6 @@ class StellarSignedTx(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('public_key', p.BytesType, 0), - 2: ('signature', p.BytesType, 0), + 1: ('public_key', p.BytesType, None), + 2: ('signature', p.BytesType, None), } diff --git a/python/src/trezorlib/messages/Success.py b/python/src/trezorlib/messages/Success.py index f9e9df42d..d1f58141d 100644 --- a/python/src/trezorlib/messages/Success.py +++ b/python/src/trezorlib/messages/Success.py @@ -15,6 +15,7 @@ class Success(p.MessageType): def __init__( self, + *, message: str = None, ) -> None: self.message = message @@ -22,5 +23,5 @@ class Success(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('message', p.UnicodeType, 0), + 1: ('message', p.UnicodeType, None), } diff --git a/python/src/trezorlib/messages/TezosAddress.py b/python/src/trezorlib/messages/TezosAddress.py index ff77bed5b..9bc8deb50 100644 --- a/python/src/trezorlib/messages/TezosAddress.py +++ b/python/src/trezorlib/messages/TezosAddress.py @@ -15,6 +15,7 @@ class TezosAddress(p.MessageType): def __init__( self, + *, address: str = None, ) -> None: self.address = address @@ -22,5 +23,5 @@ class TezosAddress(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('address', p.UnicodeType, 0), + 1: ('address', p.UnicodeType, None), } diff --git a/python/src/trezorlib/messages/TezosBallotOp.py b/python/src/trezorlib/messages/TezosBallotOp.py index 3bf4ee617..daa84a22c 100644 --- a/python/src/trezorlib/messages/TezosBallotOp.py +++ b/python/src/trezorlib/messages/TezosBallotOp.py @@ -15,6 +15,7 @@ class TezosBallotOp(p.MessageType): def __init__( self, + *, source: bytes = None, period: int = None, proposal: bytes = None, @@ -28,8 +29,8 @@ class TezosBallotOp(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('source', p.BytesType, 0), - 2: ('period', p.UVarintType, 0), - 3: ('proposal', p.BytesType, 0), - 4: ('ballot', p.EnumType("TezosBallotType", (0, 1, 2)), 0), + 1: ('source', p.BytesType, None), + 2: ('period', p.UVarintType, None), + 3: ('proposal', p.BytesType, None), + 4: ('ballot', p.EnumType("TezosBallotType", (0, 1, 2)), None), } diff --git a/python/src/trezorlib/messages/TezosContractID.py b/python/src/trezorlib/messages/TezosContractID.py index 0c1bac6df..cf337e0d0 100644 --- a/python/src/trezorlib/messages/TezosContractID.py +++ b/python/src/trezorlib/messages/TezosContractID.py @@ -15,6 +15,7 @@ class TezosContractID(p.MessageType): def __init__( self, + *, tag: EnumTypeTezosContractType = None, hash: bytes = None, ) -> None: @@ -24,6 +25,6 @@ class TezosContractID(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('tag', p.EnumType("TezosContractType", (0, 1)), 0), - 2: ('hash', p.BytesType, 0), + 1: ('tag', p.EnumType("TezosContractType", (0, 1)), None), + 2: ('hash', p.BytesType, None), } diff --git a/python/src/trezorlib/messages/TezosDelegationOp.py b/python/src/trezorlib/messages/TezosDelegationOp.py index 69013af0d..c3eb310c4 100644 --- a/python/src/trezorlib/messages/TezosDelegationOp.py +++ b/python/src/trezorlib/messages/TezosDelegationOp.py @@ -14,6 +14,7 @@ class TezosDelegationOp(p.MessageType): def __init__( self, + *, source: bytes = None, fee: int = None, counter: int = None, @@ -31,10 +32,10 @@ class TezosDelegationOp(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 7: ('source', p.BytesType, 0), - 2: ('fee', p.UVarintType, 0), - 3: ('counter', p.UVarintType, 0), - 4: ('gas_limit', p.UVarintType, 0), - 5: ('storage_limit', p.UVarintType, 0), - 6: ('delegate', p.BytesType, 0), + 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), } diff --git a/python/src/trezorlib/messages/TezosGetAddress.py b/python/src/trezorlib/messages/TezosGetAddress.py index 91d613193..f4bb35166 100644 --- a/python/src/trezorlib/messages/TezosGetAddress.py +++ b/python/src/trezorlib/messages/TezosGetAddress.py @@ -15,6 +15,7 @@ class TezosGetAddress(p.MessageType): def __init__( self, + *, address_n: List[int] = None, show_display: bool = None, ) -> None: @@ -25,5 +26,5 @@ class TezosGetAddress(p.MessageType): def get_fields(cls) -> Dict: return { 1: ('address_n', p.UVarintType, p.FLAG_REPEATED), - 2: ('show_display', p.BoolType, 0), + 2: ('show_display', p.BoolType, None), } diff --git a/python/src/trezorlib/messages/TezosGetPublicKey.py b/python/src/trezorlib/messages/TezosGetPublicKey.py index 92f0d36cc..fa0a2f6f6 100644 --- a/python/src/trezorlib/messages/TezosGetPublicKey.py +++ b/python/src/trezorlib/messages/TezosGetPublicKey.py @@ -15,6 +15,7 @@ class TezosGetPublicKey(p.MessageType): def __init__( self, + *, address_n: List[int] = None, show_display: bool = None, ) -> None: @@ -25,5 +26,5 @@ class TezosGetPublicKey(p.MessageType): def get_fields(cls) -> Dict: return { 1: ('address_n', p.UVarintType, p.FLAG_REPEATED), - 2: ('show_display', p.BoolType, 0), + 2: ('show_display', p.BoolType, None), } diff --git a/python/src/trezorlib/messages/TezosManagerTransfer.py b/python/src/trezorlib/messages/TezosManagerTransfer.py index 96af07ea1..cadf46468 100644 --- a/python/src/trezorlib/messages/TezosManagerTransfer.py +++ b/python/src/trezorlib/messages/TezosManagerTransfer.py @@ -16,6 +16,7 @@ class TezosManagerTransfer(p.MessageType): def __init__( self, + *, destination: TezosContractID = None, amount: int = None, ) -> None: @@ -25,6 +26,6 @@ class TezosManagerTransfer(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('destination', TezosContractID, 0), - 2: ('amount', p.UVarintType, 0), + 1: ('destination', TezosContractID, None), + 2: ('amount', p.UVarintType, None), } diff --git a/python/src/trezorlib/messages/TezosOriginationOp.py b/python/src/trezorlib/messages/TezosOriginationOp.py index f31bafd10..c09d97dfc 100644 --- a/python/src/trezorlib/messages/TezosOriginationOp.py +++ b/python/src/trezorlib/messages/TezosOriginationOp.py @@ -14,6 +14,7 @@ class TezosOriginationOp(p.MessageType): def __init__( self, + *, source: bytes = None, fee: int = None, counter: int = None, @@ -41,15 +42,15 @@ class TezosOriginationOp(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 12: ('source', p.BytesType, 0), - 2: ('fee', p.UVarintType, 0), - 3: ('counter', p.UVarintType, 0), - 4: ('gas_limit', p.UVarintType, 0), - 5: ('storage_limit', p.UVarintType, 0), - 6: ('manager_pubkey', p.BytesType, 0), - 7: ('balance', p.UVarintType, 0), - 8: ('spendable', p.BoolType, 0), - 9: ('delegatable', p.BoolType, 0), - 10: ('delegate', p.BytesType, 0), - 11: ('script', p.BytesType, 0), + 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), + 6: ('manager_pubkey', p.BytesType, None), + 7: ('balance', p.UVarintType, None), + 8: ('spendable', p.BoolType, None), + 9: ('delegatable', p.BoolType, None), + 10: ('delegate', p.BytesType, None), + 11: ('script', p.BytesType, None), } diff --git a/python/src/trezorlib/messages/TezosParametersManager.py b/python/src/trezorlib/messages/TezosParametersManager.py index 9eb13474a..2e6ff6c0d 100644 --- a/python/src/trezorlib/messages/TezosParametersManager.py +++ b/python/src/trezorlib/messages/TezosParametersManager.py @@ -16,6 +16,7 @@ class TezosParametersManager(p.MessageType): def __init__( self, + *, set_delegate: bytes = None, cancel_delegate: bool = None, transfer: TezosManagerTransfer = None, @@ -27,7 +28,7 @@ class TezosParametersManager(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('set_delegate', p.BytesType, 0), - 2: ('cancel_delegate', p.BoolType, 0), - 3: ('transfer', TezosManagerTransfer, 0), + 1: ('set_delegate', p.BytesType, None), + 2: ('cancel_delegate', p.BoolType, None), + 3: ('transfer', TezosManagerTransfer, None), } diff --git a/python/src/trezorlib/messages/TezosProposalOp.py b/python/src/trezorlib/messages/TezosProposalOp.py index ded5df7ee..574f01816 100644 --- a/python/src/trezorlib/messages/TezosProposalOp.py +++ b/python/src/trezorlib/messages/TezosProposalOp.py @@ -14,18 +14,19 @@ class TezosProposalOp(p.MessageType): def __init__( self, + *, + proposals: List[bytes] = None, source: bytes = None, period: int = None, - proposals: List[bytes] = None, ) -> None: + self.proposals = proposals if proposals is not None else [] self.source = source self.period = period - self.proposals = proposals if proposals is not None else [] @classmethod def get_fields(cls) -> Dict: return { - 1: ('source', p.BytesType, 0), - 2: ('period', p.UVarintType, 0), + 1: ('source', p.BytesType, None), + 2: ('period', p.UVarintType, None), 4: ('proposals', p.BytesType, p.FLAG_REPEATED), } diff --git a/python/src/trezorlib/messages/TezosPublicKey.py b/python/src/trezorlib/messages/TezosPublicKey.py index 5df6cf205..2bae655d5 100644 --- a/python/src/trezorlib/messages/TezosPublicKey.py +++ b/python/src/trezorlib/messages/TezosPublicKey.py @@ -15,6 +15,7 @@ class TezosPublicKey(p.MessageType): def __init__( self, + *, public_key: str = None, ) -> None: self.public_key = public_key @@ -22,5 +23,5 @@ class TezosPublicKey(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('public_key', p.UnicodeType, 0), + 1: ('public_key', p.UnicodeType, None), } diff --git a/python/src/trezorlib/messages/TezosRevealOp.py b/python/src/trezorlib/messages/TezosRevealOp.py index 08a700afa..78c5e036b 100644 --- a/python/src/trezorlib/messages/TezosRevealOp.py +++ b/python/src/trezorlib/messages/TezosRevealOp.py @@ -14,6 +14,7 @@ class TezosRevealOp(p.MessageType): def __init__( self, + *, source: bytes = None, fee: int = None, counter: int = None, @@ -31,10 +32,10 @@ class TezosRevealOp(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 7: ('source', p.BytesType, 0), - 2: ('fee', p.UVarintType, 0), - 3: ('counter', p.UVarintType, 0), - 4: ('gas_limit', p.UVarintType, 0), - 5: ('storage_limit', p.UVarintType, 0), - 6: ('public_key', p.BytesType, 0), + 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), } diff --git a/python/src/trezorlib/messages/TezosSignTx.py b/python/src/trezorlib/messages/TezosSignTx.py index 5425aff73..a86f4c928 100644 --- a/python/src/trezorlib/messages/TezosSignTx.py +++ b/python/src/trezorlib/messages/TezosSignTx.py @@ -22,6 +22,7 @@ class TezosSignTx(p.MessageType): def __init__( self, + *, address_n: List[int] = None, branch: bytes = None, reveal: TezosRevealOp = None, @@ -44,11 +45,11 @@ class TezosSignTx(p.MessageType): def get_fields(cls) -> Dict: return { 1: ('address_n', p.UVarintType, p.FLAG_REPEATED), - 2: ('branch', p.BytesType, 0), - 3: ('reveal', TezosRevealOp, 0), - 4: ('transaction', TezosTransactionOp, 0), - 5: ('origination', TezosOriginationOp, 0), - 6: ('delegation', TezosDelegationOp, 0), - 7: ('proposal', TezosProposalOp, 0), - 8: ('ballot', TezosBallotOp, 0), + 2: ('branch', p.BytesType, None), + 3: ('reveal', TezosRevealOp, None), + 4: ('transaction', TezosTransactionOp, None), + 5: ('origination', TezosOriginationOp, None), + 6: ('delegation', TezosDelegationOp, None), + 7: ('proposal', TezosProposalOp, None), + 8: ('ballot', TezosBallotOp, None), } diff --git a/python/src/trezorlib/messages/TezosSignedTx.py b/python/src/trezorlib/messages/TezosSignedTx.py index c73a927a1..dbf5724be 100644 --- a/python/src/trezorlib/messages/TezosSignedTx.py +++ b/python/src/trezorlib/messages/TezosSignedTx.py @@ -15,6 +15,7 @@ class TezosSignedTx(p.MessageType): def __init__( self, + *, signature: str = None, sig_op_contents: bytes = None, operation_hash: str = None, @@ -26,7 +27,7 @@ class TezosSignedTx(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('signature', p.UnicodeType, 0), - 2: ('sig_op_contents', p.BytesType, 0), - 3: ('operation_hash', p.UnicodeType, 0), + 1: ('signature', p.UnicodeType, None), + 2: ('sig_op_contents', p.BytesType, None), + 3: ('operation_hash', p.UnicodeType, None), } diff --git a/python/src/trezorlib/messages/TezosTransactionOp.py b/python/src/trezorlib/messages/TezosTransactionOp.py index 97690bd91..dc0c13405 100644 --- a/python/src/trezorlib/messages/TezosTransactionOp.py +++ b/python/src/trezorlib/messages/TezosTransactionOp.py @@ -17,6 +17,7 @@ class TezosTransactionOp(p.MessageType): def __init__( self, + *, source: bytes = None, fee: int = None, counter: int = None, @@ -40,13 +41,13 @@ class TezosTransactionOp(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 9: ('source', p.BytesType, 0), - 2: ('fee', p.UVarintType, 0), - 3: ('counter', p.UVarintType, 0), - 4: ('gas_limit', p.UVarintType, 0), - 5: ('storage_limit', p.UVarintType, 0), - 6: ('amount', p.UVarintType, 0), - 7: ('destination', TezosContractID, 0), - 8: ('parameters', p.BytesType, 0), - 10: ('parameters_manager', TezosParametersManager, 0), + 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), + 8: ('parameters', p.BytesType, None), + 10: ('parameters_manager', TezosParametersManager, None), } diff --git a/python/src/trezorlib/messages/TransactionType.py b/python/src/trezorlib/messages/TransactionType.py index c3eb7698d..3f2069843 100644 --- a/python/src/trezorlib/messages/TransactionType.py +++ b/python/src/trezorlib/messages/TransactionType.py @@ -18,11 +18,12 @@ class TransactionType(p.MessageType): def __init__( self, - version: int = None, + *, inputs: List[TxInputType] = None, bin_outputs: List[TxOutputBinType] = None, - lock_time: int = None, outputs: List[TxOutputType] = None, + version: int = None, + lock_time: int = None, inputs_cnt: int = None, outputs_cnt: int = None, extra_data: bytes = None, @@ -33,11 +34,11 @@ class TransactionType(p.MessageType): timestamp: int = None, branch_id: int = None, ) -> None: - self.version = version self.inputs = inputs if inputs is not None else [] self.bin_outputs = bin_outputs if bin_outputs is not None else [] - self.lock_time = lock_time self.outputs = outputs if outputs is not None else [] + self.version = version + self.lock_time = lock_time self.inputs_cnt = inputs_cnt self.outputs_cnt = outputs_cnt self.extra_data = extra_data @@ -51,18 +52,18 @@ class TransactionType(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('version', p.UVarintType, 0), + 1: ('version', p.UVarintType, None), 2: ('inputs', TxInputType, p.FLAG_REPEATED), 3: ('bin_outputs', TxOutputBinType, p.FLAG_REPEATED), - 4: ('lock_time', p.UVarintType, 0), + 4: ('lock_time', p.UVarintType, None), 5: ('outputs', TxOutputType, p.FLAG_REPEATED), - 6: ('inputs_cnt', p.UVarintType, 0), - 7: ('outputs_cnt', p.UVarintType, 0), - 8: ('extra_data', p.BytesType, 0), - 9: ('extra_data_len', p.UVarintType, 0), - 10: ('expiry', p.UVarintType, 0), - 11: ('overwintered', p.BoolType, 0), - 12: ('version_group_id', p.UVarintType, 0), - 13: ('timestamp', p.UVarintType, 0), - 14: ('branch_id', p.UVarintType, 0), + 6: ('inputs_cnt', p.UVarintType, None), + 7: ('outputs_cnt', p.UVarintType, None), + 8: ('extra_data', p.BytesType, None), + 9: ('extra_data_len', p.UVarintType, None), + 10: ('expiry', p.UVarintType, None), + 11: ('overwintered', p.BoolType, None), + 12: ('version_group_id', p.UVarintType, None), + 13: ('timestamp', p.UVarintType, None), + 14: ('branch_id', p.UVarintType, None), } diff --git a/python/src/trezorlib/messages/TxAck.py b/python/src/trezorlib/messages/TxAck.py index 8c8315cc6..99fa626a6 100644 --- a/python/src/trezorlib/messages/TxAck.py +++ b/python/src/trezorlib/messages/TxAck.py @@ -17,6 +17,7 @@ class TxAck(p.MessageType): def __init__( self, + *, tx: TransactionType = None, ) -> None: self.tx = tx @@ -24,5 +25,5 @@ class TxAck(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('tx', TransactionType, 0), + 1: ('tx', TransactionType, None), } diff --git a/python/src/trezorlib/messages/TxAckInput.py b/python/src/trezorlib/messages/TxAckInput.py new file mode 100644 index 000000000..b7f84b30e --- /dev/null +++ b/python/src/trezorlib/messages/TxAckInput.py @@ -0,0 +1,29 @@ +# Automatically generated by pb2py +# fmt: off +from .. import protobuf as p + +from .TxAckInputWrapper import TxAckInputWrapper + +if __debug__: + try: + from typing import Dict, List # noqa: F401 + from typing_extensions import Literal # noqa: F401 + except ImportError: + pass + + +class TxAckInput(p.MessageType): + MESSAGE_WIRE_TYPE = 22 + + def __init__( + self, + *, + tx: TxAckInputWrapper, + ) -> None: + self.tx = tx + + @classmethod + def get_fields(cls) -> Dict: + return { + 1: ('tx', TxAckInputWrapper, p.FLAG_REQUIRED), + } diff --git a/python/src/trezorlib/messages/TxAckInputType.py b/python/src/trezorlib/messages/TxAckInputType.py new file mode 100644 index 000000000..990f3d2ee --- /dev/null +++ b/python/src/trezorlib/messages/TxAckInputType.py @@ -0,0 +1,62 @@ +# Automatically generated by pb2py +# fmt: off +from .. import protobuf as p + +from .MultisigRedeemScriptType import MultisigRedeemScriptType + +if __debug__: + try: + from typing import Dict, List # noqa: F401 + from typing_extensions import Literal # noqa: F401 + EnumTypeInputScriptType = Literal[0, 1, 2, 3, 4] + except ImportError: + pass + + +class TxAckInputType(p.MessageType): + + def __init__( + self, + *, + prev_hash: bytes, + prev_index: int, + amount: int, + address_n: List[int] = None, + script_sig: bytes = None, + sequence: int = 4294967295, + script_type: EnumTypeInputScriptType = 0, + multisig: MultisigRedeemScriptType = None, + decred_tree: int = None, + witness: bytes = None, + ownership_proof: bytes = None, + commitment_data: bytes = None, + ) -> None: + self.address_n = address_n if address_n is not None else [] + self.prev_hash = prev_hash + self.prev_index = prev_index + self.amount = amount + self.script_sig = script_sig + self.sequence = sequence + self.script_type = script_type + self.multisig = multisig + self.decred_tree = decred_tree + self.witness = witness + self.ownership_proof = ownership_proof + self.commitment_data = commitment_data + + @classmethod + def get_fields(cls) -> Dict: + return { + 1: ('address_n', p.UVarintType, p.FLAG_REPEATED), + 2: ('prev_hash', p.BytesType, p.FLAG_REQUIRED), + 3: ('prev_index', p.UVarintType, p.FLAG_REQUIRED), + 4: ('script_sig', p.BytesType, None), + 5: ('sequence', p.UVarintType, 4294967295), # default=4294967295 + 6: ('script_type', p.EnumType("InputScriptType", (0, 1, 2, 3, 4)), 0), # default=SPENDADDRESS + 7: ('multisig', MultisigRedeemScriptType, None), + 8: ('amount', p.UVarintType, p.FLAG_REQUIRED), + 9: ('decred_tree', p.UVarintType, None), + 13: ('witness', p.BytesType, None), + 14: ('ownership_proof', p.BytesType, None), + 15: ('commitment_data', p.BytesType, None), + } diff --git a/python/src/trezorlib/messages/TxAckInputWrapper.py b/python/src/trezorlib/messages/TxAckInputWrapper.py new file mode 100644 index 000000000..881a88b07 --- /dev/null +++ b/python/src/trezorlib/messages/TxAckInputWrapper.py @@ -0,0 +1,28 @@ +# Automatically generated by pb2py +# fmt: off +from .. import protobuf as p + +from .TxAckInputType import TxAckInputType + +if __debug__: + try: + from typing import Dict, List # noqa: F401 + from typing_extensions import Literal # noqa: F401 + except ImportError: + pass + + +class TxAckInputWrapper(p.MessageType): + + def __init__( + self, + *, + input: TxAckInputType, + ) -> None: + self.input = input + + @classmethod + def get_fields(cls) -> Dict: + return { + 2: ('input', TxAckInputType, p.FLAG_REQUIRED), + } diff --git a/python/src/trezorlib/messages/TxAckOutput.py b/python/src/trezorlib/messages/TxAckOutput.py new file mode 100644 index 000000000..aeb5542be --- /dev/null +++ b/python/src/trezorlib/messages/TxAckOutput.py @@ -0,0 +1,29 @@ +# Automatically generated by pb2py +# fmt: off +from .. import protobuf as p + +from .TxAckOutputWrapper import TxAckOutputWrapper + +if __debug__: + try: + from typing import Dict, List # noqa: F401 + from typing_extensions import Literal # noqa: F401 + except ImportError: + pass + + +class TxAckOutput(p.MessageType): + MESSAGE_WIRE_TYPE = 22 + + def __init__( + self, + *, + tx: TxAckOutputWrapper, + ) -> None: + self.tx = tx + + @classmethod + def get_fields(cls) -> Dict: + return { + 1: ('tx', TxAckOutputWrapper, p.FLAG_REQUIRED), + } diff --git a/python/src/trezorlib/messages/TxAckOutputType.py b/python/src/trezorlib/messages/TxAckOutputType.py new file mode 100644 index 000000000..5c5897222 --- /dev/null +++ b/python/src/trezorlib/messages/TxAckOutputType.py @@ -0,0 +1,44 @@ +# Automatically generated by pb2py +# fmt: off +from .. import protobuf as p + +from .MultisigRedeemScriptType import MultisigRedeemScriptType + +if __debug__: + try: + from typing import Dict, List # noqa: F401 + from typing_extensions import Literal # noqa: F401 + EnumTypeOutputScriptType = Literal[0, 1, 2, 3, 4, 5] + except ImportError: + pass + + +class TxAckOutputType(p.MessageType): + + def __init__( + self, + *, + amount: int, + address_n: List[int] = None, + address: str = None, + script_type: EnumTypeOutputScriptType = 0, + multisig: MultisigRedeemScriptType = None, + op_return_data: bytes = None, + ) -> None: + self.address_n = address_n if address_n is not None else [] + self.amount = amount + self.address = address + self.script_type = script_type + self.multisig = multisig + self.op_return_data = op_return_data + + @classmethod + def get_fields(cls) -> Dict: + return { + 1: ('address', p.UnicodeType, None), + 2: ('address_n', p.UVarintType, p.FLAG_REPEATED), + 3: ('amount', p.UVarintType, p.FLAG_REQUIRED), + 4: ('script_type', p.EnumType("OutputScriptType", (0, 1, 2, 3, 4, 5)), 0), # default=PAYTOADDRESS + 5: ('multisig', MultisigRedeemScriptType, None), + 6: ('op_return_data', p.BytesType, None), + } diff --git a/python/src/trezorlib/messages/TxAckOutputWrapper.py b/python/src/trezorlib/messages/TxAckOutputWrapper.py new file mode 100644 index 000000000..8bf281528 --- /dev/null +++ b/python/src/trezorlib/messages/TxAckOutputWrapper.py @@ -0,0 +1,28 @@ +# Automatically generated by pb2py +# fmt: off +from .. import protobuf as p + +from .TxAckOutputType import TxAckOutputType + +if __debug__: + try: + from typing import Dict, List # noqa: F401 + from typing_extensions import Literal # noqa: F401 + except ImportError: + pass + + +class TxAckOutputWrapper(p.MessageType): + + def __init__( + self, + *, + output: TxAckOutputType, + ) -> None: + self.output = output + + @classmethod + def get_fields(cls) -> Dict: + return { + 5: ('output', TxAckOutputType, p.FLAG_REQUIRED), + } diff --git a/python/src/trezorlib/messages/TxAckPrevExtraData.py b/python/src/trezorlib/messages/TxAckPrevExtraData.py new file mode 100644 index 000000000..4bb6d0f8b --- /dev/null +++ b/python/src/trezorlib/messages/TxAckPrevExtraData.py @@ -0,0 +1,29 @@ +# Automatically generated by pb2py +# fmt: off +from .. import protobuf as p + +from .TxAckPrevExtraDataWrapper import TxAckPrevExtraDataWrapper + +if __debug__: + try: + from typing import Dict, List # noqa: F401 + from typing_extensions import Literal # noqa: F401 + except ImportError: + pass + + +class TxAckPrevExtraData(p.MessageType): + MESSAGE_WIRE_TYPE = 22 + + def __init__( + self, + *, + tx: TxAckPrevExtraDataWrapper, + ) -> None: + self.tx = tx + + @classmethod + def get_fields(cls) -> Dict: + return { + 1: ('tx', TxAckPrevExtraDataWrapper, p.FLAG_REQUIRED), + } diff --git a/python/src/trezorlib/messages/TxAckPrevExtraDataWrapper.py b/python/src/trezorlib/messages/TxAckPrevExtraDataWrapper.py new file mode 100644 index 000000000..47b720e24 --- /dev/null +++ b/python/src/trezorlib/messages/TxAckPrevExtraDataWrapper.py @@ -0,0 +1,26 @@ +# Automatically generated by pb2py +# fmt: off +from .. import protobuf as p + +if __debug__: + try: + from typing import Dict, List # noqa: F401 + from typing_extensions import Literal # noqa: F401 + except ImportError: + pass + + +class TxAckPrevExtraDataWrapper(p.MessageType): + + def __init__( + self, + *, + extra_data_chunk: bytes, + ) -> None: + self.extra_data_chunk = extra_data_chunk + + @classmethod + def get_fields(cls) -> Dict: + return { + 8: ('extra_data_chunk', p.BytesType, p.FLAG_REQUIRED), + } diff --git a/python/src/trezorlib/messages/TxAckPrevInput.py b/python/src/trezorlib/messages/TxAckPrevInput.py new file mode 100644 index 000000000..c51a252dc --- /dev/null +++ b/python/src/trezorlib/messages/TxAckPrevInput.py @@ -0,0 +1,29 @@ +# Automatically generated by pb2py +# fmt: off +from .. import protobuf as p + +from .TxAckPrevInputWrapper import TxAckPrevInputWrapper + +if __debug__: + try: + from typing import Dict, List # noqa: F401 + from typing_extensions import Literal # noqa: F401 + except ImportError: + pass + + +class TxAckPrevInput(p.MessageType): + MESSAGE_WIRE_TYPE = 22 + + def __init__( + self, + *, + tx: TxAckPrevInputWrapper, + ) -> None: + self.tx = tx + + @classmethod + def get_fields(cls) -> Dict: + return { + 1: ('tx', TxAckPrevInputWrapper, p.FLAG_REQUIRED), + } diff --git a/python/src/trezorlib/messages/TxAckPrevInputType.py b/python/src/trezorlib/messages/TxAckPrevInputType.py new file mode 100644 index 000000000..e0c46b865 --- /dev/null +++ b/python/src/trezorlib/messages/TxAckPrevInputType.py @@ -0,0 +1,38 @@ +# Automatically generated by pb2py +# fmt: off +from .. import protobuf as p + +if __debug__: + try: + from typing import Dict, List # noqa: F401 + from typing_extensions import Literal # noqa: F401 + except ImportError: + pass + + +class TxAckPrevInputType(p.MessageType): + + def __init__( + self, + *, + prev_hash: bytes, + prev_index: int, + script_sig: bytes, + sequence: int, + decred_tree: int = None, + ) -> None: + self.prev_hash = prev_hash + self.prev_index = prev_index + self.script_sig = script_sig + self.sequence = sequence + self.decred_tree = decred_tree + + @classmethod + def get_fields(cls) -> Dict: + return { + 2: ('prev_hash', p.BytesType, p.FLAG_REQUIRED), + 3: ('prev_index', p.UVarintType, p.FLAG_REQUIRED), + 4: ('script_sig', p.BytesType, p.FLAG_REQUIRED), + 5: ('sequence', p.UVarintType, p.FLAG_REQUIRED), + 9: ('decred_tree', p.UVarintType, None), + } diff --git a/python/src/trezorlib/messages/TxAckPrevInputWrapper.py b/python/src/trezorlib/messages/TxAckPrevInputWrapper.py new file mode 100644 index 000000000..918aa4a1b --- /dev/null +++ b/python/src/trezorlib/messages/TxAckPrevInputWrapper.py @@ -0,0 +1,28 @@ +# Automatically generated by pb2py +# fmt: off +from .. import protobuf as p + +from .TxAckPrevInputType import TxAckPrevInputType + +if __debug__: + try: + from typing import Dict, List # noqa: F401 + from typing_extensions import Literal # noqa: F401 + except ImportError: + pass + + +class TxAckPrevInputWrapper(p.MessageType): + + def __init__( + self, + *, + input: TxAckPrevInputType, + ) -> None: + self.input = input + + @classmethod + def get_fields(cls) -> Dict: + return { + 2: ('input', TxAckPrevInputType, p.FLAG_REQUIRED), + } diff --git a/python/src/trezorlib/messages/TxAckPrevMeta.py b/python/src/trezorlib/messages/TxAckPrevMeta.py new file mode 100644 index 000000000..cce79b230 --- /dev/null +++ b/python/src/trezorlib/messages/TxAckPrevMeta.py @@ -0,0 +1,29 @@ +# Automatically generated by pb2py +# fmt: off +from .. import protobuf as p + +from .TxAckPrevTxType import TxAckPrevTxType + +if __debug__: + try: + from typing import Dict, List # noqa: F401 + from typing_extensions import Literal # noqa: F401 + except ImportError: + pass + + +class TxAckPrevMeta(p.MessageType): + MESSAGE_WIRE_TYPE = 22 + + def __init__( + self, + *, + tx: TxAckPrevTxType, + ) -> None: + self.tx = tx + + @classmethod + def get_fields(cls) -> Dict: + return { + 1: ('tx', TxAckPrevTxType, p.FLAG_REQUIRED), + } diff --git a/python/src/trezorlib/messages/TxAckPrevOutput.py b/python/src/trezorlib/messages/TxAckPrevOutput.py new file mode 100644 index 000000000..f95152641 --- /dev/null +++ b/python/src/trezorlib/messages/TxAckPrevOutput.py @@ -0,0 +1,29 @@ +# Automatically generated by pb2py +# fmt: off +from .. import protobuf as p + +from .TxAckPrevOutputWrapper import TxAckPrevOutputWrapper + +if __debug__: + try: + from typing import Dict, List # noqa: F401 + from typing_extensions import Literal # noqa: F401 + except ImportError: + pass + + +class TxAckPrevOutput(p.MessageType): + MESSAGE_WIRE_TYPE = 22 + + def __init__( + self, + *, + tx: TxAckPrevOutputWrapper, + ) -> None: + self.tx = tx + + @classmethod + def get_fields(cls) -> Dict: + return { + 1: ('tx', TxAckPrevOutputWrapper, p.FLAG_REQUIRED), + } diff --git a/python/src/trezorlib/messages/TxAckPrevOutputType.py b/python/src/trezorlib/messages/TxAckPrevOutputType.py new file mode 100644 index 000000000..ced71a1cb --- /dev/null +++ b/python/src/trezorlib/messages/TxAckPrevOutputType.py @@ -0,0 +1,32 @@ +# Automatically generated by pb2py +# fmt: off +from .. import protobuf as p + +if __debug__: + try: + from typing import Dict, List # noqa: F401 + from typing_extensions import Literal # noqa: F401 + except ImportError: + pass + + +class TxAckPrevOutputType(p.MessageType): + + def __init__( + self, + *, + amount: int, + script_pubkey: bytes, + decred_script_version: int = None, + ) -> None: + self.amount = amount + self.script_pubkey = script_pubkey + self.decred_script_version = decred_script_version + + @classmethod + def get_fields(cls) -> Dict: + return { + 1: ('amount', p.UVarintType, p.FLAG_REQUIRED), + 2: ('script_pubkey', p.BytesType, p.FLAG_REQUIRED), + 3: ('decred_script_version', p.UVarintType, None), + } diff --git a/python/src/trezorlib/messages/TxAckPrevOutputWrapper.py b/python/src/trezorlib/messages/TxAckPrevOutputWrapper.py new file mode 100644 index 000000000..955ff2d8a --- /dev/null +++ b/python/src/trezorlib/messages/TxAckPrevOutputWrapper.py @@ -0,0 +1,28 @@ +# Automatically generated by pb2py +# fmt: off +from .. import protobuf as p + +from .TxAckPrevOutputType import TxAckPrevOutputType + +if __debug__: + try: + from typing import Dict, List # noqa: F401 + from typing_extensions import Literal # noqa: F401 + except ImportError: + pass + + +class TxAckPrevOutputWrapper(p.MessageType): + + def __init__( + self, + *, + output: TxAckPrevOutputType, + ) -> None: + self.output = output + + @classmethod + def get_fields(cls) -> Dict: + return { + 3: ('output', TxAckPrevOutputType, p.FLAG_REQUIRED), + } diff --git a/python/src/trezorlib/messages/TxAckPrevTxType.py b/python/src/trezorlib/messages/TxAckPrevTxType.py new file mode 100644 index 000000000..a3d893ab1 --- /dev/null +++ b/python/src/trezorlib/messages/TxAckPrevTxType.py @@ -0,0 +1,50 @@ +# Automatically generated by pb2py +# fmt: off +from .. import protobuf as p + +if __debug__: + try: + from typing import Dict, List # noqa: F401 + from typing_extensions import Literal # noqa: F401 + except ImportError: + pass + + +class TxAckPrevTxType(p.MessageType): + + def __init__( + self, + *, + version: int, + lock_time: int, + inputs_count: int, + outputs_count: int, + extra_data_len: int = 0, + expiry: int = None, + version_group_id: int = None, + timestamp: int = None, + branch_id: int = None, + ) -> None: + self.version = version + self.lock_time = lock_time + self.inputs_count = inputs_count + self.outputs_count = outputs_count + self.extra_data_len = extra_data_len + self.expiry = expiry + self.version_group_id = version_group_id + self.timestamp = timestamp + self.branch_id = branch_id + + @classmethod + def get_fields(cls) -> Dict: + return { + 1: ('version', p.UVarintType, p.FLAG_REQUIRED), + 4: ('lock_time', p.UVarintType, p.FLAG_REQUIRED), + 6: ('inputs_count', p.UVarintType, p.FLAG_REQUIRED), + 7: ('outputs_count', p.UVarintType, p.FLAG_REQUIRED), + 9: ('extra_data_len', p.UVarintType, 0), # default=0 + 10: ('expiry', p.UVarintType, None), + 12: ('version_group_id', p.UVarintType, None), + 13: ('timestamp', p.UVarintType, None), + 14: ('branch_id', p.UVarintType, None), + } diff --git a/python/src/trezorlib/messages/TxInputType.py b/python/src/trezorlib/messages/TxInputType.py index d9406e05a..25920c6d7 100644 --- a/python/src/trezorlib/messages/TxInputType.py +++ b/python/src/trezorlib/messages/TxInputType.py @@ -17,12 +17,13 @@ class TxInputType(p.MessageType): def __init__( self, + *, + prev_hash: bytes, + prev_index: int, address_n: List[int] = None, - prev_hash: bytes = None, - prev_index: int = None, script_sig: bytes = None, - sequence: int = None, - script_type: EnumTypeInputScriptType = None, + sequence: int = 4294967295, + script_type: EnumTypeInputScriptType = 0, multisig: MultisigRedeemScriptType = None, amount: int = None, decred_tree: int = None, @@ -47,15 +48,15 @@ class TxInputType(p.MessageType): def get_fields(cls) -> Dict: return { 1: ('address_n', p.UVarintType, p.FLAG_REPEATED), - 2: ('prev_hash', p.BytesType, 0), # required - 3: ('prev_index', p.UVarintType, 0), # required - 4: ('script_sig', p.BytesType, 0), - 5: ('sequence', p.UVarintType, 0), # default=4294967295 + 2: ('prev_hash', p.BytesType, p.FLAG_REQUIRED), + 3: ('prev_index', p.UVarintType, p.FLAG_REQUIRED), + 4: ('script_sig', p.BytesType, None), + 5: ('sequence', p.UVarintType, 4294967295), # default=4294967295 6: ('script_type', p.EnumType("InputScriptType", (0, 1, 2, 3, 4)), 0), # default=SPENDADDRESS - 7: ('multisig', MultisigRedeemScriptType, 0), - 8: ('amount', p.UVarintType, 0), - 9: ('decred_tree', p.UVarintType, 0), - 13: ('witness', p.BytesType, 0), - 14: ('ownership_proof', p.BytesType, 0), - 15: ('commitment_data', p.BytesType, 0), + 7: ('multisig', MultisigRedeemScriptType, None), + 8: ('amount', p.UVarintType, None), + 9: ('decred_tree', p.UVarintType, None), + 13: ('witness', p.BytesType, None), + 14: ('ownership_proof', p.BytesType, None), + 15: ('commitment_data', p.BytesType, None), } diff --git a/python/src/trezorlib/messages/TxOutputBinType.py b/python/src/trezorlib/messages/TxOutputBinType.py index d828b9c91..edcaaee88 100644 --- a/python/src/trezorlib/messages/TxOutputBinType.py +++ b/python/src/trezorlib/messages/TxOutputBinType.py @@ -14,8 +14,9 @@ class TxOutputBinType(p.MessageType): def __init__( self, - amount: int = None, - script_pubkey: bytes = None, + *, + amount: int, + script_pubkey: bytes, decred_script_version: int = None, ) -> None: self.amount = amount @@ -25,7 +26,7 @@ class TxOutputBinType(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('amount', p.UVarintType, 0), # required - 2: ('script_pubkey', p.BytesType, 0), # required - 3: ('decred_script_version', p.UVarintType, 0), + 1: ('amount', p.UVarintType, p.FLAG_REQUIRED), + 2: ('script_pubkey', p.BytesType, p.FLAG_REQUIRED), + 3: ('decred_script_version', p.UVarintType, None), } diff --git a/python/src/trezorlib/messages/TxOutputType.py b/python/src/trezorlib/messages/TxOutputType.py index b3f553747..6db15b323 100644 --- a/python/src/trezorlib/messages/TxOutputType.py +++ b/python/src/trezorlib/messages/TxOutputType.py @@ -17,16 +17,17 @@ class TxOutputType(p.MessageType): def __init__( self, - address: str = None, + *, + amount: int, address_n: List[int] = None, - amount: int = None, - script_type: EnumTypeOutputScriptType = None, + address: str = None, + script_type: EnumTypeOutputScriptType = 0, multisig: MultisigRedeemScriptType = None, op_return_data: bytes = None, ) -> None: - self.address = address self.address_n = address_n if address_n is not None else [] self.amount = amount + self.address = address self.script_type = script_type self.multisig = multisig self.op_return_data = op_return_data @@ -34,10 +35,10 @@ class TxOutputType(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('address', p.UnicodeType, 0), + 1: ('address', p.UnicodeType, None), 2: ('address_n', p.UVarintType, p.FLAG_REPEATED), - 3: ('amount', p.UVarintType, 0), # required - 4: ('script_type', p.EnumType("OutputScriptType", (0, 1, 2, 3, 4, 5)), 0), # required - 5: ('multisig', MultisigRedeemScriptType, 0), - 6: ('op_return_data', p.BytesType, 0), + 3: ('amount', p.UVarintType, p.FLAG_REQUIRED), + 4: ('script_type', p.EnumType("OutputScriptType", (0, 1, 2, 3, 4, 5)), 0), # default=PAYTOADDRESS + 5: ('multisig', MultisigRedeemScriptType, None), + 6: ('op_return_data', p.BytesType, None), } diff --git a/python/src/trezorlib/messages/TxRequest.py b/python/src/trezorlib/messages/TxRequest.py index 26c2db1a3..09fda7c9a 100644 --- a/python/src/trezorlib/messages/TxRequest.py +++ b/python/src/trezorlib/messages/TxRequest.py @@ -19,6 +19,7 @@ class TxRequest(p.MessageType): def __init__( self, + *, request_type: EnumTypeRequestType = None, details: TxRequestDetailsType = None, serialized: TxRequestSerializedType = None, @@ -30,7 +31,7 @@ class TxRequest(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('request_type', p.EnumType("RequestType", (0, 1, 2, 3, 4)), 0), - 2: ('details', TxRequestDetailsType, 0), - 3: ('serialized', TxRequestSerializedType, 0), + 1: ('request_type', p.EnumType("RequestType", (0, 1, 2, 3, 4)), None), + 2: ('details', TxRequestDetailsType, None), + 3: ('serialized', TxRequestSerializedType, None), } diff --git a/python/src/trezorlib/messages/TxRequestDetailsType.py b/python/src/trezorlib/messages/TxRequestDetailsType.py index f378a09c1..9c4c9fb4e 100644 --- a/python/src/trezorlib/messages/TxRequestDetailsType.py +++ b/python/src/trezorlib/messages/TxRequestDetailsType.py @@ -14,6 +14,7 @@ class TxRequestDetailsType(p.MessageType): def __init__( self, + *, request_index: int = None, tx_hash: bytes = None, extra_data_len: int = None, @@ -27,8 +28,8 @@ class TxRequestDetailsType(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('request_index', p.UVarintType, 0), - 2: ('tx_hash', p.BytesType, 0), - 3: ('extra_data_len', p.UVarintType, 0), - 4: ('extra_data_offset', p.UVarintType, 0), + 1: ('request_index', p.UVarintType, None), + 2: ('tx_hash', p.BytesType, None), + 3: ('extra_data_len', p.UVarintType, None), + 4: ('extra_data_offset', p.UVarintType, None), } diff --git a/python/src/trezorlib/messages/TxRequestSerializedType.py b/python/src/trezorlib/messages/TxRequestSerializedType.py index 433fbf3f6..179698032 100644 --- a/python/src/trezorlib/messages/TxRequestSerializedType.py +++ b/python/src/trezorlib/messages/TxRequestSerializedType.py @@ -14,6 +14,7 @@ class TxRequestSerializedType(p.MessageType): def __init__( self, + *, signature_index: int = None, signature: bytes = None, serialized_tx: bytes = None, @@ -25,7 +26,7 @@ class TxRequestSerializedType(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('signature_index', p.UVarintType, 0), - 2: ('signature', p.BytesType, 0), - 3: ('serialized_tx', p.BytesType, 0), + 1: ('signature_index', p.UVarintType, None), + 2: ('signature', p.BytesType, None), + 3: ('serialized_tx', p.BytesType, None), } diff --git a/python/src/trezorlib/messages/VerifyMessage.py b/python/src/trezorlib/messages/VerifyMessage.py index c0f6a635e..c24505b11 100644 --- a/python/src/trezorlib/messages/VerifyMessage.py +++ b/python/src/trezorlib/messages/VerifyMessage.py @@ -15,10 +15,11 @@ class VerifyMessage(p.MessageType): def __init__( self, - address: str = None, - signature: bytes = None, - message: bytes = None, - coin_name: str = None, + *, + address: str, + signature: bytes, + message: bytes, + coin_name: str = "Bitcoin", ) -> None: self.address = address self.signature = signature @@ -28,8 +29,8 @@ class VerifyMessage(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('address', p.UnicodeType, 0), - 2: ('signature', p.BytesType, 0), - 3: ('message', p.BytesType, 0), - 4: ('coin_name', p.UnicodeType, 0), # default=Bitcoin + 1: ('address', p.UnicodeType, p.FLAG_REQUIRED), + 2: ('signature', p.BytesType, p.FLAG_REQUIRED), + 3: ('message', p.BytesType, p.FLAG_REQUIRED), + 4: ('coin_name', p.UnicodeType, "Bitcoin"), # default=Bitcoin } diff --git a/python/src/trezorlib/messages/WebAuthnAddResidentCredential.py b/python/src/trezorlib/messages/WebAuthnAddResidentCredential.py index 032b51637..fa9694bd4 100644 --- a/python/src/trezorlib/messages/WebAuthnAddResidentCredential.py +++ b/python/src/trezorlib/messages/WebAuthnAddResidentCredential.py @@ -15,6 +15,7 @@ class WebAuthnAddResidentCredential(p.MessageType): def __init__( self, + *, credential_id: bytes = None, ) -> None: self.credential_id = credential_id @@ -22,5 +23,5 @@ class WebAuthnAddResidentCredential(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('credential_id', p.BytesType, 0), + 1: ('credential_id', p.BytesType, None), } diff --git a/python/src/trezorlib/messages/WebAuthnCredential.py b/python/src/trezorlib/messages/WebAuthnCredential.py index 5046dab76..3a769a59a 100644 --- a/python/src/trezorlib/messages/WebAuthnCredential.py +++ b/python/src/trezorlib/messages/WebAuthnCredential.py @@ -14,6 +14,7 @@ class WebAuthnCredential(p.MessageType): def __init__( self, + *, index: int = None, id: bytes = None, rp_id: str = None, @@ -43,16 +44,16 @@ class WebAuthnCredential(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('index', p.UVarintType, 0), - 2: ('id', p.BytesType, 0), - 3: ('rp_id', p.UnicodeType, 0), - 4: ('rp_name', p.UnicodeType, 0), - 5: ('user_id', p.BytesType, 0), - 6: ('user_name', p.UnicodeType, 0), - 7: ('user_display_name', p.UnicodeType, 0), - 8: ('creation_time', p.UVarintType, 0), - 9: ('hmac_secret', p.BoolType, 0), - 10: ('use_sign_count', p.BoolType, 0), - 11: ('algorithm', p.SVarintType, 0), - 12: ('curve', p.SVarintType, 0), + 1: ('index', p.UVarintType, None), + 2: ('id', p.BytesType, None), + 3: ('rp_id', p.UnicodeType, None), + 4: ('rp_name', p.UnicodeType, None), + 5: ('user_id', p.BytesType, None), + 6: ('user_name', p.UnicodeType, None), + 7: ('user_display_name', p.UnicodeType, None), + 8: ('creation_time', p.UVarintType, None), + 9: ('hmac_secret', p.BoolType, None), + 10: ('use_sign_count', p.BoolType, None), + 11: ('algorithm', p.SVarintType, None), + 12: ('curve', p.SVarintType, None), } diff --git a/python/src/trezorlib/messages/WebAuthnCredentials.py b/python/src/trezorlib/messages/WebAuthnCredentials.py index 1f16ce63b..b89ea58ad 100644 --- a/python/src/trezorlib/messages/WebAuthnCredentials.py +++ b/python/src/trezorlib/messages/WebAuthnCredentials.py @@ -17,6 +17,7 @@ class WebAuthnCredentials(p.MessageType): def __init__( self, + *, credentials: List[WebAuthnCredential] = None, ) -> None: self.credentials = credentials if credentials is not None else [] diff --git a/python/src/trezorlib/messages/WebAuthnRemoveResidentCredential.py b/python/src/trezorlib/messages/WebAuthnRemoveResidentCredential.py index fa919764e..8a1c7bd0e 100644 --- a/python/src/trezorlib/messages/WebAuthnRemoveResidentCredential.py +++ b/python/src/trezorlib/messages/WebAuthnRemoveResidentCredential.py @@ -15,6 +15,7 @@ class WebAuthnRemoveResidentCredential(p.MessageType): def __init__( self, + *, index: int = None, ) -> None: self.index = index @@ -22,5 +23,5 @@ class WebAuthnRemoveResidentCredential(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('index', p.UVarintType, 0), + 1: ('index', p.UVarintType, None), } diff --git a/python/src/trezorlib/messages/WordAck.py b/python/src/trezorlib/messages/WordAck.py index c9365bdc8..fb912debf 100644 --- a/python/src/trezorlib/messages/WordAck.py +++ b/python/src/trezorlib/messages/WordAck.py @@ -15,12 +15,13 @@ class WordAck(p.MessageType): def __init__( self, - word: str = None, + *, + word: str, ) -> None: self.word = word @classmethod def get_fields(cls) -> Dict: return { - 1: ('word', p.UnicodeType, 0), # required + 1: ('word', p.UnicodeType, p.FLAG_REQUIRED), } diff --git a/python/src/trezorlib/messages/WordRequest.py b/python/src/trezorlib/messages/WordRequest.py index ff9a3ec44..1fc4d3880 100644 --- a/python/src/trezorlib/messages/WordRequest.py +++ b/python/src/trezorlib/messages/WordRequest.py @@ -16,6 +16,7 @@ class WordRequest(p.MessageType): def __init__( self, + *, type: EnumTypeWordRequestType = None, ) -> None: self.type = type @@ -23,5 +24,5 @@ class WordRequest(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('type', p.EnumType("WordRequestType", (0, 1, 2)), 0), + 1: ('type', p.EnumType("WordRequestType", (0, 1, 2)), None), } diff --git a/python/src/trezorlib/messages/__init__.py b/python/src/trezorlib/messages/__init__.py index 84f849fc8..e4632bc82 100644 --- a/python/src/trezorlib/messages/__init__.py +++ b/python/src/trezorlib/messages/__init__.py @@ -264,6 +264,22 @@ from .TezosSignedTx import TezosSignedTx from .TezosTransactionOp import TezosTransactionOp from .TransactionType import TransactionType from .TxAck import TxAck +from .TxAckInput import TxAckInput +from .TxAckInputType import TxAckInputType +from .TxAckInputWrapper import TxAckInputWrapper +from .TxAckOutput import TxAckOutput +from .TxAckOutputType import TxAckOutputType +from .TxAckOutputWrapper import TxAckOutputWrapper +from .TxAckPrevExtraData import TxAckPrevExtraData +from .TxAckPrevExtraDataWrapper import TxAckPrevExtraDataWrapper +from .TxAckPrevInput import TxAckPrevInput +from .TxAckPrevInputType import TxAckPrevInputType +from .TxAckPrevInputWrapper import TxAckPrevInputWrapper +from .TxAckPrevMeta import TxAckPrevMeta +from .TxAckPrevOutput import TxAckPrevOutput +from .TxAckPrevOutputType import TxAckPrevOutputType +from .TxAckPrevOutputWrapper import TxAckPrevOutputWrapper +from .TxAckPrevTxType import TxAckPrevTxType from .TxInputType import TxInputType from .TxOutputBinType import TxOutputBinType from .TxOutputType import TxOutputType