From ca6f699526e22489af906872bf3f12443afda7c5 Mon Sep 17 00:00:00 2001 From: M1nd3r Date: Mon, 27 Jan 2025 14:40:21 +0100 Subject: [PATCH] fixup! temp: update pairing process, part 1 --- common/protob/messages-thp.proto | 2 +- core/src/trezor/enums/ThpMessageType.py | 2 +- core/src/trezor/enums/__init__.py | 2 +- python/src/trezorlib/messages.py | 4 +- .../src/protos/generated/messages_thp.rs | 58 +++++++++---------- 5 files changed, 34 insertions(+), 34 deletions(-) diff --git a/common/protob/messages-thp.proto b/common/protob/messages-thp.proto index 36e882dcc0..4977c18c5c 100644 --- a/common/protob/messages-thp.proto +++ b/common/protob/messages-thp.proto @@ -17,7 +17,7 @@ enum ThpMessageType { ThpMessageType_ThpCreateNewSession = 1000 [(bitcoin_only)=true]; ThpMessageType_ThpPairingRequest = 1006 [(bitcoin_only) = true]; - ThpMessageType_ThpPairingRequestAck = 1007 [(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]; diff --git a/core/src/trezor/enums/ThpMessageType.py b/core/src/trezor/enums/ThpMessageType.py index 77a4e9d652..3ca4a27c35 100644 --- a/core/src/trezor/enums/ThpMessageType.py +++ b/core/src/trezor/enums/ThpMessageType.py @@ -4,7 +4,7 @@ ThpCreateNewSession = 1000 ThpPairingRequest = 1006 -ThpPairingRequestAck = 1007 +ThpPairingRequestApproved = 1007 ThpSelectMethod = 1008 ThpPairingPreparationsFinished = 1009 ThpCredentialRequest = 1010 diff --git a/core/src/trezor/enums/__init__.py b/core/src/trezor/enums/__init__.py index 7809bea849..414f9ad2db 100644 --- a/core/src/trezor/enums/__init__.py +++ b/core/src/trezor/enums/__init__.py @@ -354,7 +354,7 @@ if TYPE_CHECKING: class ThpMessageType(IntEnum): ThpCreateNewSession = 1000 ThpPairingRequest = 1006 - ThpPairingRequestAck = 1007 + ThpPairingRequestApproved = 1007 ThpSelectMethod = 1008 ThpPairingPreparationsFinished = 1009 ThpCredentialRequest = 1010 diff --git a/python/src/trezorlib/messages.py b/python/src/trezorlib/messages.py index 66db8799e8..c2d376f30f 100644 --- a/python/src/trezorlib/messages.py +++ b/python/src/trezorlib/messages.py @@ -407,7 +407,7 @@ class TezosBallotType(IntEnum): class ThpMessageType(IntEnum): ThpCreateNewSession = 1000 ThpPairingRequest = 1006 - ThpPairingRequestAck = 1007 + ThpPairingRequestApproved = 1007 ThpSelectMethod = 1008 ThpPairingPreparationsFinished = 1009 ThpCredentialRequest = 1010 @@ -7979,7 +7979,7 @@ class ThpPairingRequest(protobuf.MessageType): class ThpPairingRequestAck(protobuf.MessageType): - MESSAGE_WIRE_TYPE = 1007 + MESSAGE_WIRE_TYPE = None class ThpSelectMethod(protobuf.MessageType): diff --git a/rust/trezor-client/src/protos/generated/messages_thp.rs b/rust/trezor-client/src/protos/generated/messages_thp.rs index 334a652415..7b438976e2 100644 --- a/rust/trezor-client/src/protos/generated/messages_thp.rs +++ b/rust/trezor-client/src/protos/generated/messages_thp.rs @@ -3858,8 +3858,8 @@ pub enum ThpMessageType { ThpMessageType_ThpCreateNewSession = 1000, // @@protoc_insertion_point(enum_value:hw.trezor.messages.thp.ThpMessageType.ThpMessageType_ThpPairingRequest) ThpMessageType_ThpPairingRequest = 1006, - // @@protoc_insertion_point(enum_value:hw.trezor.messages.thp.ThpMessageType.ThpMessageType_ThpPairingRequestAck) - ThpMessageType_ThpPairingRequestAck = 1007, + // @@protoc_insertion_point(enum_value:hw.trezor.messages.thp.ThpMessageType.ThpMessageType_ThpPairingRequestApproved) + ThpMessageType_ThpPairingRequestApproved = 1007, // @@protoc_insertion_point(enum_value:hw.trezor.messages.thp.ThpMessageType.ThpMessageType_ThpSelectMethod) ThpMessageType_ThpSelectMethod = 1008, // @@protoc_insertion_point(enum_value:hw.trezor.messages.thp.ThpMessageType.ThpMessageType_ThpPairingPreparationsFinished) @@ -3903,7 +3903,7 @@ impl ::protobuf::Enum for ThpMessageType { match value { 1000 => ::std::option::Option::Some(ThpMessageType::ThpMessageType_ThpCreateNewSession), 1006 => ::std::option::Option::Some(ThpMessageType::ThpMessageType_ThpPairingRequest), - 1007 => ::std::option::Option::Some(ThpMessageType::ThpMessageType_ThpPairingRequestAck), + 1007 => ::std::option::Option::Some(ThpMessageType::ThpMessageType_ThpPairingRequestApproved), 1008 => ::std::option::Option::Some(ThpMessageType::ThpMessageType_ThpSelectMethod), 1009 => ::std::option::Option::Some(ThpMessageType::ThpMessageType_ThpPairingPreparationsFinished), 1010 => ::std::option::Option::Some(ThpMessageType::ThpMessageType_ThpCredentialRequest), @@ -3927,7 +3927,7 @@ impl ::protobuf::Enum for ThpMessageType { match str { "ThpMessageType_ThpCreateNewSession" => ::std::option::Option::Some(ThpMessageType::ThpMessageType_ThpCreateNewSession), "ThpMessageType_ThpPairingRequest" => ::std::option::Option::Some(ThpMessageType::ThpMessageType_ThpPairingRequest), - "ThpMessageType_ThpPairingRequestAck" => ::std::option::Option::Some(ThpMessageType::ThpMessageType_ThpPairingRequestAck), + "ThpMessageType_ThpPairingRequestApproved" => ::std::option::Option::Some(ThpMessageType::ThpMessageType_ThpPairingRequestApproved), "ThpMessageType_ThpSelectMethod" => ::std::option::Option::Some(ThpMessageType::ThpMessageType_ThpSelectMethod), "ThpMessageType_ThpPairingPreparationsFinished" => ::std::option::Option::Some(ThpMessageType::ThpMessageType_ThpPairingPreparationsFinished), "ThpMessageType_ThpCredentialRequest" => ::std::option::Option::Some(ThpMessageType::ThpMessageType_ThpCredentialRequest), @@ -3950,7 +3950,7 @@ impl ::protobuf::Enum for ThpMessageType { const VALUES: &'static [ThpMessageType] = &[ ThpMessageType::ThpMessageType_ThpCreateNewSession, ThpMessageType::ThpMessageType_ThpPairingRequest, - ThpMessageType::ThpMessageType_ThpPairingRequestAck, + ThpMessageType::ThpMessageType_ThpPairingRequestApproved, ThpMessageType::ThpMessageType_ThpSelectMethod, ThpMessageType::ThpMessageType_ThpPairingPreparationsFinished, ThpMessageType::ThpMessageType_ThpCredentialRequest, @@ -3979,7 +3979,7 @@ impl ::protobuf::EnumFull for ThpMessageType { let index = match self { ThpMessageType::ThpMessageType_ThpCreateNewSession => 0, ThpMessageType::ThpMessageType_ThpPairingRequest => 1, - ThpMessageType::ThpMessageType_ThpPairingRequestAck => 2, + ThpMessageType::ThpMessageType_ThpPairingRequestApproved => 2, ThpMessageType::ThpMessageType_ThpSelectMethod => 3, ThpMessageType::ThpMessageType_ThpPairingPreparationsFinished => 4, ThpMessageType::ThpMessageType_ThpCredentialRequest => 5, @@ -4132,31 +4132,31 @@ static file_descriptor_proto_data: &'static [u8] = b"\ \x04\x98\xb2\x19\x01\"\xa8\x01\n\x1eThpAuthenticatedCredentialData\x12,\ \n\x12host_static_pubkey\x18\x01\x20\x01(\x0cR\x10hostStaticPubkey\x12R\ \n\rcred_metadata\x18\x02\x20\x01(\x0b2-.hw.trezor.messages.thp.ThpCrede\ - ntialMetadataR\x0ccredMetadata:\x04\x98\xb2\x19\x01*\xe6\x06\n\x0eThpMes\ + ntialMetadataR\x0ccredMetadata:\x04\x98\xb2\x19\x01*\xeb\x06\n\x0eThpMes\ sageType\x12-\n\"ThpMessageType_ThpCreateNewSession\x10\xe8\x07\x1a\x04\ \x80\xa6\x1d\x01\x12+\n\x20ThpMessageType_ThpPairingRequest\x10\xee\x07\ - \x1a\x04\x80\xa6\x1d\x01\x12.\n#ThpMessageType_ThpPairingRequestAck\x10\ - \xef\x07\x1a\x04\x80\xa6\x1d\x01\x12)\n\x1eThpMessageType_ThpSelectMetho\ - d\x10\xf0\x07\x1a\x04\x80\xa6\x1d\x01\x128\n-ThpMessageType_ThpPairingPr\ - eparationsFinished\x10\xf1\x07\x1a\x04\x80\xa6\x1d\x01\x12.\n#ThpMessage\ - Type_ThpCredentialRequest\x10\xf2\x07\x1a\x04\x80\xa6\x1d\x01\x12/\n$Thp\ - MessageType_ThpCredentialResponse\x10\xf3\x07\x1a\x04\x80\xa6\x1d\x01\ - \x12'\n\x1cThpMessageType_ThpEndRequest\x10\xf4\x07\x1a\x04\x80\xa6\x1d\ - \x01\x12(\n\x1dThpMessageType_ThpEndResponse\x10\xf5\x07\x1a\x04\x80\xa6\ - \x1d\x01\x120\n%ThpMessageType_ThpCodeEntryCommitment\x10\xf8\x07\x1a\ - \x04\x80\xa6\x1d\x01\x12/\n$ThpMessageType_ThpCodeEntryChallenge\x10\xf9\ - \x07\x1a\x04\x80\xa6\x1d\x01\x121\n&ThpMessageType_ThpCodeEntryCpaceTrez\ - or\x10\xfa\x07\x1a\x04\x80\xa6\x1d\x01\x122\n'ThpMessageType_ThpCodeEntr\ - yCpaceHostTag\x10\xfb\x07\x1a\x04\x80\xa6\x1d\x01\x12,\n!ThpMessageType_\ - ThpCodeEntrySecret\x10\xfc\x07\x1a\x04\x80\xa6\x1d\x01\x12&\n\x1bThpMess\ - ageType_ThpQrCodeTag\x10\x80\x08\x1a\x04\x80\xa6\x1d\x01\x12)\n\x1eThpMe\ - ssageType_ThpQrCodeSecret\x10\x81\x08\x1a\x04\x80\xa6\x1d\x01\x12'\n\x1c\ - ThpMessageType_ThpNfcTagHost\x10\x88\x08\x1a\x04\x80\xa6\x1d\x01\x12)\n\ - \x1eThpMessageType_ThpNfcTagTrezor\x10\x89\x08\x1a\x04\x80\xa6\x1d\x01\"\ - \x05\x08\0\x10\xe7\x07\"\t\x08\xcc\x08\x10\xff\xff\xff\xff\x07*G\n\x10Th\ - pPairingMethod\x12\x0f\n\x0bSkipPairing\x10\x01\x12\r\n\tCodeEntry\x10\ - \x02\x12\n\n\x06QrCode\x10\x03\x12\x07\n\x03NFC\x10\x04B;\n#com.satoshil\ - abs.trezor.lib.protobufB\x10TrezorMessageThp\x80\xa6\x1d\x01\ + \x1a\x04\x80\xa6\x1d\x01\x123\n(ThpMessageType_ThpPairingRequestApproved\ + \x10\xef\x07\x1a\x04\x80\xa6\x1d\x01\x12)\n\x1eThpMessageType_ThpSelectM\ + ethod\x10\xf0\x07\x1a\x04\x80\xa6\x1d\x01\x128\n-ThpMessageType_ThpPairi\ + ngPreparationsFinished\x10\xf1\x07\x1a\x04\x80\xa6\x1d\x01\x12.\n#ThpMes\ + sageType_ThpCredentialRequest\x10\xf2\x07\x1a\x04\x80\xa6\x1d\x01\x12/\n\ + $ThpMessageType_ThpCredentialResponse\x10\xf3\x07\x1a\x04\x80\xa6\x1d\ + \x01\x12'\n\x1cThpMessageType_ThpEndRequest\x10\xf4\x07\x1a\x04\x80\xa6\ + \x1d\x01\x12(\n\x1dThpMessageType_ThpEndResponse\x10\xf5\x07\x1a\x04\x80\ + \xa6\x1d\x01\x120\n%ThpMessageType_ThpCodeEntryCommitment\x10\xf8\x07\ + \x1a\x04\x80\xa6\x1d\x01\x12/\n$ThpMessageType_ThpCodeEntryChallenge\x10\ + \xf9\x07\x1a\x04\x80\xa6\x1d\x01\x121\n&ThpMessageType_ThpCodeEntryCpace\ + Trezor\x10\xfa\x07\x1a\x04\x80\xa6\x1d\x01\x122\n'ThpMessageType_ThpCode\ + EntryCpaceHostTag\x10\xfb\x07\x1a\x04\x80\xa6\x1d\x01\x12,\n!ThpMessageT\ + ype_ThpCodeEntrySecret\x10\xfc\x07\x1a\x04\x80\xa6\x1d\x01\x12&\n\x1bThp\ + MessageType_ThpQrCodeTag\x10\x80\x08\x1a\x04\x80\xa6\x1d\x01\x12)\n\x1eT\ + hpMessageType_ThpQrCodeSecret\x10\x81\x08\x1a\x04\x80\xa6\x1d\x01\x12'\n\ + \x1cThpMessageType_ThpNfcTagHost\x10\x88\x08\x1a\x04\x80\xa6\x1d\x01\x12\ + )\n\x1eThpMessageType_ThpNfcTagTrezor\x10\x89\x08\x1a\x04\x80\xa6\x1d\ + \x01\"\x05\x08\0\x10\xe7\x07\"\t\x08\xcc\x08\x10\xff\xff\xff\xff\x07*G\n\ + \x10ThpPairingMethod\x12\x0f\n\x0bSkipPairing\x10\x01\x12\r\n\tCodeEntry\ + \x10\x02\x12\n\n\x06QrCode\x10\x03\x12\x07\n\x03NFC\x10\x04B;\n#com.sato\ + shilabs.trezor.lib.protobufB\x10TrezorMessageThp\x80\xa6\x1d\x01\ "; /// `FileDescriptorProto` object which was a source for this generated file