From 2c503b16f576dd1e6eae3bce78287dc91fe97f4f Mon Sep 17 00:00:00 2001 From: gabrielkerekes Date: Wed, 7 Apr 2021 05:59:08 +0200 Subject: [PATCH] fix(common): fix one value enums in pb2py --- common/protob/pb2py | 2 +- core/src/trezor/messages/ApplySettings.py | 2 +- core/src/trezor/messages/AuthorizeCoinJoin.py | 4 +-- core/src/trezor/messages/BinanceOrderMsg.py | 6 ++-- core/src/trezor/messages/ButtonRequest.py | 2 +- .../messages/CardanoAddressParametersType.py | 2 +- .../CardanoPoolRelayParametersType.py | 2 +- .../messages/CardanoTxAuxiliaryDataType.py | 35 +++++++++++++++++++ .../messages/CardanoTxCertificateType.py | 2 +- core/src/trezor/messages/DebugLinkDecision.py | 2 +- core/src/trezor/messages/Failure.py | 2 +- core/src/trezor/messages/Features.py | 6 ++-- core/src/trezor/messages/GetAddress.py | 2 +- core/src/trezor/messages/GetOwnershipId.py | 2 +- core/src/trezor/messages/GetOwnershipProof.py | 2 +- core/src/trezor/messages/GetPublicKey.py | 2 +- .../trezor/messages/LiskTransactionCommon.py | 2 +- .../messages/NEMCosignatoryModification.py | 2 +- .../trezor/messages/NEMImportanceTransfer.py | 2 +- .../trezor/messages/NEMMosaicDefinition.py | 2 +- .../trezor/messages/NEMMosaicSupplyChange.py | 2 +- core/src/trezor/messages/RecoveryDevice.py | 2 +- core/src/trezor/messages/ResetDevice.py | 2 +- core/src/trezor/messages/SdProtect.py | 2 +- core/src/trezor/messages/SignMessage.py | 2 +- core/src/trezor/messages/SignTx.py | 2 +- core/src/trezor/messages/TezosBallotOp.py | 2 +- core/src/trezor/messages/TezosContractID.py | 2 +- core/src/trezor/messages/TxInput.py | 4 +-- core/src/trezor/messages/TxInputType.py | 4 +-- core/src/trezor/messages/TxOutput.py | 2 +- core/src/trezor/messages/TxOutputType.py | 2 +- core/src/trezor/messages/TxRequest.py | 2 +- .../src/trezorlib/messages/ApplySettings.py | 2 +- .../trezorlib/messages/AuthorizeCoinJoin.py | 4 +-- .../src/trezorlib/messages/BinanceOrderMsg.py | 6 ++-- .../src/trezorlib/messages/ButtonRequest.py | 2 +- .../messages/CardanoAddressParametersType.py | 2 +- .../CardanoPoolRelayParametersType.py | 2 +- .../messages/CardanoTxAuxiliaryDataType.py | 35 +++++++++++++++++++ .../messages/CardanoTxCertificateType.py | 2 +- .../trezorlib/messages/DebugLinkDecision.py | 2 +- python/src/trezorlib/messages/Failure.py | 2 +- python/src/trezorlib/messages/Features.py | 6 ++-- python/src/trezorlib/messages/GetAddress.py | 2 +- .../src/trezorlib/messages/GetOwnershipId.py | 2 +- .../trezorlib/messages/GetOwnershipProof.py | 2 +- python/src/trezorlib/messages/GetPublicKey.py | 2 +- .../messages/LiskTransactionCommon.py | 2 +- .../messages/NEMCosignatoryModification.py | 2 +- .../messages/NEMImportanceTransfer.py | 2 +- .../trezorlib/messages/NEMMosaicDefinition.py | 2 +- .../messages/NEMMosaicSupplyChange.py | 2 +- .../trezorlib/messages/PinMatrixRequest.py | 2 +- .../src/trezorlib/messages/RecoveryDevice.py | 2 +- python/src/trezorlib/messages/ResetDevice.py | 2 +- python/src/trezorlib/messages/SdProtect.py | 2 +- python/src/trezorlib/messages/SignMessage.py | 2 +- python/src/trezorlib/messages/SignTx.py | 2 +- .../src/trezorlib/messages/TezosBallotOp.py | 2 +- .../src/trezorlib/messages/TezosContractID.py | 2 +- python/src/trezorlib/messages/TxInput.py | 4 +-- python/src/trezorlib/messages/TxInputType.py | 4 +-- python/src/trezorlib/messages/TxOutput.py | 2 +- python/src/trezorlib/messages/TxOutputType.py | 2 +- python/src/trezorlib/messages/TxRequest.py | 2 +- python/src/trezorlib/messages/WordRequest.py | 2 +- 67 files changed, 149 insertions(+), 79 deletions(-) create mode 100644 core/src/trezor/messages/CardanoTxAuxiliaryDataType.py create mode 100644 python/src/trezorlib/messages/CardanoTxAuxiliaryDataType.py diff --git a/common/protob/pb2py b/common/protob/pb2py index eb4f810233..291c98c8e8 100755 --- a/common/protob/pb2py +++ b/common/protob/pb2py @@ -88,7 +88,7 @@ class ProtoField: elif field.type == field.TYPE_ENUM: value_dict = descriptor.enum_types[type_name] valuestr = ", ".join(str(v) for v in value_dict.values()) - proto_type = 'p.EnumType("{}", ({}))'.format(type_name, valuestr) + proto_type = 'p.EnumType("{}", ({},))'.format(type_name, valuestr) py_type = "EnumType" + type_name else: try: diff --git a/core/src/trezor/messages/ApplySettings.py b/core/src/trezor/messages/ApplySettings.py index ad0049a933..7dc514fbdd 100644 --- a/core/src/trezor/messages/ApplySettings.py +++ b/core/src/trezor/messages/ApplySettings.py @@ -47,6 +47,6 @@ class ApplySettings(p.MessageType): 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), + 9: ('safety_checks', p.EnumType("SafetyCheckLevel", (0, 1, 2,)), None), 10: ('experimental_features', p.BoolType, None), } diff --git a/core/src/trezor/messages/AuthorizeCoinJoin.py b/core/src/trezor/messages/AuthorizeCoinJoin.py index 05777cfac5..5cbd24554a 100644 --- a/core/src/trezor/messages/AuthorizeCoinJoin.py +++ b/core/src/trezor/messages/AuthorizeCoinJoin.py @@ -43,6 +43,6 @@ class AuthorizeCoinJoin(p.MessageType): 3: ('fee_per_anonymity', p.UVarintType, None), 4: ('address_n', p.UVarintType, p.FLAG_REPEATED), 5: ('coin_name', p.UnicodeType, "Bitcoin"), # default=Bitcoin - 6: ('script_type', p.EnumType("InputScriptType", (0, 1, 2, 3, 4)), 0), # default=SPENDADDRESS - 11: ('amount_unit', p.EnumType("AmountUnit", (0, 1, 2, 3)), 0), # default=BITCOIN + 6: ('script_type', p.EnumType("InputScriptType", (0, 1, 2, 3, 4,)), 0), # default=SPENDADDRESS + 11: ('amount_unit', p.EnumType("AmountUnit", (0, 1, 2, 3,)), 0), # default=BITCOIN } diff --git a/core/src/trezor/messages/BinanceOrderMsg.py b/core/src/trezor/messages/BinanceOrderMsg.py index 59e1b7b1d0..2b0b9ff416 100644 --- a/core/src/trezor/messages/BinanceOrderMsg.py +++ b/core/src/trezor/messages/BinanceOrderMsg.py @@ -41,11 +41,11 @@ class BinanceOrderMsg(p.MessageType): def get_fields(cls) -> Dict: return { 1: ('id', p.UnicodeType, None), - 2: ('ordertype', p.EnumType("BinanceOrderType", (0, 1, 2, 3)), 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), + 6: ('side', p.EnumType("BinanceOrderSide", (0, 1, 2,)), None), 7: ('symbol', p.UnicodeType, None), - 8: ('timeinforce', p.EnumType("BinanceTimeInForce", (0, 1, 2, 3)), None), + 8: ('timeinforce', p.EnumType("BinanceTimeInForce", (0, 1, 2, 3,)), None), } diff --git a/core/src/trezor/messages/ButtonRequest.py b/core/src/trezor/messages/ButtonRequest.py index a40d052659..c0f6e1d119 100644 --- a/core/src/trezor/messages/ButtonRequest.py +++ b/core/src/trezor/messages/ButtonRequest.py @@ -24,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)), None), + 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/CardanoAddressParametersType.py b/core/src/trezor/messages/CardanoAddressParametersType.py index 67ef15c944..a9356e35e7 100644 --- a/core/src/trezor/messages/CardanoAddressParametersType.py +++ b/core/src/trezor/messages/CardanoAddressParametersType.py @@ -33,7 +33,7 @@ class CardanoAddressParametersType(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('address_type', p.EnumType("CardanoAddressType", (0, 1, 2, 3, 4, 5, 6, 7, 8, 14, 15)), p.FLAG_REQUIRED), + 1: ('address_type', p.EnumType("CardanoAddressType", (0, 1, 2, 3, 4, 5, 6, 7, 8, 14, 15,)), p.FLAG_REQUIRED), 2: ('address_n', p.UVarintType, p.FLAG_REPEATED), 3: ('address_n_staking', p.UVarintType, p.FLAG_REPEATED), 4: ('staking_key_hash', p.BytesType, None), diff --git a/core/src/trezor/messages/CardanoPoolRelayParametersType.py b/core/src/trezor/messages/CardanoPoolRelayParametersType.py index 79d4214257..11555ad248 100644 --- a/core/src/trezor/messages/CardanoPoolRelayParametersType.py +++ b/core/src/trezor/messages/CardanoPoolRelayParametersType.py @@ -31,7 +31,7 @@ class CardanoPoolRelayParametersType(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('type', p.EnumType("CardanoPoolRelayType", (0, 1, 2)), p.FLAG_REQUIRED), + 1: ('type', p.EnumType("CardanoPoolRelayType", (0, 1, 2,)), p.FLAG_REQUIRED), 2: ('ipv4_address', p.BytesType, None), 3: ('ipv6_address', p.BytesType, None), 4: ('host_name', p.UnicodeType, None), diff --git a/core/src/trezor/messages/CardanoTxAuxiliaryDataType.py b/core/src/trezor/messages/CardanoTxAuxiliaryDataType.py new file mode 100644 index 0000000000..47e99c5663 --- /dev/null +++ b/core/src/trezor/messages/CardanoTxAuxiliaryDataType.py @@ -0,0 +1,35 @@ +# Automatically generated by pb2py +# fmt: off +import protobuf as p + +from .CardanoTxMetadataType import CardanoTxMetadataType + +if __debug__: + try: + from typing import Dict, List, Optional # noqa: F401 + from typing_extensions import Literal # noqa: F401 + EnumTypeCardanoAuxiliaryDataType = Literal[0, 1] + except ImportError: + pass + + +class CardanoTxAuxiliaryDataType(p.MessageType): + + def __init__( + self, + *, + type: EnumTypeCardanoAuxiliaryDataType, + blob: Optional[bytes] = None, + metadata: Optional[CardanoTxMetadataType] = None, + ) -> None: + self.type = type + self.blob = blob + self.metadata = metadata + + @classmethod + def get_fields(cls) -> Dict: + return { + 1: ('type', p.EnumType("CardanoAuxiliaryDataType", (0, 1,)), p.FLAG_REQUIRED), + 2: ('blob', p.BytesType, None), + 3: ('metadata', CardanoTxMetadataType, None), + } diff --git a/core/src/trezor/messages/CardanoTxCertificateType.py b/core/src/trezor/messages/CardanoTxCertificateType.py index 468ff2ccee..bf93eec2bc 100644 --- a/core/src/trezor/messages/CardanoTxCertificateType.py +++ b/core/src/trezor/messages/CardanoTxCertificateType.py @@ -31,7 +31,7 @@ class CardanoTxCertificateType(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('type', p.EnumType("CardanoCertificateType", (0, 1, 2, 3)), p.FLAG_REQUIRED), + 1: ('type', p.EnumType("CardanoCertificateType", (0, 1, 2, 3,)), p.FLAG_REQUIRED), 2: ('path', p.UVarintType, p.FLAG_REPEATED), 3: ('pool', p.BytesType, None), 4: ('pool_parameters', CardanoPoolParametersType, None), diff --git a/core/src/trezor/messages/DebugLinkDecision.py b/core/src/trezor/messages/DebugLinkDecision.py index 860991deeb..c215a90dc8 100644 --- a/core/src/trezor/messages/DebugLinkDecision.py +++ b/core/src/trezor/messages/DebugLinkDecision.py @@ -37,7 +37,7 @@ class DebugLinkDecision(p.MessageType): def get_fields(cls) -> Dict: return { 1: ('yes_no', p.BoolType, None), - 2: ('swipe', p.EnumType("DebugSwipeDirection", (0, 1, 2, 3)), 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), diff --git a/core/src/trezor/messages/Failure.py b/core/src/trezor/messages/Failure.py index 359f875e25..b857253128 100644 --- a/core/src/trezor/messages/Failure.py +++ b/core/src/trezor/messages/Failure.py @@ -26,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)), None), + 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 0f3b2f5ce2..5238bd2867 100644 --- a/core/src/trezor/messages/Features.py +++ b/core/src/trezor/messages/Features.py @@ -127,14 +127,14 @@ class Features(p.MessageType): 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)), 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,)), 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), + 37: ('safety_checks', p.EnumType("SafetyCheckLevel", (0, 1, 2,)), None), 38: ('auto_lock_delay_ms', p.UVarintType, None), 39: ('display_rotation', p.UVarintType, None), 40: ('experimental_features', p.BoolType, None), diff --git a/core/src/trezor/messages/GetAddress.py b/core/src/trezor/messages/GetAddress.py index 04afdc5ac5..b933efc718 100644 --- a/core/src/trezor/messages/GetAddress.py +++ b/core/src/trezor/messages/GetAddress.py @@ -40,6 +40,6 @@ class GetAddress(p.MessageType): 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 + 5: ('script_type', p.EnumType("InputScriptType", (0, 1, 2, 3, 4,)), 0), # default=SPENDADDRESS 6: ('ignore_xpub_magic', p.BoolType, None), } diff --git a/core/src/trezor/messages/GetOwnershipId.py b/core/src/trezor/messages/GetOwnershipId.py index 850eb65e1f..5d9ba3d72e 100644 --- a/core/src/trezor/messages/GetOwnershipId.py +++ b/core/src/trezor/messages/GetOwnershipId.py @@ -35,5 +35,5 @@ class GetOwnershipId(p.MessageType): 1: ('address_n', p.UVarintType, p.FLAG_REPEATED), 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 + 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 f803909f0e..b59716c3f3 100644 --- a/core/src/trezor/messages/GetOwnershipProof.py +++ b/core/src/trezor/messages/GetOwnershipProof.py @@ -40,7 +40,7 @@ class GetOwnershipProof(p.MessageType): return { 1: ('address_n', p.UVarintType, p.FLAG_REPEATED), 2: ('coin_name', p.UnicodeType, "Bitcoin"), # default=Bitcoin - 3: ('script_type', p.EnumType("InputScriptType", (0, 1, 2, 3, 4)), 3), # default=SPENDWITNESS + 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), diff --git a/core/src/trezor/messages/GetPublicKey.py b/core/src/trezor/messages/GetPublicKey.py index 4d37cb8b40..c2b8932b99 100644 --- a/core/src/trezor/messages/GetPublicKey.py +++ b/core/src/trezor/messages/GetPublicKey.py @@ -38,6 +38,6 @@ class GetPublicKey(p.MessageType): 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 + 5: ('script_type', p.EnumType("InputScriptType", (0, 1, 2, 3, 4,)), 0), # default=SPENDADDRESS 6: ('ignore_xpub_magic', p.BoolType, None), } diff --git a/core/src/trezor/messages/LiskTransactionCommon.py b/core/src/trezor/messages/LiskTransactionCommon.py index 66c40ebaca..a2dfb7ad4f 100644 --- a/core/src/trezor/messages/LiskTransactionCommon.py +++ b/core/src/trezor/messages/LiskTransactionCommon.py @@ -41,7 +41,7 @@ class LiskTransactionCommon(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('type', p.EnumType("LiskTransactionType", (0, 1, 2, 3, 4, 5, 6, 7)), None), + 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), diff --git a/core/src/trezor/messages/NEMCosignatoryModification.py b/core/src/trezor/messages/NEMCosignatoryModification.py index a8df337b9a..954093f5d0 100644 --- a/core/src/trezor/messages/NEMCosignatoryModification.py +++ b/core/src/trezor/messages/NEMCosignatoryModification.py @@ -25,6 +25,6 @@ class NEMCosignatoryModification(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('type', p.EnumType("NEMModificationType", (1, 2)), None), + 1: ('type', p.EnumType("NEMModificationType", (1, 2,)), None), 2: ('public_key', p.BytesType, None), } diff --git a/core/src/trezor/messages/NEMImportanceTransfer.py b/core/src/trezor/messages/NEMImportanceTransfer.py index b2625fa09d..73b8e38755 100644 --- a/core/src/trezor/messages/NEMImportanceTransfer.py +++ b/core/src/trezor/messages/NEMImportanceTransfer.py @@ -25,6 +25,6 @@ class NEMImportanceTransfer(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('mode', p.EnumType("NEMImportanceTransferMode", (1, 2)), None), + 1: ('mode', p.EnumType("NEMImportanceTransferMode", (1, 2,)), None), 2: ('public_key', p.BytesType, None), } diff --git a/core/src/trezor/messages/NEMMosaicDefinition.py b/core/src/trezor/messages/NEMMosaicDefinition.py index 399a7403f8..2548d916c1 100644 --- a/core/src/trezor/messages/NEMMosaicDefinition.py +++ b/core/src/trezor/messages/NEMMosaicDefinition.py @@ -56,7 +56,7 @@ class NEMMosaicDefinition(p.MessageType): 3: ('namespace', p.UnicodeType, None), 4: ('mosaic', p.UnicodeType, None), 5: ('divisibility', p.UVarintType, None), - 6: ('levy', p.EnumType("NEMMosaicLevy", (1, 2)), 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), diff --git a/core/src/trezor/messages/NEMMosaicSupplyChange.py b/core/src/trezor/messages/NEMMosaicSupplyChange.py index 9b300c4c5b..4c0be98885 100644 --- a/core/src/trezor/messages/NEMMosaicSupplyChange.py +++ b/core/src/trezor/messages/NEMMosaicSupplyChange.py @@ -31,6 +31,6 @@ class NEMMosaicSupplyChange(p.MessageType): return { 1: ('namespace', p.UnicodeType, None), 2: ('mosaic', p.UnicodeType, None), - 3: ('type', p.EnumType("NEMSupplyChangeType", (1, 2)), None), + 3: ('type', p.EnumType("NEMSupplyChangeType", (1, 2,)), None), 4: ('delta', p.UVarintType, None), } diff --git a/core/src/trezor/messages/RecoveryDevice.py b/core/src/trezor/messages/RecoveryDevice.py index d619a57cc3..4dcb6e906e 100644 --- a/core/src/trezor/messages/RecoveryDevice.py +++ b/core/src/trezor/messages/RecoveryDevice.py @@ -46,7 +46,7 @@ class RecoveryDevice(p.MessageType): 4: ('language', p.UnicodeType, None), 5: ('label', p.UnicodeType, None), 6: ('enforce_wordlist', p.BoolType, None), - 8: ('type', p.EnumType("RecoveryDeviceType", (0, 1)), 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 77609e47db..afbab8e1bf 100644 --- a/core/src/trezor/messages/ResetDevice.py +++ b/core/src/trezor/messages/ResetDevice.py @@ -51,5 +51,5 @@ class ResetDevice(p.MessageType): 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 + 10: ('backup_type', p.EnumType("BackupType", (0, 1, 2,)), 0), # default=Bip39 } diff --git a/core/src/trezor/messages/SdProtect.py b/core/src/trezor/messages/SdProtect.py index 97ce66e277..490c230db1 100644 --- a/core/src/trezor/messages/SdProtect.py +++ b/core/src/trezor/messages/SdProtect.py @@ -24,5 +24,5 @@ class SdProtect(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('operation', p.EnumType("SdProtectOperationType", (0, 1, 2)), None), + 1: ('operation', p.EnumType("SdProtectOperationType", (0, 1, 2,)), None), } diff --git a/core/src/trezor/messages/SignMessage.py b/core/src/trezor/messages/SignMessage.py index a972433f02..e91701f0ce 100644 --- a/core/src/trezor/messages/SignMessage.py +++ b/core/src/trezor/messages/SignMessage.py @@ -33,5 +33,5 @@ class SignMessage(p.MessageType): 1: ('address_n', p.UVarintType, p.FLAG_REPEATED), 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 + 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 071fa94c88..ce9672d9a8 100644 --- a/core/src/trezor/messages/SignTx.py +++ b/core/src/trezor/messages/SignTx.py @@ -53,6 +53,6 @@ class SignTx(p.MessageType): 8: ('version_group_id', p.UVarintType, None), 9: ('timestamp', p.UVarintType, None), 10: ('branch_id', p.UVarintType, None), - 11: ('amount_unit', p.EnumType("AmountUnit", (0, 1, 2, 3)), 0), # default=BITCOIN + 11: ('amount_unit', p.EnumType("AmountUnit", (0, 1, 2, 3,)), 0), # default=BITCOIN 12: ('decred_staking_ticket', p.BoolType, False), # default=false } diff --git a/core/src/trezor/messages/TezosBallotOp.py b/core/src/trezor/messages/TezosBallotOp.py index 3a2c2bfc83..010a726c3f 100644 --- a/core/src/trezor/messages/TezosBallotOp.py +++ b/core/src/trezor/messages/TezosBallotOp.py @@ -32,5 +32,5 @@ class TezosBallotOp(p.MessageType): 1: ('source', p.BytesType, None), 2: ('period', p.UVarintType, None), 3: ('proposal', p.BytesType, None), - 4: ('ballot', p.EnumType("TezosBallotType", (0, 1, 2)), 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 7201fc3b46..3e30f15e8f 100644 --- a/core/src/trezor/messages/TezosContractID.py +++ b/core/src/trezor/messages/TezosContractID.py @@ -25,6 +25,6 @@ class TezosContractID(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('tag', p.EnumType("TezosContractType", (0, 1)), p.FLAG_REQUIRED), + 1: ('tag', p.EnumType("TezosContractType", (0, 1,)), p.FLAG_REQUIRED), 2: ('hash', p.BytesType, p.FLAG_REQUIRED), } diff --git a/core/src/trezor/messages/TxInput.py b/core/src/trezor/messages/TxInput.py index 468d46cc0d..b8a2646330 100644 --- a/core/src/trezor/messages/TxInput.py +++ b/core/src/trezor/messages/TxInput.py @@ -59,7 +59,7 @@ class TxInput(p.MessageType): 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 + 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), @@ -68,5 +68,5 @@ class TxInput(p.MessageType): 15: ('commitment_data', p.BytesType, None), 16: ('orig_hash', p.BytesType, None), 17: ('orig_index', p.UVarintType, None), - 18: ('decred_staking_spend', p.EnumType("DecredStakingSpendType", (0, 1)), None), + 18: ('decred_staking_spend', p.EnumType("DecredStakingSpendType", (0, 1,)), None), } diff --git a/core/src/trezor/messages/TxInputType.py b/core/src/trezor/messages/TxInputType.py index f69aa3ec12..277e32bd55 100644 --- a/core/src/trezor/messages/TxInputType.py +++ b/core/src/trezor/messages/TxInputType.py @@ -59,7 +59,7 @@ class TxInputType(p.MessageType): 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 + 6: ('script_type', p.EnumType("InputScriptType", (0, 1, 2, 3, 4,)), 0), # default=SPENDADDRESS 7: ('multisig', MultisigRedeemScriptType, None), 8: ('amount', p.UVarintType, None), 9: ('decred_tree', p.UVarintType, None), @@ -68,5 +68,5 @@ class TxInputType(p.MessageType): 15: ('commitment_data', p.BytesType, None), 16: ('orig_hash', p.BytesType, None), 17: ('orig_index', p.UVarintType, None), - 18: ('decred_staking_spend', p.EnumType("DecredStakingSpendType", (0, 1)), None), + 18: ('decred_staking_spend', p.EnumType("DecredStakingSpendType", (0, 1,)), None), } diff --git a/core/src/trezor/messages/TxOutput.py b/core/src/trezor/messages/TxOutput.py index 398f18420c..d9af0f1dda 100644 --- a/core/src/trezor/messages/TxOutput.py +++ b/core/src/trezor/messages/TxOutput.py @@ -42,7 +42,7 @@ class TxOutput(p.MessageType): 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 + 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), 10: ('orig_hash', p.BytesType, None), diff --git a/core/src/trezor/messages/TxOutputType.py b/core/src/trezor/messages/TxOutputType.py index ac5fc160f4..259d8c6600 100644 --- a/core/src/trezor/messages/TxOutputType.py +++ b/core/src/trezor/messages/TxOutputType.py @@ -42,7 +42,7 @@ class TxOutputType(p.MessageType): 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 + 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), 10: ('orig_hash', p.BytesType, None), diff --git a/core/src/trezor/messages/TxRequest.py b/core/src/trezor/messages/TxRequest.py index 6ccf888fd2..c8078546b8 100644 --- a/core/src/trezor/messages/TxRequest.py +++ b/core/src/trezor/messages/TxRequest.py @@ -31,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, 5, 6)), None), + 1: ('request_type', p.EnumType("RequestType", (0, 1, 2, 3, 4, 5, 6,)), None), 2: ('details', TxRequestDetailsType, None), 3: ('serialized', TxRequestSerializedType, None), } diff --git a/python/src/trezorlib/messages/ApplySettings.py b/python/src/trezorlib/messages/ApplySettings.py index 32c27a1548..cd02b9a64e 100644 --- a/python/src/trezorlib/messages/ApplySettings.py +++ b/python/src/trezorlib/messages/ApplySettings.py @@ -47,6 +47,6 @@ class ApplySettings(p.MessageType): 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), + 9: ('safety_checks', p.EnumType("SafetyCheckLevel", (0, 1, 2,)), None), 10: ('experimental_features', p.BoolType, None), } diff --git a/python/src/trezorlib/messages/AuthorizeCoinJoin.py b/python/src/trezorlib/messages/AuthorizeCoinJoin.py index b741143239..da621f8ffe 100644 --- a/python/src/trezorlib/messages/AuthorizeCoinJoin.py +++ b/python/src/trezorlib/messages/AuthorizeCoinJoin.py @@ -43,6 +43,6 @@ class AuthorizeCoinJoin(p.MessageType): 3: ('fee_per_anonymity', p.UVarintType, None), 4: ('address_n', p.UVarintType, p.FLAG_REPEATED), 5: ('coin_name', p.UnicodeType, "Bitcoin"), # default=Bitcoin - 6: ('script_type', p.EnumType("InputScriptType", (0, 1, 2, 3, 4)), 0), # default=SPENDADDRESS - 11: ('amount_unit', p.EnumType("AmountUnit", (0, 1, 2, 3)), 0), # default=BITCOIN + 6: ('script_type', p.EnumType("InputScriptType", (0, 1, 2, 3, 4,)), 0), # default=SPENDADDRESS + 11: ('amount_unit', p.EnumType("AmountUnit", (0, 1, 2, 3,)), 0), # default=BITCOIN } diff --git a/python/src/trezorlib/messages/BinanceOrderMsg.py b/python/src/trezorlib/messages/BinanceOrderMsg.py index a449aa754f..7a164b7aed 100644 --- a/python/src/trezorlib/messages/BinanceOrderMsg.py +++ b/python/src/trezorlib/messages/BinanceOrderMsg.py @@ -41,11 +41,11 @@ class BinanceOrderMsg(p.MessageType): def get_fields(cls) -> Dict: return { 1: ('id', p.UnicodeType, None), - 2: ('ordertype', p.EnumType("BinanceOrderType", (0, 1, 2, 3)), 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), + 6: ('side', p.EnumType("BinanceOrderSide", (0, 1, 2,)), None), 7: ('symbol', p.UnicodeType, None), - 8: ('timeinforce', p.EnumType("BinanceTimeInForce", (0, 1, 2, 3)), None), + 8: ('timeinforce', p.EnumType("BinanceTimeInForce", (0, 1, 2, 3,)), None), } diff --git a/python/src/trezorlib/messages/ButtonRequest.py b/python/src/trezorlib/messages/ButtonRequest.py index 59ab56e287..2247e65111 100644 --- a/python/src/trezorlib/messages/ButtonRequest.py +++ b/python/src/trezorlib/messages/ButtonRequest.py @@ -24,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)), None), + 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/CardanoAddressParametersType.py b/python/src/trezorlib/messages/CardanoAddressParametersType.py index 72b1acfe04..977aaa3875 100644 --- a/python/src/trezorlib/messages/CardanoAddressParametersType.py +++ b/python/src/trezorlib/messages/CardanoAddressParametersType.py @@ -33,7 +33,7 @@ class CardanoAddressParametersType(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('address_type', p.EnumType("CardanoAddressType", (0, 1, 2, 3, 4, 5, 6, 7, 8, 14, 15)), p.FLAG_REQUIRED), + 1: ('address_type', p.EnumType("CardanoAddressType", (0, 1, 2, 3, 4, 5, 6, 7, 8, 14, 15,)), p.FLAG_REQUIRED), 2: ('address_n', p.UVarintType, p.FLAG_REPEATED), 3: ('address_n_staking', p.UVarintType, p.FLAG_REPEATED), 4: ('staking_key_hash', p.BytesType, None), diff --git a/python/src/trezorlib/messages/CardanoPoolRelayParametersType.py b/python/src/trezorlib/messages/CardanoPoolRelayParametersType.py index 10d4e82b0a..af131da044 100644 --- a/python/src/trezorlib/messages/CardanoPoolRelayParametersType.py +++ b/python/src/trezorlib/messages/CardanoPoolRelayParametersType.py @@ -31,7 +31,7 @@ class CardanoPoolRelayParametersType(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('type', p.EnumType("CardanoPoolRelayType", (0, 1, 2)), p.FLAG_REQUIRED), + 1: ('type', p.EnumType("CardanoPoolRelayType", (0, 1, 2,)), p.FLAG_REQUIRED), 2: ('ipv4_address', p.BytesType, None), 3: ('ipv6_address', p.BytesType, None), 4: ('host_name', p.UnicodeType, None), diff --git a/python/src/trezorlib/messages/CardanoTxAuxiliaryDataType.py b/python/src/trezorlib/messages/CardanoTxAuxiliaryDataType.py new file mode 100644 index 0000000000..931be3aadd --- /dev/null +++ b/python/src/trezorlib/messages/CardanoTxAuxiliaryDataType.py @@ -0,0 +1,35 @@ +# Automatically generated by pb2py +# fmt: off +from .. import protobuf as p + +from .CardanoTxMetadataType import CardanoTxMetadataType + +if __debug__: + try: + from typing import Dict, List, Optional # noqa: F401 + from typing_extensions import Literal # noqa: F401 + EnumTypeCardanoAuxiliaryDataType = Literal[0, 1] + except ImportError: + pass + + +class CardanoTxAuxiliaryDataType(p.MessageType): + + def __init__( + self, + *, + type: EnumTypeCardanoAuxiliaryDataType, + blob: Optional[bytes] = None, + metadata: Optional[CardanoTxMetadataType] = None, + ) -> None: + self.type = type + self.blob = blob + self.metadata = metadata + + @classmethod + def get_fields(cls) -> Dict: + return { + 1: ('type', p.EnumType("CardanoAuxiliaryDataType", (0, 1,)), p.FLAG_REQUIRED), + 2: ('blob', p.BytesType, None), + 3: ('metadata', CardanoTxMetadataType, None), + } diff --git a/python/src/trezorlib/messages/CardanoTxCertificateType.py b/python/src/trezorlib/messages/CardanoTxCertificateType.py index 5cd62bbaf8..be4b6baf4d 100644 --- a/python/src/trezorlib/messages/CardanoTxCertificateType.py +++ b/python/src/trezorlib/messages/CardanoTxCertificateType.py @@ -31,7 +31,7 @@ class CardanoTxCertificateType(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('type', p.EnumType("CardanoCertificateType", (0, 1, 2, 3)), p.FLAG_REQUIRED), + 1: ('type', p.EnumType("CardanoCertificateType", (0, 1, 2, 3,)), p.FLAG_REQUIRED), 2: ('path', p.UVarintType, p.FLAG_REPEATED), 3: ('pool', p.BytesType, None), 4: ('pool_parameters', CardanoPoolParametersType, None), diff --git a/python/src/trezorlib/messages/DebugLinkDecision.py b/python/src/trezorlib/messages/DebugLinkDecision.py index 647f2b2994..4b723cdc17 100644 --- a/python/src/trezorlib/messages/DebugLinkDecision.py +++ b/python/src/trezorlib/messages/DebugLinkDecision.py @@ -37,7 +37,7 @@ class DebugLinkDecision(p.MessageType): def get_fields(cls) -> Dict: return { 1: ('yes_no', p.BoolType, None), - 2: ('swipe', p.EnumType("DebugSwipeDirection", (0, 1, 2, 3)), 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), diff --git a/python/src/trezorlib/messages/Failure.py b/python/src/trezorlib/messages/Failure.py index 7a4e3c49e4..3ebd7c0dec 100644 --- a/python/src/trezorlib/messages/Failure.py +++ b/python/src/trezorlib/messages/Failure.py @@ -26,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)), None), + 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 5356e3a14f..9d706fffca 100644 --- a/python/src/trezorlib/messages/Features.py +++ b/python/src/trezorlib/messages/Features.py @@ -127,14 +127,14 @@ class Features(p.MessageType): 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)), 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,)), 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), + 37: ('safety_checks', p.EnumType("SafetyCheckLevel", (0, 1, 2,)), None), 38: ('auto_lock_delay_ms', p.UVarintType, None), 39: ('display_rotation', p.UVarintType, None), 40: ('experimental_features', p.BoolType, None), diff --git a/python/src/trezorlib/messages/GetAddress.py b/python/src/trezorlib/messages/GetAddress.py index 8bc798a5b9..615346494b 100644 --- a/python/src/trezorlib/messages/GetAddress.py +++ b/python/src/trezorlib/messages/GetAddress.py @@ -40,6 +40,6 @@ class GetAddress(p.MessageType): 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 + 5: ('script_type', p.EnumType("InputScriptType", (0, 1, 2, 3, 4,)), 0), # default=SPENDADDRESS 6: ('ignore_xpub_magic', p.BoolType, None), } diff --git a/python/src/trezorlib/messages/GetOwnershipId.py b/python/src/trezorlib/messages/GetOwnershipId.py index f78e0bf964..5e0756675b 100644 --- a/python/src/trezorlib/messages/GetOwnershipId.py +++ b/python/src/trezorlib/messages/GetOwnershipId.py @@ -35,5 +35,5 @@ class GetOwnershipId(p.MessageType): 1: ('address_n', p.UVarintType, p.FLAG_REPEATED), 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 + 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 5a158cd18c..1347ce9d03 100644 --- a/python/src/trezorlib/messages/GetOwnershipProof.py +++ b/python/src/trezorlib/messages/GetOwnershipProof.py @@ -40,7 +40,7 @@ class GetOwnershipProof(p.MessageType): return { 1: ('address_n', p.UVarintType, p.FLAG_REPEATED), 2: ('coin_name', p.UnicodeType, "Bitcoin"), # default=Bitcoin - 3: ('script_type', p.EnumType("InputScriptType", (0, 1, 2, 3, 4)), 3), # default=SPENDWITNESS + 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), diff --git a/python/src/trezorlib/messages/GetPublicKey.py b/python/src/trezorlib/messages/GetPublicKey.py index c330440ccb..a4d70101e8 100644 --- a/python/src/trezorlib/messages/GetPublicKey.py +++ b/python/src/trezorlib/messages/GetPublicKey.py @@ -38,6 +38,6 @@ class GetPublicKey(p.MessageType): 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 + 5: ('script_type', p.EnumType("InputScriptType", (0, 1, 2, 3, 4,)), 0), # default=SPENDADDRESS 6: ('ignore_xpub_magic', p.BoolType, None), } diff --git a/python/src/trezorlib/messages/LiskTransactionCommon.py b/python/src/trezorlib/messages/LiskTransactionCommon.py index cfd927a79b..71a2f2ea0c 100644 --- a/python/src/trezorlib/messages/LiskTransactionCommon.py +++ b/python/src/trezorlib/messages/LiskTransactionCommon.py @@ -41,7 +41,7 @@ class LiskTransactionCommon(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('type', p.EnumType("LiskTransactionType", (0, 1, 2, 3, 4, 5, 6, 7)), None), + 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), diff --git a/python/src/trezorlib/messages/NEMCosignatoryModification.py b/python/src/trezorlib/messages/NEMCosignatoryModification.py index f52636a3e8..d6d7d9927b 100644 --- a/python/src/trezorlib/messages/NEMCosignatoryModification.py +++ b/python/src/trezorlib/messages/NEMCosignatoryModification.py @@ -25,6 +25,6 @@ class NEMCosignatoryModification(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('type', p.EnumType("NEMModificationType", (1, 2)), None), + 1: ('type', p.EnumType("NEMModificationType", (1, 2,)), None), 2: ('public_key', p.BytesType, None), } diff --git a/python/src/trezorlib/messages/NEMImportanceTransfer.py b/python/src/trezorlib/messages/NEMImportanceTransfer.py index ffc2fbb071..d210112ace 100644 --- a/python/src/trezorlib/messages/NEMImportanceTransfer.py +++ b/python/src/trezorlib/messages/NEMImportanceTransfer.py @@ -25,6 +25,6 @@ class NEMImportanceTransfer(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('mode', p.EnumType("NEMImportanceTransferMode", (1, 2)), None), + 1: ('mode', p.EnumType("NEMImportanceTransferMode", (1, 2,)), None), 2: ('public_key', p.BytesType, None), } diff --git a/python/src/trezorlib/messages/NEMMosaicDefinition.py b/python/src/trezorlib/messages/NEMMosaicDefinition.py index 54ae8c80a1..e17c7887ab 100644 --- a/python/src/trezorlib/messages/NEMMosaicDefinition.py +++ b/python/src/trezorlib/messages/NEMMosaicDefinition.py @@ -56,7 +56,7 @@ class NEMMosaicDefinition(p.MessageType): 3: ('namespace', p.UnicodeType, None), 4: ('mosaic', p.UnicodeType, None), 5: ('divisibility', p.UVarintType, None), - 6: ('levy', p.EnumType("NEMMosaicLevy", (1, 2)), 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), diff --git a/python/src/trezorlib/messages/NEMMosaicSupplyChange.py b/python/src/trezorlib/messages/NEMMosaicSupplyChange.py index 47de01cf64..b583542e54 100644 --- a/python/src/trezorlib/messages/NEMMosaicSupplyChange.py +++ b/python/src/trezorlib/messages/NEMMosaicSupplyChange.py @@ -31,6 +31,6 @@ class NEMMosaicSupplyChange(p.MessageType): return { 1: ('namespace', p.UnicodeType, None), 2: ('mosaic', p.UnicodeType, None), - 3: ('type', p.EnumType("NEMSupplyChangeType", (1, 2)), None), + 3: ('type', p.EnumType("NEMSupplyChangeType", (1, 2,)), None), 4: ('delta', p.UVarintType, None), } diff --git a/python/src/trezorlib/messages/PinMatrixRequest.py b/python/src/trezorlib/messages/PinMatrixRequest.py index 7b5768bbce..12cb92bd0e 100644 --- a/python/src/trezorlib/messages/PinMatrixRequest.py +++ b/python/src/trezorlib/messages/PinMatrixRequest.py @@ -24,5 +24,5 @@ class PinMatrixRequest(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('type', p.EnumType("PinMatrixRequestType", (1, 2, 3, 4, 5)), None), + 1: ('type', p.EnumType("PinMatrixRequestType", (1, 2, 3, 4, 5,)), None), } diff --git a/python/src/trezorlib/messages/RecoveryDevice.py b/python/src/trezorlib/messages/RecoveryDevice.py index fe44afc410..30bb9f23d7 100644 --- a/python/src/trezorlib/messages/RecoveryDevice.py +++ b/python/src/trezorlib/messages/RecoveryDevice.py @@ -46,7 +46,7 @@ class RecoveryDevice(p.MessageType): 4: ('language', p.UnicodeType, None), 5: ('label', p.UnicodeType, None), 6: ('enforce_wordlist', p.BoolType, None), - 8: ('type', p.EnumType("RecoveryDeviceType", (0, 1)), 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 05e75f2d88..30540e7305 100644 --- a/python/src/trezorlib/messages/ResetDevice.py +++ b/python/src/trezorlib/messages/ResetDevice.py @@ -51,5 +51,5 @@ class ResetDevice(p.MessageType): 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 + 10: ('backup_type', p.EnumType("BackupType", (0, 1, 2,)), 0), # default=Bip39 } diff --git a/python/src/trezorlib/messages/SdProtect.py b/python/src/trezorlib/messages/SdProtect.py index d128104062..7b5d7673e6 100644 --- a/python/src/trezorlib/messages/SdProtect.py +++ b/python/src/trezorlib/messages/SdProtect.py @@ -24,5 +24,5 @@ class SdProtect(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('operation', p.EnumType("SdProtectOperationType", (0, 1, 2)), None), + 1: ('operation', p.EnumType("SdProtectOperationType", (0, 1, 2,)), None), } diff --git a/python/src/trezorlib/messages/SignMessage.py b/python/src/trezorlib/messages/SignMessage.py index 0f5ccf169d..eb7cc69538 100644 --- a/python/src/trezorlib/messages/SignMessage.py +++ b/python/src/trezorlib/messages/SignMessage.py @@ -33,5 +33,5 @@ class SignMessage(p.MessageType): 1: ('address_n', p.UVarintType, p.FLAG_REPEATED), 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 + 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 3f8d61bb8e..54facdb77b 100644 --- a/python/src/trezorlib/messages/SignTx.py +++ b/python/src/trezorlib/messages/SignTx.py @@ -56,6 +56,6 @@ class SignTx(p.MessageType): 8: ('version_group_id', p.UVarintType, None), 9: ('timestamp', p.UVarintType, None), 10: ('branch_id', p.UVarintType, None), - 11: ('amount_unit', p.EnumType("AmountUnit", (0, 1, 2, 3)), 0), # default=BITCOIN + 11: ('amount_unit', p.EnumType("AmountUnit", (0, 1, 2, 3,)), 0), # default=BITCOIN 12: ('decred_staking_ticket', p.BoolType, False), # default=false } diff --git a/python/src/trezorlib/messages/TezosBallotOp.py b/python/src/trezorlib/messages/TezosBallotOp.py index 6e7659e986..3ebef66f5f 100644 --- a/python/src/trezorlib/messages/TezosBallotOp.py +++ b/python/src/trezorlib/messages/TezosBallotOp.py @@ -32,5 +32,5 @@ class TezosBallotOp(p.MessageType): 1: ('source', p.BytesType, None), 2: ('period', p.UVarintType, None), 3: ('proposal', p.BytesType, None), - 4: ('ballot', p.EnumType("TezosBallotType", (0, 1, 2)), 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 3fd518244c..b1f1fd88cc 100644 --- a/python/src/trezorlib/messages/TezosContractID.py +++ b/python/src/trezorlib/messages/TezosContractID.py @@ -25,6 +25,6 @@ class TezosContractID(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('tag', p.EnumType("TezosContractType", (0, 1)), p.FLAG_REQUIRED), + 1: ('tag', p.EnumType("TezosContractType", (0, 1,)), p.FLAG_REQUIRED), 2: ('hash', p.BytesType, p.FLAG_REQUIRED), } diff --git a/python/src/trezorlib/messages/TxInput.py b/python/src/trezorlib/messages/TxInput.py index 42443d1b58..c7d2703e70 100644 --- a/python/src/trezorlib/messages/TxInput.py +++ b/python/src/trezorlib/messages/TxInput.py @@ -59,7 +59,7 @@ class TxInput(p.MessageType): 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 + 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), @@ -68,5 +68,5 @@ class TxInput(p.MessageType): 15: ('commitment_data', p.BytesType, None), 16: ('orig_hash', p.BytesType, None), 17: ('orig_index', p.UVarintType, None), - 18: ('decred_staking_spend', p.EnumType("DecredStakingSpendType", (0, 1)), None), + 18: ('decred_staking_spend', p.EnumType("DecredStakingSpendType", (0, 1,)), None), } diff --git a/python/src/trezorlib/messages/TxInputType.py b/python/src/trezorlib/messages/TxInputType.py index 8081de30af..d3e74a513a 100644 --- a/python/src/trezorlib/messages/TxInputType.py +++ b/python/src/trezorlib/messages/TxInputType.py @@ -59,7 +59,7 @@ class TxInputType(p.MessageType): 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 + 6: ('script_type', p.EnumType("InputScriptType", (0, 1, 2, 3, 4,)), 0), # default=SPENDADDRESS 7: ('multisig', MultisigRedeemScriptType, None), 8: ('amount', p.UVarintType, None), 9: ('decred_tree', p.UVarintType, None), @@ -68,5 +68,5 @@ class TxInputType(p.MessageType): 15: ('commitment_data', p.BytesType, None), 16: ('orig_hash', p.BytesType, None), 17: ('orig_index', p.UVarintType, None), - 18: ('decred_staking_spend', p.EnumType("DecredStakingSpendType", (0, 1)), None), + 18: ('decred_staking_spend', p.EnumType("DecredStakingSpendType", (0, 1,)), None), } diff --git a/python/src/trezorlib/messages/TxOutput.py b/python/src/trezorlib/messages/TxOutput.py index d762e83480..82829e981e 100644 --- a/python/src/trezorlib/messages/TxOutput.py +++ b/python/src/trezorlib/messages/TxOutput.py @@ -42,7 +42,7 @@ class TxOutput(p.MessageType): 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 + 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), 10: ('orig_hash', p.BytesType, None), diff --git a/python/src/trezorlib/messages/TxOutputType.py b/python/src/trezorlib/messages/TxOutputType.py index de1649f933..a9f89e3b0c 100644 --- a/python/src/trezorlib/messages/TxOutputType.py +++ b/python/src/trezorlib/messages/TxOutputType.py @@ -42,7 +42,7 @@ class TxOutputType(p.MessageType): 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 + 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), 10: ('orig_hash', p.BytesType, None), diff --git a/python/src/trezorlib/messages/TxRequest.py b/python/src/trezorlib/messages/TxRequest.py index 28a947cc5e..3bd40e91ed 100644 --- a/python/src/trezorlib/messages/TxRequest.py +++ b/python/src/trezorlib/messages/TxRequest.py @@ -31,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, 5, 6)), None), + 1: ('request_type', p.EnumType("RequestType", (0, 1, 2, 3, 4, 5, 6,)), None), 2: ('details', TxRequestDetailsType, None), 3: ('serialized', TxRequestSerializedType, None), } diff --git a/python/src/trezorlib/messages/WordRequest.py b/python/src/trezorlib/messages/WordRequest.py index ea7a3442b9..e49982ebb3 100644 --- a/python/src/trezorlib/messages/WordRequest.py +++ b/python/src/trezorlib/messages/WordRequest.py @@ -24,5 +24,5 @@ class WordRequest(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('type', p.EnumType("WordRequestType", (0, 1, 2)), None), + 1: ('type', p.EnumType("WordRequestType", (0, 1, 2,)), None), }