From 2081831cf3b444e2e89414bec3d54b59dfa01d19 Mon Sep 17 00:00:00 2001 From: obrusvit Date: Mon, 26 Feb 2024 11:21:59 +0100 Subject: [PATCH] fixup! chore(core): remove CoSi functionality --- common/protob/messages.proto | 2 + .../src/protos/generated/messages.rs | 48 +++++++++---------- 2 files changed, 26 insertions(+), 24 deletions(-) diff --git a/common/protob/messages.proto b/common/protob/messages.proto index c471a168e..5eab66f45 100644 --- a/common/protob/messages.proto +++ b/common/protob/messages.proto @@ -168,6 +168,8 @@ enum MessageType { MessageType_SignedIdentity = 54 [(bitcoin_only) = true, (wire_out) = true]; MessageType_GetECDHSessionKey = 61 [(bitcoin_only) = true, (wire_in) = true]; MessageType_ECDHSessionKey = 62 [(bitcoin_only) = true, (wire_out) = true]; + // dropped: CosiCommit, CosiCommitment, CosiSign, CosiSignature + reserved 71 to 74; // Debug MessageType_DebugLinkDecision = 100 [(bitcoin_only) = true, (wire_debug_in) = true, (wire_tiny) = true, (wire_no_fsm) = true]; diff --git a/rust/trezor-client/src/protos/generated/messages.rs b/rust/trezor-client/src/protos/generated/messages.rs index 66a4215b3..5fd2607f2 100644 --- a/rust/trezor-client/src/protos/generated/messages.rs +++ b/rust/trezor-client/src/protos/generated/messages.rs @@ -1544,7 +1544,7 @@ pub mod exts { static file_descriptor_proto_data: &'static [u8] = b"\ \n\x0emessages.proto\x12\x12hw.trezor.messages\x1a\x20google/protobuf/de\ - scriptor.proto*\xfdR\n\x0bMessageType\x12(\n\x16MessageType_Initialize\ + scriptor.proto*\x83S\n\x0bMessageType\x12(\n\x16MessageType_Initialize\ \x10\0\x1a\x0c\x80\xa6\x1d\x01\xb0\xb5\x18\x01\x90\xb5\x18\x01\x12\x1e\n\ \x10MessageType_Ping\x10\x01\x1a\x08\x80\xa6\x1d\x01\x90\xb5\x18\x01\x12\ %\n\x13MessageType_Success\x10\x02\x1a\x0c\x80\xa6\x1d\x01\xa8\xb5\x18\ @@ -1815,29 +1815,29 @@ static file_descriptor_proto_data: &'static [u8] = b"\ anaAddress\x10\x87\x07\x1a\x04\x98\xb5\x18\x01\x12#\n\x18MessageType_Sol\ anaSignTx\x10\x88\x07\x1a\x04\x90\xb5\x18\x01\x12(\n\x1dMessageType_Sola\ naTxSignature\x10\x89\x07\x1a\x04\x98\xb5\x18\x01\x1a\x04\xc8\xf3\x18\ - \x01\"\x04\x08Z\x10\\\"\x04\x08r\x10z\"\x06\x08\xdb\x01\x10\xdb\x01\"\ - \x06\x08\xe0\x01\x10\xe0\x01\"\x06\x08\xac\x02\x10\xb0\x02\"\x06\x08\xb5\ - \x02\x10\xb8\x02:<\n\x07wire_in\x18\xd2\x86\x03\x20\x01(\x08\x12!.google\ - .protobuf.EnumValueOptionsR\x06wireIn:>\n\x08wire_out\x18\xd3\x86\x03\ - \x20\x01(\x08\x12!.google.protobuf.EnumValueOptionsR\x07wireOut:G\n\rwir\ - e_debug_in\x18\xd4\x86\x03\x20\x01(\x08\x12!.google.protobuf.EnumValueOp\ - tionsR\x0bwireDebugIn:I\n\x0ewire_debug_out\x18\xd5\x86\x03\x20\x01(\x08\ - \x12!.google.protobuf.EnumValueOptionsR\x0cwireDebugOut:@\n\twire_tiny\ - \x18\xd6\x86\x03\x20\x01(\x08\x12!.google.protobuf.EnumValueOptionsR\x08\ - wireTiny:L\n\x0fwire_bootloader\x18\xd7\x86\x03\x20\x01(\x08\x12!.google\ - .protobuf.EnumValueOptionsR\x0ewireBootloader:C\n\x0bwire_no_fsm\x18\xd8\ - \x86\x03\x20\x01(\x08\x12!.google.protobuf.EnumValueOptionsR\twireNoFsm:\ - F\n\x0cbitcoin_only\x18\xe0\xd4\x03\x20\x01(\x08\x12!.google.protobuf.En\ - umValueOptionsR\x0bbitcoinOnly:U\n\x17has_bitcoin_only_values\x18\xb9\ - \x8e\x03\x20\x01(\x08\x12\x1c.google.protobuf.EnumOptionsR\x14hasBitcoin\ - OnlyValues:T\n\x14experimental_message\x18\xa1\x96\x03\x20\x01(\x08\x12\ - \x1f.google.protobuf.MessageOptionsR\x13experimentalMessage:>\n\twire_ty\ - pe\x18\xa2\x96\x03\x20\x01(\r\x12\x1f.google.protobuf.MessageOptionsR\ - \x08wireType:N\n\x12experimental_field\x18\x89\x9e\x03\x20\x01(\x08\x12\ - \x1d.google.protobuf.FieldOptionsR\x11experimentalField:U\n\x17include_i\ - n_bitcoin_only\x18\xe0\xd4\x03\x20\x01(\x08\x12\x1c.google.protobuf.File\ - OptionsR\x14includeInBitcoinOnlyB8\n#com.satoshilabs.trezor.lib.protobuf\ - B\rTrezorMessage\x80\xa6\x1d\x01\ + \x01\"\x04\x08Z\x10\\\"\x04\x08G\x10J\"\x04\x08r\x10z\"\x06\x08\xdb\x01\ + \x10\xdb\x01\"\x06\x08\xe0\x01\x10\xe0\x01\"\x06\x08\xac\x02\x10\xb0\x02\ + \"\x06\x08\xb5\x02\x10\xb8\x02:<\n\x07wire_in\x18\xd2\x86\x03\x20\x01(\ + \x08\x12!.google.protobuf.EnumValueOptionsR\x06wireIn:>\n\x08wire_out\ + \x18\xd3\x86\x03\x20\x01(\x08\x12!.google.protobuf.EnumValueOptionsR\x07\ + wireOut:G\n\rwire_debug_in\x18\xd4\x86\x03\x20\x01(\x08\x12!.google.prot\ + obuf.EnumValueOptionsR\x0bwireDebugIn:I\n\x0ewire_debug_out\x18\xd5\x86\ + \x03\x20\x01(\x08\x12!.google.protobuf.EnumValueOptionsR\x0cwireDebugOut\ + :@\n\twire_tiny\x18\xd6\x86\x03\x20\x01(\x08\x12!.google.protobuf.EnumVa\ + lueOptionsR\x08wireTiny:L\n\x0fwire_bootloader\x18\xd7\x86\x03\x20\x01(\ + \x08\x12!.google.protobuf.EnumValueOptionsR\x0ewireBootloader:C\n\x0bwir\ + e_no_fsm\x18\xd8\x86\x03\x20\x01(\x08\x12!.google.protobuf.EnumValueOpti\ + onsR\twireNoFsm:F\n\x0cbitcoin_only\x18\xe0\xd4\x03\x20\x01(\x08\x12!.go\ + ogle.protobuf.EnumValueOptionsR\x0bbitcoinOnly:U\n\x17has_bitcoin_only_v\ + alues\x18\xb9\x8e\x03\x20\x01(\x08\x12\x1c.google.protobuf.EnumOptionsR\ + \x14hasBitcoinOnlyValues:T\n\x14experimental_message\x18\xa1\x96\x03\x20\ + \x01(\x08\x12\x1f.google.protobuf.MessageOptionsR\x13experimentalMessage\ + :>\n\twire_type\x18\xa2\x96\x03\x20\x01(\r\x12\x1f.google.protobuf.Messa\ + geOptionsR\x08wireType:N\n\x12experimental_field\x18\x89\x9e\x03\x20\x01\ + (\x08\x12\x1d.google.protobuf.FieldOptionsR\x11experimentalField:U\n\x17\ + include_in_bitcoin_only\x18\xe0\xd4\x03\x20\x01(\x08\x12\x1c.google.prot\ + obuf.FileOptionsR\x14includeInBitcoinOnlyB8\n#com.satoshilabs.trezor.lib\ + .protobufB\rTrezorMessage\x80\xa6\x1d\x01\ "; /// `FileDescriptorProto` object which was a source for this generated file