From b9c111f6aea7567a52348459c31bbb94b0486b46 Mon Sep 17 00:00:00 2001 From: Jan Pochyla Date: Sun, 25 Feb 2018 18:48:44 +0100 Subject: [PATCH] tools: add init method to messages --- src/trezor/messages/Address.py | 8 +++ src/trezor/messages/ApplyFlags.py | 8 +++ src/trezor/messages/ApplySettings.py | 14 +++++ src/trezor/messages/BackupDevice.py | 6 +++ src/trezor/messages/ButtonAck.py | 6 +++ src/trezor/messages/ButtonRequest.py | 10 ++++ src/trezor/messages/Cancel.py | 6 +++ src/trezor/messages/ChangePin.py | 8 +++ src/trezor/messages/CipherKeyValue.py | 20 +++++++ src/trezor/messages/CipheredKeyValue.py | 8 +++ src/trezor/messages/ClearSession.py | 6 +++ src/trezor/messages/CoinType.py | 27 +++++++++- src/trezor/messages/CosiCommit.py | 10 ++++ src/trezor/messages/CosiCommitment.py | 10 ++++ src/trezor/messages/CosiSign.py | 14 +++++ src/trezor/messages/CosiSignature.py | 8 +++ src/trezor/messages/DebugLinkDecision.py | 8 +++ src/trezor/messages/DebugLinkFlashErase.py | 8 +++ src/trezor/messages/DebugLinkGetState.py | 6 +++ src/trezor/messages/DebugLinkLog.py | 12 +++++ src/trezor/messages/DebugLinkMemory.py | 8 +++ src/trezor/messages/DebugLinkMemoryRead.py | 10 ++++ src/trezor/messages/DebugLinkMemoryWrite.py | 12 +++++ src/trezor/messages/DebugLinkState.py | 26 +++++++++ src/trezor/messages/DebugLinkStop.py | 6 +++ src/trezor/messages/DecryptMessage.py | 14 +++++ src/trezor/messages/DecryptedMessage.py | 10 ++++ src/trezor/messages/ECDHSessionKey.py | 8 +++ src/trezor/messages/EncryptMessage.py | 16 ++++++ src/trezor/messages/EncryptedMessage.py | 12 +++++ src/trezor/messages/Entropy.py | 8 +++ src/trezor/messages/EntropyAck.py | 8 +++ src/trezor/messages/EntropyRequest.py | 6 +++ src/trezor/messages/EstimateTxSize.py | 12 +++++ src/trezor/messages/EthereumAddress.py | 8 +++ src/trezor/messages/EthereumGetAddress.py | 10 ++++ .../messages/EthereumMessageSignature.py | 10 ++++ src/trezor/messages/EthereumSignMessage.py | 10 ++++ src/trezor/messages/EthereumSignTx.py | 24 +++++++++ src/trezor/messages/EthereumTxAck.py | 8 +++ src/trezor/messages/EthereumTxRequest.py | 14 +++++ src/trezor/messages/EthereumVerifyMessage.py | 12 +++++ src/trezor/messages/Failure.py | 10 ++++ src/trezor/messages/Features.py | 53 ++++++++++++++++--- src/trezor/messages/FirmwareErase.py | 8 +++ src/trezor/messages/FirmwareRequest.py | 10 ++++ src/trezor/messages/FirmwareUpload.py | 10 ++++ src/trezor/messages/GetAddress.py | 16 ++++++ src/trezor/messages/GetECDHSessionKey.py | 12 +++++ src/trezor/messages/GetEntropy.py | 8 +++ src/trezor/messages/GetFeatures.py | 6 +++ src/trezor/messages/GetPublicKey.py | 14 +++++ src/trezor/messages/HDNodePathType.py | 10 ++++ src/trezor/messages/HDNodeType.py | 18 +++++++ src/trezor/messages/IdentityType.py | 18 +++++++ src/trezor/messages/Initialize.py | 9 ++-- src/trezor/messages/LoadDevice.py | 22 ++++++++ src/trezor/messages/MessageSignature.py | 10 ++++ src/trezor/messages/MessageType.py | 2 - .../messages/MultisigRedeemScriptType.py | 12 +++++ src/trezor/messages/NEMAddress.py | 8 +++ .../messages/NEMAggregateModification.py | 10 ++++ .../messages/NEMCosignatoryModification.py | 10 ++++ src/trezor/messages/NEMDecryptMessage.py | 12 ----- src/trezor/messages/NEMDecryptedMessage.py | 9 ---- src/trezor/messages/NEMGetAddress.py | 12 +++++ src/trezor/messages/NEMImportanceTransfer.py | 10 ++++ src/trezor/messages/NEMMosaic.py | 12 +++++ src/trezor/messages/NEMMosaicCreation.py | 12 +++++ src/trezor/messages/NEMMosaicDefinition.py | 36 +++++++++++++ src/trezor/messages/NEMMosaicSupplyChange.py | 14 +++++ src/trezor/messages/NEMProvisionNamespace.py | 14 +++++ src/trezor/messages/NEMSignTx.py | 24 +++++++++ src/trezor/messages/NEMSignedTx.py | 10 ++++ src/trezor/messages/NEMTransactionCommon.py | 18 +++++++ src/trezor/messages/NEMTransfer.py | 16 ++++++ src/trezor/messages/PassphraseAck.py | 9 +++- src/trezor/messages/PassphraseRequest.py | 9 ++-- src/trezor/messages/PinMatrixAck.py | 8 +++ src/trezor/messages/PinMatrixRequest.py | 8 +++ src/trezor/messages/Ping.py | 14 +++++ src/trezor/messages/PublicKey.py | 10 ++++ src/trezor/messages/RecoveryDevice.py | 24 +++++++++ src/trezor/messages/ResetDevice.py | 22 ++++++++ src/trezor/messages/SelfTest.py | 8 +++ src/trezor/messages/SetU2FCounter.py | 8 +++ src/trezor/messages/SignIdentity.py | 14 +++++ src/trezor/messages/SignMessage.py | 14 +++++ src/trezor/messages/SignTx.py | 17 +++++- src/trezor/messages/SignedIdentity.py | 12 +++++ src/trezor/messages/SimpleSignTx.py | 18 +++++++ src/trezor/messages/Success.py | 8 +++ src/trezor/messages/TransactionType.py | 25 ++++++++- src/trezor/messages/TxAck.py | 8 +++ src/trezor/messages/TxInputType.py | 24 ++++++++- src/trezor/messages/TxOutputBinType.py | 11 +++- src/trezor/messages/TxOutputType.py | 19 ++++++- src/trezor/messages/TxRequest.py | 12 +++++ src/trezor/messages/TxRequestDetailsType.py | 14 +++++ .../messages/TxRequestSerializedType.py | 12 +++++ src/trezor/messages/TxSize.py | 8 +++ src/trezor/messages/VerifyMessage.py | 14 +++++ src/trezor/messages/WipeDevice.py | 6 +++ src/trezor/messages/WordAck.py | 8 +++ src/trezor/messages/WordRequest.py | 8 +++ src/trezor/messages/wire_types.py | 2 - tools/build_protobuf | 4 +- tools/pb2py | 23 +++++++- 108 files changed, 1283 insertions(+), 48 deletions(-) delete mode 100644 src/trezor/messages/NEMDecryptMessage.py delete mode 100644 src/trezor/messages/NEMDecryptedMessage.py diff --git a/src/trezor/messages/Address.py b/src/trezor/messages/Address.py index 36c52329..c780dc32 100644 --- a/src/trezor/messages/Address.py +++ b/src/trezor/messages/Address.py @@ -7,3 +7,11 @@ class Address(p.MessageType): 1: ('address', p.UnicodeType, 0), # required } MESSAGE_WIRE_TYPE = 30 + + def __init__( + self, + address: str = None, + **kwargs, + ): + self.address = address + p.MessageType.__init__(self, **kwargs) diff --git a/src/trezor/messages/ApplyFlags.py b/src/trezor/messages/ApplyFlags.py index 4f3c2b94..9fd1151d 100644 --- a/src/trezor/messages/ApplyFlags.py +++ b/src/trezor/messages/ApplyFlags.py @@ -7,3 +7,11 @@ class ApplyFlags(p.MessageType): 1: ('flags', p.UVarintType, 0), } MESSAGE_WIRE_TYPE = 28 + + def __init__( + self, + flags: int = None, + **kwargs, + ): + self.flags = flags + p.MessageType.__init__(self, **kwargs) diff --git a/src/trezor/messages/ApplySettings.py b/src/trezor/messages/ApplySettings.py index fbc6848e..b9c888e3 100644 --- a/src/trezor/messages/ApplySettings.py +++ b/src/trezor/messages/ApplySettings.py @@ -10,3 +10,17 @@ class ApplySettings(p.MessageType): 4: ('homescreen', p.BytesType, 0), } MESSAGE_WIRE_TYPE = 25 + + def __init__( + self, + language: str = None, + label: str = None, + use_passphrase: bool = None, + homescreen: bytes = None, + **kwargs, + ): + self.language = language + self.label = label + self.use_passphrase = use_passphrase + self.homescreen = homescreen + p.MessageType.__init__(self, **kwargs) diff --git a/src/trezor/messages/BackupDevice.py b/src/trezor/messages/BackupDevice.py index f44788ff..9b17da6a 100644 --- a/src/trezor/messages/BackupDevice.py +++ b/src/trezor/messages/BackupDevice.py @@ -4,3 +4,9 @@ import protobuf as p class BackupDevice(p.MessageType): MESSAGE_WIRE_TYPE = 34 + + def __init__( + self, + **kwargs, + ): + p.MessageType.__init__(self, **kwargs) diff --git a/src/trezor/messages/ButtonAck.py b/src/trezor/messages/ButtonAck.py index 08b16918..01827491 100644 --- a/src/trezor/messages/ButtonAck.py +++ b/src/trezor/messages/ButtonAck.py @@ -4,3 +4,9 @@ import protobuf as p class ButtonAck(p.MessageType): MESSAGE_WIRE_TYPE = 27 + + def __init__( + self, + **kwargs, + ): + p.MessageType.__init__(self, **kwargs) diff --git a/src/trezor/messages/ButtonRequest.py b/src/trezor/messages/ButtonRequest.py index cc5f3dd8..fed1c921 100644 --- a/src/trezor/messages/ButtonRequest.py +++ b/src/trezor/messages/ButtonRequest.py @@ -8,3 +8,13 @@ class ButtonRequest(p.MessageType): 2: ('data', p.UnicodeType, 0), } MESSAGE_WIRE_TYPE = 26 + + def __init__( + self, + code: int = None, + data: str = None, + **kwargs, + ): + self.code = code + self.data = data + p.MessageType.__init__(self, **kwargs) diff --git a/src/trezor/messages/Cancel.py b/src/trezor/messages/Cancel.py index 4f8a68df..151af97c 100644 --- a/src/trezor/messages/Cancel.py +++ b/src/trezor/messages/Cancel.py @@ -4,3 +4,9 @@ import protobuf as p class Cancel(p.MessageType): MESSAGE_WIRE_TYPE = 20 + + def __init__( + self, + **kwargs, + ): + p.MessageType.__init__(self, **kwargs) diff --git a/src/trezor/messages/ChangePin.py b/src/trezor/messages/ChangePin.py index 167b9fef..4289c801 100644 --- a/src/trezor/messages/ChangePin.py +++ b/src/trezor/messages/ChangePin.py @@ -7,3 +7,11 @@ class ChangePin(p.MessageType): 1: ('remove', p.BoolType, 0), } MESSAGE_WIRE_TYPE = 4 + + def __init__( + self, + remove: bool = None, + **kwargs, + ): + self.remove = remove + p.MessageType.__init__(self, **kwargs) diff --git a/src/trezor/messages/CipherKeyValue.py b/src/trezor/messages/CipherKeyValue.py index d3d157d2..25d7f050 100644 --- a/src/trezor/messages/CipherKeyValue.py +++ b/src/trezor/messages/CipherKeyValue.py @@ -13,3 +13,23 @@ class CipherKeyValue(p.MessageType): 7: ('iv', p.BytesType, 0), } MESSAGE_WIRE_TYPE = 23 + + def __init__( + self, + address_n: list = [], + key: str = None, + value: bytes = None, + encrypt: bool = None, + ask_on_encrypt: bool = None, + ask_on_decrypt: bool = None, + iv: bytes = None, + **kwargs, + ): + self.address_n = address_n + self.key = key + self.value = value + self.encrypt = encrypt + self.ask_on_encrypt = ask_on_encrypt + self.ask_on_decrypt = ask_on_decrypt + self.iv = iv + p.MessageType.__init__(self, **kwargs) diff --git a/src/trezor/messages/CipheredKeyValue.py b/src/trezor/messages/CipheredKeyValue.py index aa7c54e6..7fe8dc9d 100644 --- a/src/trezor/messages/CipheredKeyValue.py +++ b/src/trezor/messages/CipheredKeyValue.py @@ -7,3 +7,11 @@ class CipheredKeyValue(p.MessageType): 1: ('value', p.BytesType, 0), } MESSAGE_WIRE_TYPE = 48 + + def __init__( + self, + value: bytes = None, + **kwargs, + ): + self.value = value + p.MessageType.__init__(self, **kwargs) diff --git a/src/trezor/messages/ClearSession.py b/src/trezor/messages/ClearSession.py index 808d5b76..9ab99e9e 100644 --- a/src/trezor/messages/ClearSession.py +++ b/src/trezor/messages/ClearSession.py @@ -4,3 +4,9 @@ import protobuf as p class ClearSession(p.MessageType): MESSAGE_WIRE_TYPE = 24 + + def __init__( + self, + **kwargs, + ): + p.MessageType.__init__(self, **kwargs) diff --git a/src/trezor/messages/CoinType.py b/src/trezor/messages/CoinType.py index 62678465..5ed7fa14 100644 --- a/src/trezor/messages/CoinType.py +++ b/src/trezor/messages/CoinType.py @@ -14,5 +14,30 @@ class CoinType(p.MessageType): 10: ('xprv_magic', p.UVarintType, 0), # default=76066276 11: ('segwit', p.BoolType, 0), 12: ('forkid', p.UVarintType, 0), - 13: ('force_bip143', p.BoolType, 0), } + + def __init__( + self, + coin_name: str = None, + coin_shortcut: str = None, + address_type: int = None, + maxfee_kb: int = None, + address_type_p2sh: int = None, + signed_message_header: str = None, + xpub_magic: int = None, + xprv_magic: int = None, + segwit: bool = None, + forkid: int = None, + **kwargs, + ): + self.coin_name = coin_name + self.coin_shortcut = coin_shortcut + self.address_type = address_type + self.maxfee_kb = maxfee_kb + self.address_type_p2sh = address_type_p2sh + self.signed_message_header = signed_message_header + self.xpub_magic = xpub_magic + self.xprv_magic = xprv_magic + self.segwit = segwit + self.forkid = forkid + p.MessageType.__init__(self, **kwargs) diff --git a/src/trezor/messages/CosiCommit.py b/src/trezor/messages/CosiCommit.py index ed51be29..a39c8cfc 100644 --- a/src/trezor/messages/CosiCommit.py +++ b/src/trezor/messages/CosiCommit.py @@ -8,3 +8,13 @@ class CosiCommit(p.MessageType): 2: ('data', p.BytesType, 0), } MESSAGE_WIRE_TYPE = 71 + + def __init__( + self, + address_n: list = [], + data: bytes = None, + **kwargs, + ): + self.address_n = address_n + self.data = data + p.MessageType.__init__(self, **kwargs) diff --git a/src/trezor/messages/CosiCommitment.py b/src/trezor/messages/CosiCommitment.py index 526d54dc..468ac884 100644 --- a/src/trezor/messages/CosiCommitment.py +++ b/src/trezor/messages/CosiCommitment.py @@ -8,3 +8,13 @@ class CosiCommitment(p.MessageType): 2: ('pubkey', p.BytesType, 0), } MESSAGE_WIRE_TYPE = 72 + + def __init__( + self, + commitment: bytes = None, + pubkey: bytes = None, + **kwargs, + ): + self.commitment = commitment + self.pubkey = pubkey + p.MessageType.__init__(self, **kwargs) diff --git a/src/trezor/messages/CosiSign.py b/src/trezor/messages/CosiSign.py index b46d1fe7..d79596c3 100644 --- a/src/trezor/messages/CosiSign.py +++ b/src/trezor/messages/CosiSign.py @@ -10,3 +10,17 @@ class CosiSign(p.MessageType): 4: ('global_pubkey', p.BytesType, 0), } MESSAGE_WIRE_TYPE = 73 + + def __init__( + self, + address_n: list = [], + data: bytes = None, + global_commitment: bytes = None, + global_pubkey: bytes = None, + **kwargs, + ): + self.address_n = address_n + self.data = data + self.global_commitment = global_commitment + self.global_pubkey = global_pubkey + p.MessageType.__init__(self, **kwargs) diff --git a/src/trezor/messages/CosiSignature.py b/src/trezor/messages/CosiSignature.py index 1ea3a92a..19bf1919 100644 --- a/src/trezor/messages/CosiSignature.py +++ b/src/trezor/messages/CosiSignature.py @@ -7,3 +7,11 @@ class CosiSignature(p.MessageType): 1: ('signature', p.BytesType, 0), } MESSAGE_WIRE_TYPE = 74 + + def __init__( + self, + signature: bytes = None, + **kwargs, + ): + self.signature = signature + p.MessageType.__init__(self, **kwargs) diff --git a/src/trezor/messages/DebugLinkDecision.py b/src/trezor/messages/DebugLinkDecision.py index 445f3129..9bdcbcec 100644 --- a/src/trezor/messages/DebugLinkDecision.py +++ b/src/trezor/messages/DebugLinkDecision.py @@ -7,3 +7,11 @@ class DebugLinkDecision(p.MessageType): 1: ('yes_no', p.BoolType, 0), # required } MESSAGE_WIRE_TYPE = 100 + + def __init__( + self, + yes_no: bool = None, + **kwargs, + ): + self.yes_no = yes_no + p.MessageType.__init__(self, **kwargs) diff --git a/src/trezor/messages/DebugLinkFlashErase.py b/src/trezor/messages/DebugLinkFlashErase.py index 884674bc..45d4ce01 100644 --- a/src/trezor/messages/DebugLinkFlashErase.py +++ b/src/trezor/messages/DebugLinkFlashErase.py @@ -7,3 +7,11 @@ class DebugLinkFlashErase(p.MessageType): 1: ('sector', p.UVarintType, 0), } MESSAGE_WIRE_TYPE = 113 + + def __init__( + self, + sector: int = None, + **kwargs, + ): + self.sector = sector + p.MessageType.__init__(self, **kwargs) diff --git a/src/trezor/messages/DebugLinkGetState.py b/src/trezor/messages/DebugLinkGetState.py index 35cbbf9a..73321033 100644 --- a/src/trezor/messages/DebugLinkGetState.py +++ b/src/trezor/messages/DebugLinkGetState.py @@ -4,3 +4,9 @@ import protobuf as p class DebugLinkGetState(p.MessageType): MESSAGE_WIRE_TYPE = 101 + + def __init__( + self, + **kwargs, + ): + p.MessageType.__init__(self, **kwargs) diff --git a/src/trezor/messages/DebugLinkLog.py b/src/trezor/messages/DebugLinkLog.py index d3698240..61d8ff3b 100644 --- a/src/trezor/messages/DebugLinkLog.py +++ b/src/trezor/messages/DebugLinkLog.py @@ -9,3 +9,15 @@ class DebugLinkLog(p.MessageType): 3: ('text', p.UnicodeType, 0), } MESSAGE_WIRE_TYPE = 104 + + def __init__( + self, + level: int = None, + bucket: str = None, + text: str = None, + **kwargs, + ): + self.level = level + self.bucket = bucket + self.text = text + p.MessageType.__init__(self, **kwargs) diff --git a/src/trezor/messages/DebugLinkMemory.py b/src/trezor/messages/DebugLinkMemory.py index 331497ee..6cdbd3fc 100644 --- a/src/trezor/messages/DebugLinkMemory.py +++ b/src/trezor/messages/DebugLinkMemory.py @@ -7,3 +7,11 @@ class DebugLinkMemory(p.MessageType): 1: ('memory', p.BytesType, 0), } MESSAGE_WIRE_TYPE = 111 + + def __init__( + self, + memory: bytes = None, + **kwargs, + ): + self.memory = memory + p.MessageType.__init__(self, **kwargs) diff --git a/src/trezor/messages/DebugLinkMemoryRead.py b/src/trezor/messages/DebugLinkMemoryRead.py index 819a146d..9adc1cdf 100644 --- a/src/trezor/messages/DebugLinkMemoryRead.py +++ b/src/trezor/messages/DebugLinkMemoryRead.py @@ -8,3 +8,13 @@ class DebugLinkMemoryRead(p.MessageType): 2: ('length', p.UVarintType, 0), } MESSAGE_WIRE_TYPE = 110 + + def __init__( + self, + address: int = None, + length: int = None, + **kwargs, + ): + self.address = address + self.length = length + p.MessageType.__init__(self, **kwargs) diff --git a/src/trezor/messages/DebugLinkMemoryWrite.py b/src/trezor/messages/DebugLinkMemoryWrite.py index abd9478c..a6a83bc7 100644 --- a/src/trezor/messages/DebugLinkMemoryWrite.py +++ b/src/trezor/messages/DebugLinkMemoryWrite.py @@ -9,3 +9,15 @@ class DebugLinkMemoryWrite(p.MessageType): 3: ('flash', p.BoolType, 0), } MESSAGE_WIRE_TYPE = 112 + + def __init__( + self, + address: int = None, + memory: bytes = None, + flash: bool = None, + **kwargs, + ): + self.address = address + self.memory = memory + self.flash = flash + p.MessageType.__init__(self, **kwargs) diff --git a/src/trezor/messages/DebugLinkState.py b/src/trezor/messages/DebugLinkState.py index 4b8e102b..e6a22def 100644 --- a/src/trezor/messages/DebugLinkState.py +++ b/src/trezor/messages/DebugLinkState.py @@ -17,3 +17,29 @@ class DebugLinkState(p.MessageType): 10: ('recovery_word_pos', p.UVarintType, 0), } MESSAGE_WIRE_TYPE = 102 + + def __init__( + self, + layout: bytes = None, + pin: str = None, + matrix: str = None, + mnemonic: str = None, + node: HDNodeType = None, + passphrase_protection: bool = None, + reset_word: str = None, + reset_entropy: bytes = None, + recovery_fake_word: str = None, + recovery_word_pos: int = None, + **kwargs, + ): + self.layout = layout + self.pin = pin + self.matrix = matrix + self.mnemonic = mnemonic + self.node = node + self.passphrase_protection = passphrase_protection + self.reset_word = reset_word + self.reset_entropy = reset_entropy + self.recovery_fake_word = recovery_fake_word + self.recovery_word_pos = recovery_word_pos + p.MessageType.__init__(self, **kwargs) diff --git a/src/trezor/messages/DebugLinkStop.py b/src/trezor/messages/DebugLinkStop.py index 5025da0b..c643fba0 100644 --- a/src/trezor/messages/DebugLinkStop.py +++ b/src/trezor/messages/DebugLinkStop.py @@ -4,3 +4,9 @@ import protobuf as p class DebugLinkStop(p.MessageType): MESSAGE_WIRE_TYPE = 103 + + def __init__( + self, + **kwargs, + ): + p.MessageType.__init__(self, **kwargs) diff --git a/src/trezor/messages/DecryptMessage.py b/src/trezor/messages/DecryptMessage.py index afe50b97..3636ab98 100644 --- a/src/trezor/messages/DecryptMessage.py +++ b/src/trezor/messages/DecryptMessage.py @@ -10,3 +10,17 @@ class DecryptMessage(p.MessageType): 4: ('hmac', p.BytesType, 0), } MESSAGE_WIRE_TYPE = 51 + + def __init__( + self, + address_n: list = [], + nonce: bytes = None, + message: bytes = None, + hmac: bytes = None, + **kwargs, + ): + self.address_n = address_n + self.nonce = nonce + self.message = message + self.hmac = hmac + p.MessageType.__init__(self, **kwargs) diff --git a/src/trezor/messages/DecryptedMessage.py b/src/trezor/messages/DecryptedMessage.py index c294c599..1a4a6039 100644 --- a/src/trezor/messages/DecryptedMessage.py +++ b/src/trezor/messages/DecryptedMessage.py @@ -8,3 +8,13 @@ class DecryptedMessage(p.MessageType): 2: ('address', p.UnicodeType, 0), } MESSAGE_WIRE_TYPE = 52 + + def __init__( + self, + message: bytes = None, + address: str = None, + **kwargs, + ): + self.message = message + self.address = address + p.MessageType.__init__(self, **kwargs) diff --git a/src/trezor/messages/ECDHSessionKey.py b/src/trezor/messages/ECDHSessionKey.py index df84b553..6c16d7b1 100644 --- a/src/trezor/messages/ECDHSessionKey.py +++ b/src/trezor/messages/ECDHSessionKey.py @@ -7,3 +7,11 @@ class ECDHSessionKey(p.MessageType): 1: ('session_key', p.BytesType, 0), } MESSAGE_WIRE_TYPE = 62 + + def __init__( + self, + session_key: bytes = None, + **kwargs, + ): + self.session_key = session_key + p.MessageType.__init__(self, **kwargs) diff --git a/src/trezor/messages/EncryptMessage.py b/src/trezor/messages/EncryptMessage.py index b0177f5c..dcd51e91 100644 --- a/src/trezor/messages/EncryptMessage.py +++ b/src/trezor/messages/EncryptMessage.py @@ -11,3 +11,19 @@ class EncryptMessage(p.MessageType): 5: ('coin_name', p.UnicodeType, 0), # default='Bitcoin' } MESSAGE_WIRE_TYPE = 49 + + def __init__( + self, + pubkey: bytes = None, + message: bytes = None, + display_only: bool = None, + address_n: list = [], + coin_name: str = None, + **kwargs, + ): + self.pubkey = pubkey + self.message = message + self.display_only = display_only + self.address_n = address_n + self.coin_name = coin_name + p.MessageType.__init__(self, **kwargs) diff --git a/src/trezor/messages/EncryptedMessage.py b/src/trezor/messages/EncryptedMessage.py index d98cc1d0..1126176b 100644 --- a/src/trezor/messages/EncryptedMessage.py +++ b/src/trezor/messages/EncryptedMessage.py @@ -9,3 +9,15 @@ class EncryptedMessage(p.MessageType): 3: ('hmac', p.BytesType, 0), } MESSAGE_WIRE_TYPE = 50 + + def __init__( + self, + nonce: bytes = None, + message: bytes = None, + hmac: bytes = None, + **kwargs, + ): + self.nonce = nonce + self.message = message + self.hmac = hmac + p.MessageType.__init__(self, **kwargs) diff --git a/src/trezor/messages/Entropy.py b/src/trezor/messages/Entropy.py index 21d97384..801ba0bd 100644 --- a/src/trezor/messages/Entropy.py +++ b/src/trezor/messages/Entropy.py @@ -7,3 +7,11 @@ class Entropy(p.MessageType): 1: ('entropy', p.BytesType, 0), # required } MESSAGE_WIRE_TYPE = 10 + + def __init__( + self, + entropy: bytes = None, + **kwargs, + ): + self.entropy = entropy + p.MessageType.__init__(self, **kwargs) diff --git a/src/trezor/messages/EntropyAck.py b/src/trezor/messages/EntropyAck.py index 594e102c..bcfe63b1 100644 --- a/src/trezor/messages/EntropyAck.py +++ b/src/trezor/messages/EntropyAck.py @@ -7,3 +7,11 @@ class EntropyAck(p.MessageType): 1: ('entropy', p.BytesType, 0), } MESSAGE_WIRE_TYPE = 36 + + def __init__( + self, + entropy: bytes = None, + **kwargs, + ): + self.entropy = entropy + p.MessageType.__init__(self, **kwargs) diff --git a/src/trezor/messages/EntropyRequest.py b/src/trezor/messages/EntropyRequest.py index fa732dac..aefdf109 100644 --- a/src/trezor/messages/EntropyRequest.py +++ b/src/trezor/messages/EntropyRequest.py @@ -4,3 +4,9 @@ import protobuf as p class EntropyRequest(p.MessageType): MESSAGE_WIRE_TYPE = 35 + + def __init__( + self, + **kwargs, + ): + p.MessageType.__init__(self, **kwargs) diff --git a/src/trezor/messages/EstimateTxSize.py b/src/trezor/messages/EstimateTxSize.py index 9a9342b3..db0bf8c4 100644 --- a/src/trezor/messages/EstimateTxSize.py +++ b/src/trezor/messages/EstimateTxSize.py @@ -9,3 +9,15 @@ class EstimateTxSize(p.MessageType): 3: ('coin_name', p.UnicodeType, 0), # default='Bitcoin' } MESSAGE_WIRE_TYPE = 43 + + def __init__( + self, + outputs_count: int = None, + inputs_count: int = None, + coin_name: str = None, + **kwargs, + ): + self.outputs_count = outputs_count + self.inputs_count = inputs_count + self.coin_name = coin_name + p.MessageType.__init__(self, **kwargs) diff --git a/src/trezor/messages/EthereumAddress.py b/src/trezor/messages/EthereumAddress.py index 69da373e..e48518f3 100644 --- a/src/trezor/messages/EthereumAddress.py +++ b/src/trezor/messages/EthereumAddress.py @@ -7,3 +7,11 @@ class EthereumAddress(p.MessageType): 1: ('address', p.BytesType, 0), # required } MESSAGE_WIRE_TYPE = 57 + + def __init__( + self, + address: bytes = None, + **kwargs, + ): + self.address = address + p.MessageType.__init__(self, **kwargs) diff --git a/src/trezor/messages/EthereumGetAddress.py b/src/trezor/messages/EthereumGetAddress.py index b4b594f1..ce4030f8 100644 --- a/src/trezor/messages/EthereumGetAddress.py +++ b/src/trezor/messages/EthereumGetAddress.py @@ -8,3 +8,13 @@ class EthereumGetAddress(p.MessageType): 2: ('show_display', p.BoolType, 0), } MESSAGE_WIRE_TYPE = 56 + + def __init__( + self, + address_n: list = [], + show_display: bool = None, + **kwargs, + ): + self.address_n = address_n + self.show_display = show_display + p.MessageType.__init__(self, **kwargs) diff --git a/src/trezor/messages/EthereumMessageSignature.py b/src/trezor/messages/EthereumMessageSignature.py index 42c95f98..49f454a2 100644 --- a/src/trezor/messages/EthereumMessageSignature.py +++ b/src/trezor/messages/EthereumMessageSignature.py @@ -8,3 +8,13 @@ class EthereumMessageSignature(p.MessageType): 2: ('signature', p.BytesType, 0), } MESSAGE_WIRE_TYPE = 66 + + def __init__( + self, + address: bytes = None, + signature: bytes = None, + **kwargs, + ): + self.address = address + self.signature = signature + p.MessageType.__init__(self, **kwargs) diff --git a/src/trezor/messages/EthereumSignMessage.py b/src/trezor/messages/EthereumSignMessage.py index 6bd211c0..fe5eecf6 100644 --- a/src/trezor/messages/EthereumSignMessage.py +++ b/src/trezor/messages/EthereumSignMessage.py @@ -8,3 +8,13 @@ class EthereumSignMessage(p.MessageType): 2: ('message', p.BytesType, 0), # required } MESSAGE_WIRE_TYPE = 64 + + def __init__( + self, + address_n: list = [], + message: bytes = None, + **kwargs, + ): + self.address_n = address_n + self.message = message + p.MessageType.__init__(self, **kwargs) diff --git a/src/trezor/messages/EthereumSignTx.py b/src/trezor/messages/EthereumSignTx.py index ddac9034..97377e6b 100644 --- a/src/trezor/messages/EthereumSignTx.py +++ b/src/trezor/messages/EthereumSignTx.py @@ -15,3 +15,27 @@ class EthereumSignTx(p.MessageType): 9: ('chain_id', p.UVarintType, 0), } MESSAGE_WIRE_TYPE = 58 + + def __init__( + self, + address_n: list = [], + nonce: bytes = None, + gas_price: bytes = None, + gas_limit: bytes = None, + to: bytes = None, + value: bytes = None, + data_initial_chunk: bytes = None, + data_length: int = None, + chain_id: int = None, + **kwargs, + ): + self.address_n = address_n + self.nonce = nonce + self.gas_price = gas_price + self.gas_limit = gas_limit + self.to = to + self.value = value + self.data_initial_chunk = data_initial_chunk + self.data_length = data_length + self.chain_id = chain_id + p.MessageType.__init__(self, **kwargs) diff --git a/src/trezor/messages/EthereumTxAck.py b/src/trezor/messages/EthereumTxAck.py index a0226364..c874093a 100644 --- a/src/trezor/messages/EthereumTxAck.py +++ b/src/trezor/messages/EthereumTxAck.py @@ -7,3 +7,11 @@ class EthereumTxAck(p.MessageType): 1: ('data_chunk', p.BytesType, 0), } MESSAGE_WIRE_TYPE = 60 + + def __init__( + self, + data_chunk: bytes = None, + **kwargs, + ): + self.data_chunk = data_chunk + p.MessageType.__init__(self, **kwargs) diff --git a/src/trezor/messages/EthereumTxRequest.py b/src/trezor/messages/EthereumTxRequest.py index a837c8df..840613ed 100644 --- a/src/trezor/messages/EthereumTxRequest.py +++ b/src/trezor/messages/EthereumTxRequest.py @@ -10,3 +10,17 @@ class EthereumTxRequest(p.MessageType): 4: ('signature_s', p.BytesType, 0), } MESSAGE_WIRE_TYPE = 59 + + def __init__( + self, + data_length: int = None, + signature_v: int = None, + signature_r: bytes = None, + signature_s: bytes = None, + **kwargs, + ): + self.data_length = data_length + self.signature_v = signature_v + self.signature_r = signature_r + self.signature_s = signature_s + p.MessageType.__init__(self, **kwargs) diff --git a/src/trezor/messages/EthereumVerifyMessage.py b/src/trezor/messages/EthereumVerifyMessage.py index 58bb8184..692f40fa 100644 --- a/src/trezor/messages/EthereumVerifyMessage.py +++ b/src/trezor/messages/EthereumVerifyMessage.py @@ -9,3 +9,15 @@ class EthereumVerifyMessage(p.MessageType): 3: ('message', p.BytesType, 0), } MESSAGE_WIRE_TYPE = 65 + + def __init__( + self, + address: bytes = None, + signature: bytes = None, + message: bytes = None, + **kwargs, + ): + self.address = address + self.signature = signature + self.message = message + p.MessageType.__init__(self, **kwargs) diff --git a/src/trezor/messages/Failure.py b/src/trezor/messages/Failure.py index 50d86f59..f0e91c67 100644 --- a/src/trezor/messages/Failure.py +++ b/src/trezor/messages/Failure.py @@ -8,3 +8,13 @@ class Failure(p.MessageType): 2: ('message', p.UnicodeType, 0), } MESSAGE_WIRE_TYPE = 3 + + def __init__( + self, + code: int = None, + message: str = None, + **kwargs, + ): + self.code = code + self.message = message + p.MessageType.__init__(self, **kwargs) diff --git a/src/trezor/messages/Features.py b/src/trezor/messages/Features.py index b6c5014a..598931fd 100644 --- a/src/trezor/messages/Features.py +++ b/src/trezor/messages/Features.py @@ -25,12 +25,51 @@ class Features(p.MessageType): 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: ('state', p.BytesType, 0), } MESSAGE_WIRE_TYPE = 17 + + def __init__( + self, + vendor: str = None, + major_version: int = None, + minor_version: int = None, + patch_version: int = None, + bootloader_mode: bool = None, + device_id: str = None, + pin_protection: bool = None, + passphrase_protection: bool = None, + language: str = None, + label: str = None, + coins: list = [], + initialized: bool = None, + revision: bytes = None, + bootloader_hash: bytes = None, + imported: bool = None, + pin_cached: bool = None, + passphrase_cached: bool = None, + firmware_present: bool = None, + needs_backup: bool = None, + flags: int = None, + **kwargs, + ): + self.vendor = vendor + self.major_version = major_version + self.minor_version = minor_version + self.patch_version = patch_version + self.bootloader_mode = bootloader_mode + self.device_id = device_id + self.pin_protection = pin_protection + self.passphrase_protection = passphrase_protection + self.language = language + self.label = label + self.coins = coins + self.initialized = initialized + self.revision = revision + self.bootloader_hash = bootloader_hash + self.imported = imported + self.pin_cached = pin_cached + self.passphrase_cached = passphrase_cached + self.firmware_present = firmware_present + self.needs_backup = needs_backup + self.flags = flags + p.MessageType.__init__(self, **kwargs) diff --git a/src/trezor/messages/FirmwareErase.py b/src/trezor/messages/FirmwareErase.py index 7e59cff1..06ac7157 100644 --- a/src/trezor/messages/FirmwareErase.py +++ b/src/trezor/messages/FirmwareErase.py @@ -7,3 +7,11 @@ class FirmwareErase(p.MessageType): 1: ('length', p.UVarintType, 0), } MESSAGE_WIRE_TYPE = 6 + + def __init__( + self, + length: int = None, + **kwargs, + ): + self.length = length + p.MessageType.__init__(self, **kwargs) diff --git a/src/trezor/messages/FirmwareRequest.py b/src/trezor/messages/FirmwareRequest.py index a91f9a8d..77dca3df 100644 --- a/src/trezor/messages/FirmwareRequest.py +++ b/src/trezor/messages/FirmwareRequest.py @@ -8,3 +8,13 @@ class FirmwareRequest(p.MessageType): 2: ('length', p.UVarintType, 0), } MESSAGE_WIRE_TYPE = 8 + + def __init__( + self, + offset: int = None, + length: int = None, + **kwargs, + ): + self.offset = offset + self.length = length + p.MessageType.__init__(self, **kwargs) diff --git a/src/trezor/messages/FirmwareUpload.py b/src/trezor/messages/FirmwareUpload.py index 489e45d1..2d66ea51 100644 --- a/src/trezor/messages/FirmwareUpload.py +++ b/src/trezor/messages/FirmwareUpload.py @@ -8,3 +8,13 @@ class FirmwareUpload(p.MessageType): 2: ('hash', p.BytesType, 0), } MESSAGE_WIRE_TYPE = 7 + + def __init__( + self, + payload: bytes = None, + hash: bytes = None, + **kwargs, + ): + self.payload = payload + self.hash = hash + p.MessageType.__init__(self, **kwargs) diff --git a/src/trezor/messages/GetAddress.py b/src/trezor/messages/GetAddress.py index ad08d431..528b4681 100644 --- a/src/trezor/messages/GetAddress.py +++ b/src/trezor/messages/GetAddress.py @@ -12,3 +12,19 @@ class GetAddress(p.MessageType): 5: ('script_type', p.UVarintType, 0), # default=0 } MESSAGE_WIRE_TYPE = 29 + + def __init__( + self, + address_n: list = [], + coin_name: str = None, + show_display: bool = None, + multisig: MultisigRedeemScriptType = None, + script_type: int = None, + **kwargs, + ): + self.address_n = address_n + self.coin_name = coin_name + self.show_display = show_display + self.multisig = multisig + self.script_type = script_type + p.MessageType.__init__(self, **kwargs) diff --git a/src/trezor/messages/GetECDHSessionKey.py b/src/trezor/messages/GetECDHSessionKey.py index d6cf310a..23ac6cc9 100644 --- a/src/trezor/messages/GetECDHSessionKey.py +++ b/src/trezor/messages/GetECDHSessionKey.py @@ -10,3 +10,15 @@ class GetECDHSessionKey(p.MessageType): 3: ('ecdsa_curve_name', p.UnicodeType, 0), } MESSAGE_WIRE_TYPE = 61 + + def __init__( + self, + identity: IdentityType = None, + peer_public_key: bytes = None, + ecdsa_curve_name: str = None, + **kwargs, + ): + self.identity = identity + self.peer_public_key = peer_public_key + self.ecdsa_curve_name = ecdsa_curve_name + p.MessageType.__init__(self, **kwargs) diff --git a/src/trezor/messages/GetEntropy.py b/src/trezor/messages/GetEntropy.py index ded2c81d..82449958 100644 --- a/src/trezor/messages/GetEntropy.py +++ b/src/trezor/messages/GetEntropy.py @@ -7,3 +7,11 @@ class GetEntropy(p.MessageType): 1: ('size', p.UVarintType, 0), # required } MESSAGE_WIRE_TYPE = 9 + + def __init__( + self, + size: int = None, + **kwargs, + ): + self.size = size + p.MessageType.__init__(self, **kwargs) diff --git a/src/trezor/messages/GetFeatures.py b/src/trezor/messages/GetFeatures.py index 85862a62..44358c25 100644 --- a/src/trezor/messages/GetFeatures.py +++ b/src/trezor/messages/GetFeatures.py @@ -4,3 +4,9 @@ import protobuf as p class GetFeatures(p.MessageType): MESSAGE_WIRE_TYPE = 55 + + def __init__( + self, + **kwargs, + ): + p.MessageType.__init__(self, **kwargs) diff --git a/src/trezor/messages/GetPublicKey.py b/src/trezor/messages/GetPublicKey.py index b16ac25a..a90021af 100644 --- a/src/trezor/messages/GetPublicKey.py +++ b/src/trezor/messages/GetPublicKey.py @@ -10,3 +10,17 @@ class GetPublicKey(p.MessageType): 4: ('coin_name', p.UnicodeType, 0), # default='Bitcoin' } MESSAGE_WIRE_TYPE = 11 + + def __init__( + self, + address_n: list = [], + ecdsa_curve_name: str = None, + show_display: bool = None, + coin_name: str = None, + **kwargs, + ): + self.address_n = address_n + self.ecdsa_curve_name = ecdsa_curve_name + self.show_display = show_display + self.coin_name = coin_name + p.MessageType.__init__(self, **kwargs) diff --git a/src/trezor/messages/HDNodePathType.py b/src/trezor/messages/HDNodePathType.py index f3284a15..49971d5e 100644 --- a/src/trezor/messages/HDNodePathType.py +++ b/src/trezor/messages/HDNodePathType.py @@ -8,3 +8,13 @@ class HDNodePathType(p.MessageType): 1: ('node', HDNodeType, 0), # required 2: ('address_n', p.UVarintType, p.FLAG_REPEATED), } + + def __init__( + self, + node: HDNodeType = None, + address_n: list = [], + **kwargs, + ): + self.node = node + self.address_n = address_n + p.MessageType.__init__(self, **kwargs) diff --git a/src/trezor/messages/HDNodeType.py b/src/trezor/messages/HDNodeType.py index a1995795..7786d94f 100644 --- a/src/trezor/messages/HDNodeType.py +++ b/src/trezor/messages/HDNodeType.py @@ -11,3 +11,21 @@ class HDNodeType(p.MessageType): 5: ('private_key', p.BytesType, 0), 6: ('public_key', p.BytesType, 0), } + + def __init__( + self, + depth: int = None, + fingerprint: int = None, + child_num: int = None, + chain_code: bytes = None, + private_key: bytes = None, + public_key: bytes = None, + **kwargs, + ): + 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 + p.MessageType.__init__(self, **kwargs) diff --git a/src/trezor/messages/IdentityType.py b/src/trezor/messages/IdentityType.py index 8cf65057..6aa532a0 100644 --- a/src/trezor/messages/IdentityType.py +++ b/src/trezor/messages/IdentityType.py @@ -11,3 +11,21 @@ class IdentityType(p.MessageType): 5: ('path', p.UnicodeType, 0), 6: ('index', p.UVarintType, 0), # default=0 } + + def __init__( + self, + proto: str = None, + user: str = None, + host: str = None, + port: str = None, + path: str = None, + index: int = None, + **kwargs, + ): + self.proto = proto + self.user = user + self.host = host + self.port = port + self.path = path + self.index = index + p.MessageType.__init__(self, **kwargs) diff --git a/src/trezor/messages/Initialize.py b/src/trezor/messages/Initialize.py index 3aaa8456..9562713e 100644 --- a/src/trezor/messages/Initialize.py +++ b/src/trezor/messages/Initialize.py @@ -3,7 +3,10 @@ import protobuf as p class Initialize(p.MessageType): - FIELDS = { - 1: ('state', p.BytesType, 0), - } MESSAGE_WIRE_TYPE = 0 + + def __init__( + self, + **kwargs, + ): + p.MessageType.__init__(self, **kwargs) diff --git a/src/trezor/messages/LoadDevice.py b/src/trezor/messages/LoadDevice.py index 26248841..d97a1722 100644 --- a/src/trezor/messages/LoadDevice.py +++ b/src/trezor/messages/LoadDevice.py @@ -15,3 +15,25 @@ class LoadDevice(p.MessageType): 8: ('u2f_counter', p.UVarintType, 0), } MESSAGE_WIRE_TYPE = 13 + + def __init__( + self, + mnemonic: str = None, + node: HDNodeType = None, + pin: str = None, + passphrase_protection: bool = None, + language: str = None, + label: str = None, + skip_checksum: bool = None, + u2f_counter: int = None, + **kwargs, + ): + self.mnemonic = mnemonic + self.node = node + self.pin = pin + self.passphrase_protection = passphrase_protection + self.language = language + self.label = label + self.skip_checksum = skip_checksum + self.u2f_counter = u2f_counter + p.MessageType.__init__(self, **kwargs) diff --git a/src/trezor/messages/MessageSignature.py b/src/trezor/messages/MessageSignature.py index 337c6284..d5a62a28 100644 --- a/src/trezor/messages/MessageSignature.py +++ b/src/trezor/messages/MessageSignature.py @@ -8,3 +8,13 @@ class MessageSignature(p.MessageType): 2: ('signature', p.BytesType, 0), } MESSAGE_WIRE_TYPE = 40 + + def __init__( + self, + address: str = None, + signature: bytes = None, + **kwargs, + ): + self.address = address + self.signature = signature + p.MessageType.__init__(self, **kwargs) diff --git a/src/trezor/messages/MessageType.py b/src/trezor/messages/MessageType.py index ca870dd5..93c2a012 100644 --- a/src/trezor/messages/MessageType.py +++ b/src/trezor/messages/MessageType.py @@ -73,8 +73,6 @@ CosiCommit = const(71) CosiCommitment = const(72) CosiSign = const(73) CosiSignature = const(74) -NEMDecryptMessage = const(75) -NEMDecryptedMessage = const(76) DebugLinkDecision = const(100) DebugLinkGetState = const(101) DebugLinkState = const(102) diff --git a/src/trezor/messages/MultisigRedeemScriptType.py b/src/trezor/messages/MultisigRedeemScriptType.py index 6f4e05b0..eab03693 100644 --- a/src/trezor/messages/MultisigRedeemScriptType.py +++ b/src/trezor/messages/MultisigRedeemScriptType.py @@ -9,3 +9,15 @@ class MultisigRedeemScriptType(p.MessageType): 2: ('signatures', p.BytesType, p.FLAG_REPEATED), 3: ('m', p.UVarintType, 0), } + + def __init__( + self, + pubkeys: list = [], + signatures: list = [], + m: int = None, + **kwargs, + ): + self.pubkeys = pubkeys + self.signatures = signatures + self.m = m + p.MessageType.__init__(self, **kwargs) diff --git a/src/trezor/messages/NEMAddress.py b/src/trezor/messages/NEMAddress.py index 72a1f007..79a81004 100644 --- a/src/trezor/messages/NEMAddress.py +++ b/src/trezor/messages/NEMAddress.py @@ -7,3 +7,11 @@ class NEMAddress(p.MessageType): 1: ('address', p.UnicodeType, 0), # required } MESSAGE_WIRE_TYPE = 68 + + def __init__( + self, + address: str = None, + **kwargs, + ): + self.address = address + p.MessageType.__init__(self, **kwargs) diff --git a/src/trezor/messages/NEMAggregateModification.py b/src/trezor/messages/NEMAggregateModification.py index 53347f92..6aaff97f 100644 --- a/src/trezor/messages/NEMAggregateModification.py +++ b/src/trezor/messages/NEMAggregateModification.py @@ -8,3 +8,13 @@ class NEMAggregateModification(p.MessageType): 1: ('modifications', NEMCosignatoryModification, p.FLAG_REPEATED), 2: ('relative_change', p.Sint32Type, 0), } + + def __init__( + self, + modifications: list = [], + relative_change: int = None, + **kwargs, + ): + self.modifications = modifications + self.relative_change = relative_change + p.MessageType.__init__(self, **kwargs) diff --git a/src/trezor/messages/NEMCosignatoryModification.py b/src/trezor/messages/NEMCosignatoryModification.py index e54a26ec..3c2f18b7 100644 --- a/src/trezor/messages/NEMCosignatoryModification.py +++ b/src/trezor/messages/NEMCosignatoryModification.py @@ -7,3 +7,13 @@ class NEMCosignatoryModification(p.MessageType): 1: ('type', p.UVarintType, 0), 2: ('public_key', p.BytesType, 0), } + + def __init__( + self, + type: int = None, + public_key: bytes = None, + **kwargs, + ): + self.type = type + self.public_key = public_key + p.MessageType.__init__(self, **kwargs) diff --git a/src/trezor/messages/NEMDecryptMessage.py b/src/trezor/messages/NEMDecryptMessage.py deleted file mode 100644 index 447b3375..00000000 --- a/src/trezor/messages/NEMDecryptMessage.py +++ /dev/null @@ -1,12 +0,0 @@ -# Automatically generated by pb2py -import protobuf as p - - -class NEMDecryptMessage(p.MessageType): - FIELDS = { - 1: ('address_n', p.UVarintType, p.FLAG_REPEATED), - 2: ('network', p.UVarintType, 0), - 3: ('public_key', p.BytesType, 0), - 4: ('payload', p.BytesType, 0), - } - MESSAGE_WIRE_TYPE = 75 diff --git a/src/trezor/messages/NEMDecryptedMessage.py b/src/trezor/messages/NEMDecryptedMessage.py deleted file mode 100644 index 1ee4e3e0..00000000 --- a/src/trezor/messages/NEMDecryptedMessage.py +++ /dev/null @@ -1,9 +0,0 @@ -# Automatically generated by pb2py -import protobuf as p - - -class NEMDecryptedMessage(p.MessageType): - FIELDS = { - 1: ('payload', p.BytesType, 0), - } - MESSAGE_WIRE_TYPE = 76 diff --git a/src/trezor/messages/NEMGetAddress.py b/src/trezor/messages/NEMGetAddress.py index 86c7931a..612423a6 100644 --- a/src/trezor/messages/NEMGetAddress.py +++ b/src/trezor/messages/NEMGetAddress.py @@ -9,3 +9,15 @@ class NEMGetAddress(p.MessageType): 3: ('show_display', p.BoolType, 0), } MESSAGE_WIRE_TYPE = 67 + + def __init__( + self, + address_n: list = [], + network: int = None, + show_display: bool = None, + **kwargs, + ): + self.address_n = address_n + self.network = network + self.show_display = show_display + p.MessageType.__init__(self, **kwargs) diff --git a/src/trezor/messages/NEMImportanceTransfer.py b/src/trezor/messages/NEMImportanceTransfer.py index 85455abf..31d92e99 100644 --- a/src/trezor/messages/NEMImportanceTransfer.py +++ b/src/trezor/messages/NEMImportanceTransfer.py @@ -7,3 +7,13 @@ class NEMImportanceTransfer(p.MessageType): 1: ('mode', p.UVarintType, 0), 2: ('public_key', p.BytesType, 0), } + + def __init__( + self, + mode: int = None, + public_key: bytes = None, + **kwargs, + ): + self.mode = mode + self.public_key = public_key + p.MessageType.__init__(self, **kwargs) diff --git a/src/trezor/messages/NEMMosaic.py b/src/trezor/messages/NEMMosaic.py index b6f7b46c..5e793d9d 100644 --- a/src/trezor/messages/NEMMosaic.py +++ b/src/trezor/messages/NEMMosaic.py @@ -8,3 +8,15 @@ class NEMMosaic(p.MessageType): 2: ('mosaic', p.UnicodeType, 0), 3: ('quantity', p.UVarintType, 0), } + + def __init__( + self, + namespace: str = None, + mosaic: str = None, + quantity: int = None, + **kwargs, + ): + self.namespace = namespace + self.mosaic = mosaic + self.quantity = quantity + p.MessageType.__init__(self, **kwargs) diff --git a/src/trezor/messages/NEMMosaicCreation.py b/src/trezor/messages/NEMMosaicCreation.py index edabded7..79e4ceca 100644 --- a/src/trezor/messages/NEMMosaicCreation.py +++ b/src/trezor/messages/NEMMosaicCreation.py @@ -9,3 +9,15 @@ class NEMMosaicCreation(p.MessageType): 2: ('sink', p.UnicodeType, 0), 3: ('fee', p.UVarintType, 0), } + + def __init__( + self, + definition: NEMMosaicDefinition = None, + sink: str = None, + fee: int = None, + **kwargs, + ): + self.definition = definition + self.sink = sink + self.fee = fee + p.MessageType.__init__(self, **kwargs) diff --git a/src/trezor/messages/NEMMosaicDefinition.py b/src/trezor/messages/NEMMosaicDefinition.py index 934dc71a..a02499e5 100644 --- a/src/trezor/messages/NEMMosaicDefinition.py +++ b/src/trezor/messages/NEMMosaicDefinition.py @@ -20,3 +20,39 @@ class NEMMosaicDefinition(p.MessageType): 14: ('description', p.UnicodeType, 0), 15: ('networks', p.UVarintType, p.FLAG_REPEATED), } + + def __init__( + self, + name: str = None, + ticker: str = None, + namespace: str = None, + mosaic: str = None, + divisibility: int = None, + levy: int = None, + fee: int = None, + levy_address: str = None, + levy_namespace: str = None, + levy_mosaic: str = None, + supply: int = None, + mutable_supply: bool = None, + transferable: bool = None, + description: str = None, + networks: list = [], + **kwargs, + ): + self.name = name + self.ticker = ticker + self.namespace = namespace + self.mosaic = mosaic + self.divisibility = divisibility + self.levy = levy + self.fee = fee + self.levy_address = levy_address + self.levy_namespace = levy_namespace + self.levy_mosaic = levy_mosaic + self.supply = supply + self.mutable_supply = mutable_supply + self.transferable = transferable + self.description = description + self.networks = networks + p.MessageType.__init__(self, **kwargs) diff --git a/src/trezor/messages/NEMMosaicSupplyChange.py b/src/trezor/messages/NEMMosaicSupplyChange.py index 1546bf66..e2281611 100644 --- a/src/trezor/messages/NEMMosaicSupplyChange.py +++ b/src/trezor/messages/NEMMosaicSupplyChange.py @@ -9,3 +9,17 @@ class NEMMosaicSupplyChange(p.MessageType): 3: ('type', p.UVarintType, 0), 4: ('delta', p.UVarintType, 0), } + + def __init__( + self, + namespace: str = None, + mosaic: str = None, + type: int = None, + delta: int = None, + **kwargs, + ): + self.namespace = namespace + self.mosaic = mosaic + self.type = type + self.delta = delta + p.MessageType.__init__(self, **kwargs) diff --git a/src/trezor/messages/NEMProvisionNamespace.py b/src/trezor/messages/NEMProvisionNamespace.py index c8c7a1b0..d18bb60b 100644 --- a/src/trezor/messages/NEMProvisionNamespace.py +++ b/src/trezor/messages/NEMProvisionNamespace.py @@ -9,3 +9,17 @@ class NEMProvisionNamespace(p.MessageType): 3: ('sink', p.UnicodeType, 0), 4: ('fee', p.UVarintType, 0), } + + def __init__( + self, + namespace: str = None, + parent: str = None, + sink: str = None, + fee: int = None, + **kwargs, + ): + self.namespace = namespace + self.parent = parent + self.sink = sink + self.fee = fee + p.MessageType.__init__(self, **kwargs) diff --git a/src/trezor/messages/NEMSignTx.py b/src/trezor/messages/NEMSignTx.py index 0164a7a6..23e833e1 100644 --- a/src/trezor/messages/NEMSignTx.py +++ b/src/trezor/messages/NEMSignTx.py @@ -22,3 +22,27 @@ class NEMSignTx(p.MessageType): 9: ('importance_transfer', NEMImportanceTransfer, 0), } MESSAGE_WIRE_TYPE = 69 + + def __init__( + self, + transaction: NEMTransactionCommon = None, + multisig: NEMTransactionCommon = None, + transfer: NEMTransfer = None, + cosigning: bool = None, + provision_namespace: NEMProvisionNamespace = None, + mosaic_creation: NEMMosaicCreation = None, + supply_change: NEMMosaicSupplyChange = None, + aggregate_modification: NEMAggregateModification = None, + importance_transfer: NEMImportanceTransfer = None, + **kwargs, + ): + self.transaction = transaction + self.multisig = multisig + self.transfer = transfer + self.cosigning = cosigning + self.provision_namespace = provision_namespace + self.mosaic_creation = mosaic_creation + self.supply_change = supply_change + self.aggregate_modification = aggregate_modification + self.importance_transfer = importance_transfer + p.MessageType.__init__(self, **kwargs) diff --git a/src/trezor/messages/NEMSignedTx.py b/src/trezor/messages/NEMSignedTx.py index 7423dd75..489b4657 100644 --- a/src/trezor/messages/NEMSignedTx.py +++ b/src/trezor/messages/NEMSignedTx.py @@ -8,3 +8,13 @@ class NEMSignedTx(p.MessageType): 2: ('signature', p.BytesType, 0), } MESSAGE_WIRE_TYPE = 70 + + def __init__( + self, + data: bytes = None, + signature: bytes = None, + **kwargs, + ): + self.data = data + self.signature = signature + p.MessageType.__init__(self, **kwargs) diff --git a/src/trezor/messages/NEMTransactionCommon.py b/src/trezor/messages/NEMTransactionCommon.py index fb3217a8..1d6622ad 100644 --- a/src/trezor/messages/NEMTransactionCommon.py +++ b/src/trezor/messages/NEMTransactionCommon.py @@ -11,3 +11,21 @@ class NEMTransactionCommon(p.MessageType): 5: ('deadline', p.UVarintType, 0), 6: ('signer', p.BytesType, 0), } + + def __init__( + self, + address_n: list = [], + network: int = None, + timestamp: int = None, + fee: int = None, + deadline: int = None, + signer: bytes = None, + **kwargs, + ): + self.address_n = address_n + self.network = network + self.timestamp = timestamp + self.fee = fee + self.deadline = deadline + self.signer = signer + p.MessageType.__init__(self, **kwargs) diff --git a/src/trezor/messages/NEMTransfer.py b/src/trezor/messages/NEMTransfer.py index eba2b9db..d019f9ae 100644 --- a/src/trezor/messages/NEMTransfer.py +++ b/src/trezor/messages/NEMTransfer.py @@ -11,3 +11,19 @@ class NEMTransfer(p.MessageType): 4: ('public_key', p.BytesType, 0), 5: ('mosaics', NEMMosaic, p.FLAG_REPEATED), } + + def __init__( + self, + recipient: str = None, + amount: int = None, + payload: bytes = None, + public_key: bytes = None, + mosaics: list = [], + **kwargs, + ): + self.recipient = recipient + self.amount = amount + self.payload = payload + self.public_key = public_key + self.mosaics = mosaics + p.MessageType.__init__(self, **kwargs) diff --git a/src/trezor/messages/PassphraseAck.py b/src/trezor/messages/PassphraseAck.py index 3e865a04..d8adf5f2 100644 --- a/src/trezor/messages/PassphraseAck.py +++ b/src/trezor/messages/PassphraseAck.py @@ -5,6 +5,13 @@ import protobuf as p class PassphraseAck(p.MessageType): FIELDS = { 1: ('passphrase', p.UnicodeType, 0), # required - 2: ('state', p.BytesType, 0), } MESSAGE_WIRE_TYPE = 42 + + def __init__( + self, + passphrase: str = None, + **kwargs, + ): + self.passphrase = passphrase + p.MessageType.__init__(self, **kwargs) diff --git a/src/trezor/messages/PassphraseRequest.py b/src/trezor/messages/PassphraseRequest.py index 63e4b52e..7e89a467 100644 --- a/src/trezor/messages/PassphraseRequest.py +++ b/src/trezor/messages/PassphraseRequest.py @@ -3,7 +3,10 @@ import protobuf as p class PassphraseRequest(p.MessageType): - FIELDS = { - 1: ('on_device', p.BoolType, 0), - } MESSAGE_WIRE_TYPE = 41 + + def __init__( + self, + **kwargs, + ): + p.MessageType.__init__(self, **kwargs) diff --git a/src/trezor/messages/PinMatrixAck.py b/src/trezor/messages/PinMatrixAck.py index 294ed5a1..29043c53 100644 --- a/src/trezor/messages/PinMatrixAck.py +++ b/src/trezor/messages/PinMatrixAck.py @@ -7,3 +7,11 @@ class PinMatrixAck(p.MessageType): 1: ('pin', p.UnicodeType, 0), # required } MESSAGE_WIRE_TYPE = 19 + + def __init__( + self, + pin: str = None, + **kwargs, + ): + self.pin = pin + p.MessageType.__init__(self, **kwargs) diff --git a/src/trezor/messages/PinMatrixRequest.py b/src/trezor/messages/PinMatrixRequest.py index 9f9c68b2..4775cb87 100644 --- a/src/trezor/messages/PinMatrixRequest.py +++ b/src/trezor/messages/PinMatrixRequest.py @@ -7,3 +7,11 @@ class PinMatrixRequest(p.MessageType): 1: ('type', p.UVarintType, 0), } MESSAGE_WIRE_TYPE = 18 + + def __init__( + self, + type: int = None, + **kwargs, + ): + self.type = type + p.MessageType.__init__(self, **kwargs) diff --git a/src/trezor/messages/Ping.py b/src/trezor/messages/Ping.py index ab40301d..51a594a1 100644 --- a/src/trezor/messages/Ping.py +++ b/src/trezor/messages/Ping.py @@ -10,3 +10,17 @@ class Ping(p.MessageType): 4: ('passphrase_protection', p.BoolType, 0), } MESSAGE_WIRE_TYPE = 1 + + def __init__( + self, + message: str = None, + button_protection: bool = None, + pin_protection: bool = None, + passphrase_protection: bool = None, + **kwargs, + ): + self.message = message + self.button_protection = button_protection + self.pin_protection = pin_protection + self.passphrase_protection = passphrase_protection + p.MessageType.__init__(self, **kwargs) diff --git a/src/trezor/messages/PublicKey.py b/src/trezor/messages/PublicKey.py index ebcc7d42..19842f22 100644 --- a/src/trezor/messages/PublicKey.py +++ b/src/trezor/messages/PublicKey.py @@ -9,3 +9,13 @@ class PublicKey(p.MessageType): 2: ('xpub', p.UnicodeType, 0), } MESSAGE_WIRE_TYPE = 12 + + def __init__( + self, + node: HDNodeType = None, + xpub: str = None, + **kwargs, + ): + self.node = node + self.xpub = xpub + p.MessageType.__init__(self, **kwargs) diff --git a/src/trezor/messages/RecoveryDevice.py b/src/trezor/messages/RecoveryDevice.py index d6c21aa5..2dfb4dd5 100644 --- a/src/trezor/messages/RecoveryDevice.py +++ b/src/trezor/messages/RecoveryDevice.py @@ -15,3 +15,27 @@ class RecoveryDevice(p.MessageType): 10: ('dry_run', p.BoolType, 0), } MESSAGE_WIRE_TYPE = 45 + + def __init__( + self, + word_count: int = None, + passphrase_protection: bool = None, + pin_protection: bool = None, + language: str = None, + label: str = None, + enforce_wordlist: bool = None, + type: int = None, + u2f_counter: int = None, + dry_run: bool = None, + **kwargs, + ): + self.word_count = word_count + self.passphrase_protection = passphrase_protection + self.pin_protection = pin_protection + self.language = language + self.label = label + self.enforce_wordlist = enforce_wordlist + self.type = type + self.u2f_counter = u2f_counter + self.dry_run = dry_run + p.MessageType.__init__(self, **kwargs) diff --git a/src/trezor/messages/ResetDevice.py b/src/trezor/messages/ResetDevice.py index 6ea628ab..e5c8cf7d 100644 --- a/src/trezor/messages/ResetDevice.py +++ b/src/trezor/messages/ResetDevice.py @@ -14,3 +14,25 @@ class ResetDevice(p.MessageType): 8: ('skip_backup', p.BoolType, 0), } MESSAGE_WIRE_TYPE = 14 + + def __init__( + self, + display_random: bool = None, + strength: int = None, + passphrase_protection: bool = None, + pin_protection: bool = None, + language: str = None, + label: str = None, + u2f_counter: int = None, + skip_backup: bool = None, + **kwargs, + ): + self.display_random = display_random + self.strength = strength + self.passphrase_protection = passphrase_protection + self.pin_protection = pin_protection + self.language = language + self.label = label + self.u2f_counter = u2f_counter + self.skip_backup = skip_backup + p.MessageType.__init__(self, **kwargs) diff --git a/src/trezor/messages/SelfTest.py b/src/trezor/messages/SelfTest.py index fbd36234..cc9d67f1 100644 --- a/src/trezor/messages/SelfTest.py +++ b/src/trezor/messages/SelfTest.py @@ -7,3 +7,11 @@ class SelfTest(p.MessageType): 1: ('payload', p.BytesType, 0), } MESSAGE_WIRE_TYPE = 32 + + def __init__( + self, + payload: bytes = None, + **kwargs, + ): + self.payload = payload + p.MessageType.__init__(self, **kwargs) diff --git a/src/trezor/messages/SetU2FCounter.py b/src/trezor/messages/SetU2FCounter.py index c2f487c6..26a5c97d 100644 --- a/src/trezor/messages/SetU2FCounter.py +++ b/src/trezor/messages/SetU2FCounter.py @@ -7,3 +7,11 @@ class SetU2FCounter(p.MessageType): 1: ('u2f_counter', p.UVarintType, 0), } MESSAGE_WIRE_TYPE = 63 + + def __init__( + self, + u2f_counter: int = None, + **kwargs, + ): + self.u2f_counter = u2f_counter + p.MessageType.__init__(self, **kwargs) diff --git a/src/trezor/messages/SignIdentity.py b/src/trezor/messages/SignIdentity.py index dbd5fafe..46b9be57 100644 --- a/src/trezor/messages/SignIdentity.py +++ b/src/trezor/messages/SignIdentity.py @@ -11,3 +11,17 @@ class SignIdentity(p.MessageType): 4: ('ecdsa_curve_name', p.UnicodeType, 0), } MESSAGE_WIRE_TYPE = 53 + + def __init__( + self, + identity: IdentityType = None, + challenge_hidden: bytes = None, + challenge_visual: str = None, + ecdsa_curve_name: str = None, + **kwargs, + ): + self.identity = identity + self.challenge_hidden = challenge_hidden + self.challenge_visual = challenge_visual + self.ecdsa_curve_name = ecdsa_curve_name + p.MessageType.__init__(self, **kwargs) diff --git a/src/trezor/messages/SignMessage.py b/src/trezor/messages/SignMessage.py index 9f238882..38569125 100644 --- a/src/trezor/messages/SignMessage.py +++ b/src/trezor/messages/SignMessage.py @@ -10,3 +10,17 @@ class SignMessage(p.MessageType): 4: ('script_type', p.UVarintType, 0), # default=0 } MESSAGE_WIRE_TYPE = 38 + + def __init__( + self, + address_n: list = [], + message: bytes = None, + coin_name: str = None, + script_type: int = None, + **kwargs, + ): + self.address_n = address_n + self.message = message + self.coin_name = coin_name + self.script_type = script_type + p.MessageType.__init__(self, **kwargs) diff --git a/src/trezor/messages/SignTx.py b/src/trezor/messages/SignTx.py index e66fe713..3ef8609e 100644 --- a/src/trezor/messages/SignTx.py +++ b/src/trezor/messages/SignTx.py @@ -9,6 +9,21 @@ class SignTx(p.MessageType): 3: ('coin_name', p.UnicodeType, 0), # default='Bitcoin' 4: ('version', p.UVarintType, 0), # default=1 5: ('lock_time', p.UVarintType, 0), # default=0 - 6: ('decred_expiry', p.UVarintType, 0), } MESSAGE_WIRE_TYPE = 15 + + def __init__( + self, + outputs_count: int = None, + inputs_count: int = None, + coin_name: str = None, + version: int = None, + lock_time: int = None, + **kwargs, + ): + self.outputs_count = outputs_count + self.inputs_count = inputs_count + self.coin_name = coin_name + self.version = version + self.lock_time = lock_time + p.MessageType.__init__(self, **kwargs) diff --git a/src/trezor/messages/SignedIdentity.py b/src/trezor/messages/SignedIdentity.py index 2c7e25c6..effc4d44 100644 --- a/src/trezor/messages/SignedIdentity.py +++ b/src/trezor/messages/SignedIdentity.py @@ -9,3 +9,15 @@ class SignedIdentity(p.MessageType): 3: ('signature', p.BytesType, 0), } MESSAGE_WIRE_TYPE = 54 + + def __init__( + self, + address: str = None, + public_key: bytes = None, + signature: bytes = None, + **kwargs, + ): + self.address = address + self.public_key = public_key + self.signature = signature + p.MessageType.__init__(self, **kwargs) diff --git a/src/trezor/messages/SimpleSignTx.py b/src/trezor/messages/SimpleSignTx.py index 62c03c8b..2bf7e6e3 100644 --- a/src/trezor/messages/SimpleSignTx.py +++ b/src/trezor/messages/SimpleSignTx.py @@ -15,3 +15,21 @@ class SimpleSignTx(p.MessageType): 6: ('lock_time', p.UVarintType, 0), # default=0 } MESSAGE_WIRE_TYPE = 16 + + def __init__( + self, + inputs: list = [], + outputs: list = [], + transactions: list = [], + coin_name: str = None, + version: int = None, + lock_time: int = None, + **kwargs, + ): + self.inputs = inputs + self.outputs = outputs + self.transactions = transactions + self.coin_name = coin_name + self.version = version + self.lock_time = lock_time + p.MessageType.__init__(self, **kwargs) diff --git a/src/trezor/messages/Success.py b/src/trezor/messages/Success.py index 9dd722ca..b81b1f6d 100644 --- a/src/trezor/messages/Success.py +++ b/src/trezor/messages/Success.py @@ -7,3 +7,11 @@ class Success(p.MessageType): 1: ('message', p.UnicodeType, 0), } MESSAGE_WIRE_TYPE = 2 + + def __init__( + self, + message: str = None, + **kwargs, + ): + self.message = message + p.MessageType.__init__(self, **kwargs) diff --git a/src/trezor/messages/TransactionType.py b/src/trezor/messages/TransactionType.py index 5167c195..2a9f398c 100644 --- a/src/trezor/messages/TransactionType.py +++ b/src/trezor/messages/TransactionType.py @@ -16,5 +16,28 @@ class TransactionType(p.MessageType): 7: ('outputs_cnt', p.UVarintType, 0), 8: ('extra_data', p.BytesType, 0), 9: ('extra_data_len', p.UVarintType, 0), - 10: ('decred_expiry', p.UVarintType, 0), } + + def __init__( + self, + version: int = None, + inputs: list = [], + bin_outputs: list = [], + lock_time: int = None, + outputs: list = [], + inputs_cnt: int = None, + outputs_cnt: int = None, + extra_data: bytes = None, + extra_data_len: int = None, + **kwargs, + ): + self.version = version + self.inputs = inputs + self.bin_outputs = bin_outputs + self.lock_time = lock_time + self.outputs = outputs + self.inputs_cnt = inputs_cnt + self.outputs_cnt = outputs_cnt + self.extra_data = extra_data + self.extra_data_len = extra_data_len + p.MessageType.__init__(self, **kwargs) diff --git a/src/trezor/messages/TxAck.py b/src/trezor/messages/TxAck.py index 9e0b7cc1..3ea27bf9 100644 --- a/src/trezor/messages/TxAck.py +++ b/src/trezor/messages/TxAck.py @@ -8,3 +8,11 @@ class TxAck(p.MessageType): 1: ('tx', TransactionType, 0), } MESSAGE_WIRE_TYPE = 22 + + def __init__( + self, + tx: TransactionType = None, + **kwargs, + ): + self.tx = tx + p.MessageType.__init__(self, **kwargs) diff --git a/src/trezor/messages/TxInputType.py b/src/trezor/messages/TxInputType.py index b3b56715..f5a0333c 100644 --- a/src/trezor/messages/TxInputType.py +++ b/src/trezor/messages/TxInputType.py @@ -13,6 +13,26 @@ class TxInputType(p.MessageType): 6: ('script_type', p.UVarintType, 0), # default=0 7: ('multisig', MultisigRedeemScriptType, 0), 8: ('amount', p.UVarintType, 0), - 9: ('decred_tree', p.UVarintType, 0), - 10: ('decred_script_version', p.UVarintType, 0), } + + def __init__( + self, + address_n: list = [], + prev_hash: bytes = None, + prev_index: int = None, + script_sig: bytes = None, + sequence: int = None, + script_type: int = None, + multisig: MultisigRedeemScriptType = None, + amount: int = None, + **kwargs, + ): + self.address_n = address_n + self.prev_hash = prev_hash + self.prev_index = prev_index + self.script_sig = script_sig + self.sequence = sequence + self.script_type = script_type + self.multisig = multisig + self.amount = amount + p.MessageType.__init__(self, **kwargs) diff --git a/src/trezor/messages/TxOutputBinType.py b/src/trezor/messages/TxOutputBinType.py index 12c63a91..4dd3cddc 100644 --- a/src/trezor/messages/TxOutputBinType.py +++ b/src/trezor/messages/TxOutputBinType.py @@ -6,5 +6,14 @@ class TxOutputBinType(p.MessageType): FIELDS = { 1: ('amount', p.UVarintType, 0), # required 2: ('script_pubkey', p.BytesType, 0), # required - 3: ('decred_script_version', p.UVarintType, 0), } + + def __init__( + self, + amount: int = None, + script_pubkey: bytes = None, + **kwargs, + ): + self.amount = amount + self.script_pubkey = script_pubkey + p.MessageType.__init__(self, **kwargs) diff --git a/src/trezor/messages/TxOutputType.py b/src/trezor/messages/TxOutputType.py index bfd3fa47..837b98ca 100644 --- a/src/trezor/messages/TxOutputType.py +++ b/src/trezor/messages/TxOutputType.py @@ -11,5 +11,22 @@ class TxOutputType(p.MessageType): 4: ('script_type', p.UVarintType, 0), # required 5: ('multisig', MultisigRedeemScriptType, 0), 6: ('op_return_data', p.BytesType, 0), - 7: ('decred_script_version', p.UVarintType, 0), } + + def __init__( + self, + address: str = None, + address_n: list = [], + amount: int = None, + script_type: int = None, + multisig: MultisigRedeemScriptType = None, + op_return_data: bytes = None, + **kwargs, + ): + self.address = address + self.address_n = address_n + self.amount = amount + self.script_type = script_type + self.multisig = multisig + self.op_return_data = op_return_data + p.MessageType.__init__(self, **kwargs) diff --git a/src/trezor/messages/TxRequest.py b/src/trezor/messages/TxRequest.py index ac9fd784..8409d1bf 100644 --- a/src/trezor/messages/TxRequest.py +++ b/src/trezor/messages/TxRequest.py @@ -11,3 +11,15 @@ class TxRequest(p.MessageType): 3: ('serialized', TxRequestSerializedType, 0), } MESSAGE_WIRE_TYPE = 21 + + def __init__( + self, + request_type: int = None, + details: TxRequestDetailsType = None, + serialized: TxRequestSerializedType = None, + **kwargs, + ): + self.request_type = request_type + self.details = details + self.serialized = serialized + p.MessageType.__init__(self, **kwargs) diff --git a/src/trezor/messages/TxRequestDetailsType.py b/src/trezor/messages/TxRequestDetailsType.py index 7057e466..1755dff3 100644 --- a/src/trezor/messages/TxRequestDetailsType.py +++ b/src/trezor/messages/TxRequestDetailsType.py @@ -9,3 +9,17 @@ class TxRequestDetailsType(p.MessageType): 3: ('extra_data_len', p.UVarintType, 0), 4: ('extra_data_offset', p.UVarintType, 0), } + + def __init__( + self, + request_index: int = None, + tx_hash: bytes = None, + extra_data_len: int = None, + extra_data_offset: int = None, + **kwargs, + ): + self.request_index = request_index + self.tx_hash = tx_hash + self.extra_data_len = extra_data_len + self.extra_data_offset = extra_data_offset + p.MessageType.__init__(self, **kwargs) diff --git a/src/trezor/messages/TxRequestSerializedType.py b/src/trezor/messages/TxRequestSerializedType.py index 32f7b78c..61bf936a 100644 --- a/src/trezor/messages/TxRequestSerializedType.py +++ b/src/trezor/messages/TxRequestSerializedType.py @@ -8,3 +8,15 @@ class TxRequestSerializedType(p.MessageType): 2: ('signature', p.BytesType, 0), 3: ('serialized_tx', p.BytesType, 0), } + + def __init__( + self, + signature_index: int = None, + signature: bytes = None, + serialized_tx: bytes = None, + **kwargs, + ): + self.signature_index = signature_index + self.signature = signature + self.serialized_tx = serialized_tx + p.MessageType.__init__(self, **kwargs) diff --git a/src/trezor/messages/TxSize.py b/src/trezor/messages/TxSize.py index 272954b1..b2fd88b4 100644 --- a/src/trezor/messages/TxSize.py +++ b/src/trezor/messages/TxSize.py @@ -7,3 +7,11 @@ class TxSize(p.MessageType): 1: ('tx_size', p.UVarintType, 0), } MESSAGE_WIRE_TYPE = 44 + + def __init__( + self, + tx_size: int = None, + **kwargs, + ): + self.tx_size = tx_size + p.MessageType.__init__(self, **kwargs) diff --git a/src/trezor/messages/VerifyMessage.py b/src/trezor/messages/VerifyMessage.py index 88428aee..2a13075a 100644 --- a/src/trezor/messages/VerifyMessage.py +++ b/src/trezor/messages/VerifyMessage.py @@ -10,3 +10,17 @@ class VerifyMessage(p.MessageType): 4: ('coin_name', p.UnicodeType, 0), # default='Bitcoin' } MESSAGE_WIRE_TYPE = 39 + + def __init__( + self, + address: str = None, + signature: bytes = None, + message: bytes = None, + coin_name: str = None, + **kwargs, + ): + self.address = address + self.signature = signature + self.message = message + self.coin_name = coin_name + p.MessageType.__init__(self, **kwargs) diff --git a/src/trezor/messages/WipeDevice.py b/src/trezor/messages/WipeDevice.py index 483fd6d2..830dcac4 100644 --- a/src/trezor/messages/WipeDevice.py +++ b/src/trezor/messages/WipeDevice.py @@ -4,3 +4,9 @@ import protobuf as p class WipeDevice(p.MessageType): MESSAGE_WIRE_TYPE = 5 + + def __init__( + self, + **kwargs, + ): + p.MessageType.__init__(self, **kwargs) diff --git a/src/trezor/messages/WordAck.py b/src/trezor/messages/WordAck.py index 8f9b8ac9..3e364a5b 100644 --- a/src/trezor/messages/WordAck.py +++ b/src/trezor/messages/WordAck.py @@ -7,3 +7,11 @@ class WordAck(p.MessageType): 1: ('word', p.UnicodeType, 0), # required } MESSAGE_WIRE_TYPE = 47 + + def __init__( + self, + word: str = None, + **kwargs, + ): + self.word = word + p.MessageType.__init__(self, **kwargs) diff --git a/src/trezor/messages/WordRequest.py b/src/trezor/messages/WordRequest.py index 71547325..12c67125 100644 --- a/src/trezor/messages/WordRequest.py +++ b/src/trezor/messages/WordRequest.py @@ -7,3 +7,11 @@ class WordRequest(p.MessageType): 1: ('type', p.UVarintType, 0), } MESSAGE_WIRE_TYPE = 46 + + def __init__( + self, + type: int = None, + **kwargs, + ): + self.type = type + p.MessageType.__init__(self, **kwargs) diff --git a/src/trezor/messages/wire_types.py b/src/trezor/messages/wire_types.py index 11ae6e11..ceec1509 100644 --- a/src/trezor/messages/wire_types.py +++ b/src/trezor/messages/wire_types.py @@ -56,8 +56,6 @@ Initialize = const(0) LoadDevice = const(13) MessageSignature = const(40) NEMAddress = const(68) -NEMDecryptMessage = const(75) -NEMDecryptedMessage = const(76) NEMGetAddress = const(67) NEMSignTx = const(69) NEMSignedTx = const(70) diff --git a/tools/build_protobuf b/tools/build_protobuf index e375ad81..9d0cd603 100755 --- a/tools/build_protobuf +++ b/tools/build_protobuf @@ -4,6 +4,8 @@ PB2DIR=$CURDIR/pb2 OUTDIR=../src/trezor/messages INDEX=$OUTDIR/wire_types.py +set -x + rm -f $OUTDIR/[A-Z]*.py mkdir -p $OUTDIR mkdir -p $PB2DIR @@ -21,7 +23,7 @@ for i in types messages ; do done # hack to make output python 3 compatible -sed -i 's/^import types_pb2/from . import types_pb2/g' $CURDIR/pb2/messages_pb2.py +sed -i '' 's/^import types_pb2/from . import types_pb2/g' $CURDIR/pb2/messages_pb2.py for i in types messages ; do # Convert google protobuf library to trezor's internal format diff --git a/tools/pb2py b/tools/pb2py index 50d7cebc..7825d9e2 100755 --- a/tools/pb2py +++ b/tools/pb2py @@ -14,6 +14,8 @@ def process_type(t, cls, msg_id, indexfile, is_upy): imports = [] out = ["", "", "class %s(p.MessageType):" % t, ] + args = [] + assigns = [] if cls.DESCRIPTOR.fields_by_name: out.append(" FIELDS = {") @@ -34,30 +36,37 @@ def process_type(t, cls, msg_id, indexfile, is_upy): # TYPE_UINT32 = 13 # TYPE_ENUM = 14 type = 'p.UVarintType' + pytype = 'int' elif v.type in (17,): # TYPE_SINT32 = 17 type = 'p.Sint32Type' + pytype = 'int' elif v.type in (18,): # TYPE_SINT64 = 18 type = 'p.Sint64Type' + pytype = 'int' elif v.type == 9: # TYPE_STRING = 9 type = 'p.UnicodeType' + pytype = 'str' elif v.type == 8: # TYPE_BOOL = 8 type = 'p.BoolType' + pytype = 'bool' elif v.type == 12: # TYPE_BYTES = 12 type = 'p.BytesType' + pytype = 'bytes' elif v.type == 11: # TYPE_MESSAGE = 1 type = v.message_type.name + pytype = v.message_type.name imports.append("from .%s import %s" % (v.message_type.name, v.message_type.name)) @@ -74,12 +83,19 @@ def process_type(t, cls, msg_id, indexfile, is_upy): if repeated: flags = 'p.FLAG_REPEATED' + pytype = "list" + value = [] else: flags = '0' + value = None out.append(" %d: ('%s', %s, %s),%s" % (number, fieldname, type, flags, comment)) + args.append(" %s: %s = %s," % (fieldname, pytype, value)) + + assigns.append(" self.%s = %s" % (fieldname, fieldname)) + # print fieldname, number, type, repeated, comment # print v.__dict__ # print v.CPPTYPE_STRING @@ -109,7 +125,12 @@ def process_type(t, cls, msg_id, indexfile, is_upy): imports = ['from __future__ import absolute_import', 'from .. import protobuf as p'] + imports - return imports + out + args.append(" **kwargs,") + assigns.append(" p.MessageType.__init__(self, **kwargs)") + + init = ["", " def __init__(", " self,"] + args + [" ):"] + assigns + + return imports + out + init def process_enum(t, cls, is_upy):