From a1cc761129639fed50366b2e250ad3ee48cfea68 Mon Sep 17 00:00:00 2001 From: Martin Milata Date: Tue, 24 Jun 2025 00:14:40 +0200 Subject: [PATCH] fixup! refactor(common/protob): split ThpMessageType off MessageType --- common/protob/messages-thp.proto | 42 ++++++++++++------------- core/embed/upymod/qstrdefsport.h | 2 -- core/src/trezor/enums/ThpMessageType.py | 25 +++++++++++++++ 3 files changed, 46 insertions(+), 23 deletions(-) create mode 100644 core/src/trezor/enums/ThpMessageType.py diff --git a/common/protob/messages-thp.proto b/common/protob/messages-thp.proto index 2e21589afa..63f7273a8f 100644 --- a/common/protob/messages-thp.proto +++ b/common/protob/messages-thp.proto @@ -16,28 +16,28 @@ option (include_in_bitcoin_only) = true; enum ThpMessageType { reserved 0 to 999; // Values reserved by other messages, see messages.proto - ThpMessageType_ThpCreateNewSession = 1000 [(bitcoin_only) = true, (wire_in) = true]; + ThpMessageType_ThpCreateNewSession = 1000; reserved 1001 to 1005; // never appeared in a release, reserved for future use - ThpMessageType_ThpPairingRequest = 1006 [(bitcoin_only) = true]; - ThpMessageType_ThpPairingRequestApproved = 1007 [(bitcoin_only) = true]; - ThpMessageType_ThpSelectMethod = 1008 [(bitcoin_only) = true]; - ThpMessageType_ThpPairingPreparationsFinished = 1009 [(bitcoin_only) = true]; - ThpMessageType_ThpCredentialRequest = 1010 [(bitcoin_only) = true]; - ThpMessageType_ThpCredentialResponse = 1011 [(bitcoin_only) = true]; - ThpMessageType_ThpEndRequest = 1012 [(bitcoin_only) = true]; - ThpMessageType_ThpEndResponse = 1013 [(bitcoin_only) = true]; - reserved 1014 to 1015; - ThpMessageType_ThpCodeEntryCommitment = 1016 [(bitcoin_only) = true]; - ThpMessageType_ThpCodeEntryChallenge = 1017 [(bitcoin_only) = true]; - ThpMessageType_ThpCodeEntryCpaceTrezor = 1018 [(bitcoin_only) = true]; - ThpMessageType_ThpCodeEntryCpaceHostTag = 1019 [(bitcoin_only) = true]; - ThpMessageType_ThpCodeEntrySecret = 1020 [(bitcoin_only) = true]; - reserved 1021 to 1023; - ThpMessageType_ThpQrCodeTag = 1024 [(bitcoin_only) = true]; - ThpMessageType_ThpQrCodeSecret = 1025 [(bitcoin_only) = true]; - reserved 1026 to 1031; - ThpMessageType_ThpNfcTagHost = 1032 [(bitcoin_only) = true]; - ThpMessageType_ThpNfcTagTrezor = 1033 [(bitcoin_only) = true]; + ThpMessageType_ThpPairingRequest = 1006; + ThpMessageType_ThpPairingRequestApproved = 1007; + ThpMessageType_ThpSelectMethod = 1008; + ThpMessageType_ThpPairingPreparationsFinished = 1009; + ThpMessageType_ThpCredentialRequest = 1010; + ThpMessageType_ThpCredentialResponse = 1011; + ThpMessageType_ThpEndRequest = 1012; + ThpMessageType_ThpEndResponse = 1013; + reserved 1014 to 1015; // reserved for future use + ThpMessageType_ThpCodeEntryCommitment = 1016; + ThpMessageType_ThpCodeEntryChallenge = 1017; + ThpMessageType_ThpCodeEntryCpaceTrezor = 1018; + ThpMessageType_ThpCodeEntryCpaceHostTag = 1019; + ThpMessageType_ThpCodeEntrySecret = 1020; + reserved 1021 to 1023; // reserved for future use + ThpMessageType_ThpQrCodeTag = 1024; + ThpMessageType_ThpQrCodeSecret = 1025; + reserved 1026 to 1031; // reserved for future use + ThpMessageType_ThpNfcTagHost = 1032; + ThpMessageType_ThpNfcTagTrezor = 1033; reserved 1100 to 2147483647; // Values reserved by other messages, see messages.proto } diff --git a/core/embed/upymod/qstrdefsport.h b/core/embed/upymod/qstrdefsport.h index 014b3dca5f..52df6091c6 100644 --- a/core/embed/upymod/qstrdefsport.h +++ b/core/embed/upymod/qstrdefsport.h @@ -386,13 +386,11 @@ Q(workflow_handlers) Q(writers) #if USE_THP -Q(ThpMessageType) Q(ThpPairingMethod) Q(apps.thp) Q(apps.thp.credential_manager) Q(credential_manager) Q(thp) -Q(trezor.enums.ThpMessageType) Q(trezor.enums.ThpPairingMethod) #endif diff --git a/core/src/trezor/enums/ThpMessageType.py b/core/src/trezor/enums/ThpMessageType.py new file mode 100644 index 0000000000..7caed046fd --- /dev/null +++ b/core/src/trezor/enums/ThpMessageType.py @@ -0,0 +1,25 @@ +# Automatically generated by pb2py +# fmt: off +# isort:skip_file + +from trezor import utils + +if utils.USE_THP: + ThpCreateNewSession = 1000 + ThpPairingRequest = 1006 + ThpPairingRequestApproved = 1007 + ThpSelectMethod = 1008 + ThpPairingPreparationsFinished = 1009 + ThpCredentialRequest = 1010 + ThpCredentialResponse = 1011 + ThpEndRequest = 1012 + ThpEndResponse = 1013 + ThpCodeEntryCommitment = 1016 + ThpCodeEntryChallenge = 1017 + ThpCodeEntryCpaceTrezor = 1018 + ThpCodeEntryCpaceHostTag = 1019 + ThpCodeEntrySecret = 1020 + ThpQrCodeTag = 1024 + ThpQrCodeSecret = 1025 + ThpNfcTagHost = 1032 + ThpNfcTagTrezor = 1033