diff --git a/common/protob/messages-management.proto b/common/protob/messages-management.proto index 4cc079e20b..afcdec9b73 100644 --- a/common/protob/messages-management.proto +++ b/common/protob/messages-management.proto @@ -452,24 +452,27 @@ message EntropyRequest { /** * Request: Provide additional entropy for seed generation function * @next Success + * @next EntropyCheckReady */ message EntropyAck { required bytes entropy = 1; // 256 bits (32 bytes) of the host's random data } /** - * Request: Ask Trezor to reveal its internal entropy. - * @next EntropyAck + * Response: Trezor is ready for the next phase of the entropy check protocol. + * @next EntropyCheckContinue + * @next GetPublicKey */ -message ResetDeviceContinue { +message EntropyCheckReady { } /** - * Request: Last step in the entropy check protocol. Stores the generated seed. - * @start + * Request: Proceed with the next phase of the entropy check protocol. * @next Success + * @next EntropyRequest */ -message ResetDeviceFinish { +message EntropyCheckContinue { + optional bool finish = 1 [default=false]; // finish the entropy check protocol, store the seed } /** diff --git a/common/protob/messages.proto b/common/protob/messages.proto index a1ccd4d9de..ae7fdfda59 100644 --- a/common/protob/messages.proto +++ b/common/protob/messages.proto @@ -45,8 +45,8 @@ enum MessageType { MessageType_BackupDevice = 34 [(bitcoin_only) = true, (wire_in) = true]; MessageType_EntropyRequest = 35 [(bitcoin_only) = true, (wire_out) = true]; MessageType_EntropyAck = 36 [(bitcoin_only) = true, (wire_in) = true]; - MessageType_ResetDeviceContinue = 994 [(bitcoin_only) = true, (wire_in) = true]; - MessageType_ResetDeviceFinish = 995 [(bitcoin_only) = true, (wire_in) = true]; + MessageType_EntropyCheckReady = 994 [(bitcoin_only) = true, (wire_out) = true]; + MessageType_EntropyCheckContinue = 995 [(bitcoin_only) = true, (wire_in) = true]; MessageType_PassphraseRequest = 41 [(bitcoin_only) = true, (wire_out) = true]; MessageType_PassphraseAck = 42 [(bitcoin_only) = true, (wire_in) = true, (wire_tiny) = true, (wire_no_fsm) = true]; MessageType_RecoveryDevice = 45 [(bitcoin_only) = true, (wire_in) = true]; diff --git a/core/src/trezor/enums/MessageType.py b/core/src/trezor/enums/MessageType.py index 04c9eecab8..ed569795b0 100644 --- a/core/src/trezor/enums/MessageType.py +++ b/core/src/trezor/enums/MessageType.py @@ -29,8 +29,8 @@ Nonce = 33 BackupDevice = 34 EntropyRequest = 35 EntropyAck = 36 -ResetDeviceContinue = 994 -ResetDeviceFinish = 995 +EntropyCheckReady = 994 +EntropyCheckContinue = 995 PassphraseRequest = 41 PassphraseAck = 42 RecoveryDevice = 45 diff --git a/core/src/trezor/enums/__init__.py b/core/src/trezor/enums/__init__.py index 596d669223..d16c3c4a66 100644 --- a/core/src/trezor/enums/__init__.py +++ b/core/src/trezor/enums/__init__.py @@ -373,8 +373,8 @@ if TYPE_CHECKING: BackupDevice = 34 EntropyRequest = 35 EntropyAck = 36 - ResetDeviceContinue = 994 - ResetDeviceFinish = 995 + EntropyCheckReady = 994 + EntropyCheckContinue = 995 PassphraseRequest = 41 PassphraseAck = 42 RecoveryDevice = 45 diff --git a/core/src/trezor/messages.py b/core/src/trezor/messages.py index e90e05e3c0..2a3ce05125 100644 --- a/core/src/trezor/messages.py +++ b/core/src/trezor/messages.py @@ -2602,16 +2602,24 @@ if TYPE_CHECKING: def is_type_of(cls, msg: Any) -> TypeGuard["EntropyAck"]: return isinstance(msg, cls) - class ResetDeviceContinue(protobuf.MessageType): + class EntropyCheckReady(protobuf.MessageType): @classmethod - def is_type_of(cls, msg: Any) -> TypeGuard["ResetDeviceContinue"]: + def is_type_of(cls, msg: Any) -> TypeGuard["EntropyCheckReady"]: return isinstance(msg, cls) - class ResetDeviceFinish(protobuf.MessageType): + class EntropyCheckContinue(protobuf.MessageType): + finish: "bool" + + def __init__( + self, + *, + finish: "bool | None" = None, + ) -> None: + pass @classmethod - def is_type_of(cls, msg: Any) -> TypeGuard["ResetDeviceFinish"]: + def is_type_of(cls, msg: Any) -> TypeGuard["EntropyCheckContinue"]: return isinstance(msg, cls) class RecoveryDevice(protobuf.MessageType): diff --git a/legacy/firmware/protob/Makefile b/legacy/firmware/protob/Makefile index 19de54895f..48dbd5ddc7 100644 --- a/legacy/firmware/protob/Makefile +++ b/legacy/firmware/protob/Makefile @@ -11,7 +11,7 @@ SKIPPED_MESSAGES := Binance Cardano DebugMonero Eos Monero Ontology Ripple SdPro UnlockBootloader AuthenticateDevice AuthenticityProof \ Solana StellarClaimClaimableBalanceOp \ ChangeLanguage TranslationDataRequest TranslationDataAck \ - SetBrightness DebugLinkOptigaSetSecMax ResetDeviceContinue GResetDeviceFinish \ + SetBrightness DebugLinkOptigaSetSecMax EntropyCheckReady EntropyCheckContinue \ BenchmarkListNames BenchmarkRun BenchmarkNames BenchmarkResult ifeq ($(BITCOIN_ONLY), 1) diff --git a/python/src/trezorlib/messages.py b/python/src/trezorlib/messages.py index 4ac889ba40..06a36af68b 100644 --- a/python/src/trezorlib/messages.py +++ b/python/src/trezorlib/messages.py @@ -426,8 +426,8 @@ class MessageType(IntEnum): BackupDevice = 34 EntropyRequest = 35 EntropyAck = 36 - ResetDeviceContinue = 994 - ResetDeviceFinish = 995 + EntropyCheckReady = 994 + EntropyCheckContinue = 995 PassphraseRequest = 41 PassphraseAck = 42 RecoveryDevice = 45 @@ -3814,12 +3814,22 @@ class EntropyAck(protobuf.MessageType): self.entropy = entropy -class ResetDeviceContinue(protobuf.MessageType): +class EntropyCheckReady(protobuf.MessageType): MESSAGE_WIRE_TYPE = 994 -class ResetDeviceFinish(protobuf.MessageType): +class EntropyCheckContinue(protobuf.MessageType): MESSAGE_WIRE_TYPE = 995 + FIELDS = { + 1: protobuf.Field("finish", "bool", repeated=False, required=False, default=False), + } + + def __init__( + self, + *, + finish: Optional["bool"] = False, + ) -> None: + self.finish = finish class RecoveryDevice(protobuf.MessageType): diff --git a/rust/trezor-client/src/messages/generated.rs b/rust/trezor-client/src/messages/generated.rs index abbe1e82b4..551a1e92e2 100644 --- a/rust/trezor-client/src/messages/generated.rs +++ b/rust/trezor-client/src/messages/generated.rs @@ -24,8 +24,8 @@ trezor_message_impl! { BackupDevice => MessageType_BackupDevice, EntropyRequest => MessageType_EntropyRequest, EntropyAck => MessageType_EntropyAck, - ResetDeviceContinue => MessageType_ResetDeviceContinue, - ResetDeviceFinish => MessageType_ResetDeviceFinish, + EntropyCheckReady => MessageType_EntropyCheckReady, + EntropyCheckContinue => MessageType_EntropyCheckContinue, PassphraseRequest => MessageType_PassphraseRequest, PassphraseAck => MessageType_PassphraseAck, RecoveryDevice => MessageType_RecoveryDevice, diff --git a/rust/trezor-client/src/protos/generated/messages.rs b/rust/trezor-client/src/protos/generated/messages.rs index 643b4a7763..0a265410a6 100644 --- a/rust/trezor-client/src/protos/generated/messages.rs +++ b/rust/trezor-client/src/protos/generated/messages.rs @@ -78,10 +78,10 @@ pub enum MessageType { MessageType_EntropyRequest = 35, // @@protoc_insertion_point(enum_value:hw.trezor.messages.MessageType.MessageType_EntropyAck) MessageType_EntropyAck = 36, - // @@protoc_insertion_point(enum_value:hw.trezor.messages.MessageType.MessageType_ResetDeviceContinue) - MessageType_ResetDeviceContinue = 994, - // @@protoc_insertion_point(enum_value:hw.trezor.messages.MessageType.MessageType_ResetDeviceFinish) - MessageType_ResetDeviceFinish = 995, + // @@protoc_insertion_point(enum_value:hw.trezor.messages.MessageType.MessageType_EntropyCheckReady) + MessageType_EntropyCheckReady = 994, + // @@protoc_insertion_point(enum_value:hw.trezor.messages.MessageType.MessageType_EntropyCheckContinue) + MessageType_EntropyCheckContinue = 995, // @@protoc_insertion_point(enum_value:hw.trezor.messages.MessageType.MessageType_PassphraseRequest) MessageType_PassphraseRequest = 41, // @@protoc_insertion_point(enum_value:hw.trezor.messages.MessageType.MessageType_PassphraseAck) @@ -558,8 +558,8 @@ impl ::protobuf::Enum for MessageType { 34 => ::std::option::Option::Some(MessageType::MessageType_BackupDevice), 35 => ::std::option::Option::Some(MessageType::MessageType_EntropyRequest), 36 => ::std::option::Option::Some(MessageType::MessageType_EntropyAck), - 994 => ::std::option::Option::Some(MessageType::MessageType_ResetDeviceContinue), - 995 => ::std::option::Option::Some(MessageType::MessageType_ResetDeviceFinish), + 994 => ::std::option::Option::Some(MessageType::MessageType_EntropyCheckReady), + 995 => ::std::option::Option::Some(MessageType::MessageType_EntropyCheckContinue), 41 => ::std::option::Option::Some(MessageType::MessageType_PassphraseRequest), 42 => ::std::option::Option::Some(MessageType::MessageType_PassphraseAck), 45 => ::std::option::Option::Some(MessageType::MessageType_RecoveryDevice), @@ -811,8 +811,8 @@ impl ::protobuf::Enum for MessageType { "MessageType_BackupDevice" => ::std::option::Option::Some(MessageType::MessageType_BackupDevice), "MessageType_EntropyRequest" => ::std::option::Option::Some(MessageType::MessageType_EntropyRequest), "MessageType_EntropyAck" => ::std::option::Option::Some(MessageType::MessageType_EntropyAck), - "MessageType_ResetDeviceContinue" => ::std::option::Option::Some(MessageType::MessageType_ResetDeviceContinue), - "MessageType_ResetDeviceFinish" => ::std::option::Option::Some(MessageType::MessageType_ResetDeviceFinish), + "MessageType_EntropyCheckReady" => ::std::option::Option::Some(MessageType::MessageType_EntropyCheckReady), + "MessageType_EntropyCheckContinue" => ::std::option::Option::Some(MessageType::MessageType_EntropyCheckContinue), "MessageType_PassphraseRequest" => ::std::option::Option::Some(MessageType::MessageType_PassphraseRequest), "MessageType_PassphraseAck" => ::std::option::Option::Some(MessageType::MessageType_PassphraseAck), "MessageType_RecoveryDevice" => ::std::option::Option::Some(MessageType::MessageType_RecoveryDevice), @@ -1063,8 +1063,8 @@ impl ::protobuf::Enum for MessageType { MessageType::MessageType_BackupDevice, MessageType::MessageType_EntropyRequest, MessageType::MessageType_EntropyAck, - MessageType::MessageType_ResetDeviceContinue, - MessageType::MessageType_ResetDeviceFinish, + MessageType::MessageType_EntropyCheckReady, + MessageType::MessageType_EntropyCheckContinue, MessageType::MessageType_PassphraseRequest, MessageType::MessageType_PassphraseAck, MessageType::MessageType_RecoveryDevice, @@ -1321,8 +1321,8 @@ impl ::protobuf::EnumFull for MessageType { MessageType::MessageType_BackupDevice => 22, MessageType::MessageType_EntropyRequest => 23, MessageType::MessageType_EntropyAck => 24, - MessageType::MessageType_ResetDeviceContinue => 25, - MessageType::MessageType_ResetDeviceFinish => 26, + MessageType::MessageType_EntropyCheckReady => 25, + MessageType::MessageType_EntropyCheckContinue => 26, MessageType::MessageType_PassphraseRequest => 27, MessageType::MessageType_PassphraseAck => 28, MessageType::MessageType_RecoveryDevice => 29, @@ -1561,7 +1561,7 @@ impl MessageType { } static file_descriptor_proto_data: &'static [u8] = b"\ - \n\x0emessages.proto\x12\x12hw.trezor.messages\x1a\roptions.proto*\xe7U\ + \n\x0emessages.proto\x12\x12hw.trezor.messages\x1a\roptions.proto*\xe8U\ \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_S\ @@ -1592,9 +1592,9 @@ static file_descriptor_proto_data: &'static [u8] = b"\ essageType_BackupDevice\x10\"\x1a\x08\x80\xa6\x1d\x01\x90\xb5\x18\x01\ \x12(\n\x1aMessageType_EntropyRequest\x10#\x1a\x08\x80\xa6\x1d\x01\x98\ \xb5\x18\x01\x12$\n\x16MessageType_EntropyAck\x10$\x1a\x08\x80\xa6\x1d\ - \x01\x90\xb5\x18\x01\x12.\n\x1fMessageType_ResetDeviceContinue\x10\xe2\ - \x07\x1a\x08\x80\xa6\x1d\x01\x90\xb5\x18\x01\x12,\n\x1dMessageType_Reset\ - DeviceFinish\x10\xe3\x07\x1a\x08\x80\xa6\x1d\x01\x90\xb5\x18\x01\x12+\n\ + \x01\x90\xb5\x18\x01\x12,\n\x1dMessageType_EntropyCheckReady\x10\xe2\x07\ + \x1a\x08\x80\xa6\x1d\x01\x98\xb5\x18\x01\x12/\n\x20MessageType_EntropyCh\ + eckContinue\x10\xe3\x07\x1a\x08\x80\xa6\x1d\x01\x90\xb5\x18\x01\x12+\n\ \x1dMessageType_PassphraseRequest\x10)\x1a\x08\x80\xa6\x1d\x01\x98\xb5\ \x18\x01\x12/\n\x19MessageType_PassphraseAck\x10*\x1a\x10\xc0\xb5\x18\ \x01\xb0\xb5\x18\x01\x80\xa6\x1d\x01\x90\xb5\x18\x01\x12(\n\x1aMessageTy\ diff --git a/rust/trezor-client/src/protos/generated/messages_management.rs b/rust/trezor-client/src/protos/generated/messages_management.rs index fdaba60e40..5fa5e2b328 100644 --- a/rust/trezor-client/src/protos/generated/messages_management.rs +++ b/rust/trezor-client/src/protos/generated/messages_management.rs @@ -8080,38 +8080,38 @@ impl ::protobuf::reflect::ProtobufValue for EntropyAck { type RuntimeType = ::protobuf::reflect::rt::RuntimeTypeMessage; } -// @@protoc_insertion_point(message:hw.trezor.messages.management.ResetDeviceContinue) +// @@protoc_insertion_point(message:hw.trezor.messages.management.EntropyCheckReady) #[derive(PartialEq,Clone,Default,Debug)] -pub struct ResetDeviceContinue { +pub struct EntropyCheckReady { // special fields - // @@protoc_insertion_point(special_field:hw.trezor.messages.management.ResetDeviceContinue.special_fields) + // @@protoc_insertion_point(special_field:hw.trezor.messages.management.EntropyCheckReady.special_fields) pub special_fields: ::protobuf::SpecialFields, } -impl<'a> ::std::default::Default for &'a ResetDeviceContinue { - fn default() -> &'a ResetDeviceContinue { - ::default_instance() +impl<'a> ::std::default::Default for &'a EntropyCheckReady { + fn default() -> &'a EntropyCheckReady { + ::default_instance() } } -impl ResetDeviceContinue { - pub fn new() -> ResetDeviceContinue { +impl EntropyCheckReady { + pub fn new() -> EntropyCheckReady { ::std::default::Default::default() } fn generated_message_descriptor_data() -> ::protobuf::reflect::GeneratedMessageDescriptorData { let mut fields = ::std::vec::Vec::with_capacity(0); let mut oneofs = ::std::vec::Vec::with_capacity(0); - ::protobuf::reflect::GeneratedMessageDescriptorData::new_2::( - "ResetDeviceContinue", + ::protobuf::reflect::GeneratedMessageDescriptorData::new_2::( + "EntropyCheckReady", fields, oneofs, ) } } -impl ::protobuf::Message for ResetDeviceContinue { - const NAME: &'static str = "ResetDeviceContinue"; +impl ::protobuf::Message for EntropyCheckReady { + const NAME: &'static str = "EntropyCheckReady"; fn is_initialized(&self) -> bool { true @@ -8150,71 +8150,98 @@ impl ::protobuf::Message for ResetDeviceContinue { &mut self.special_fields } - fn new() -> ResetDeviceContinue { - ResetDeviceContinue::new() + fn new() -> EntropyCheckReady { + EntropyCheckReady::new() } fn clear(&mut self) { self.special_fields.clear(); } - fn default_instance() -> &'static ResetDeviceContinue { - static instance: ResetDeviceContinue = ResetDeviceContinue { + fn default_instance() -> &'static EntropyCheckReady { + static instance: EntropyCheckReady = EntropyCheckReady { special_fields: ::protobuf::SpecialFields::new(), }; &instance } } -impl ::protobuf::MessageFull for ResetDeviceContinue { +impl ::protobuf::MessageFull for EntropyCheckReady { fn descriptor() -> ::protobuf::reflect::MessageDescriptor { static descriptor: ::protobuf::rt::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::rt::Lazy::new(); - descriptor.get(|| file_descriptor().message_by_package_relative_name("ResetDeviceContinue").unwrap()).clone() + descriptor.get(|| file_descriptor().message_by_package_relative_name("EntropyCheckReady").unwrap()).clone() } } -impl ::std::fmt::Display for ResetDeviceContinue { +impl ::std::fmt::Display for EntropyCheckReady { fn fmt(&self, f: &mut ::std::fmt::Formatter<'_>) -> ::std::fmt::Result { ::protobuf::text_format::fmt(self, f) } } -impl ::protobuf::reflect::ProtobufValue for ResetDeviceContinue { +impl ::protobuf::reflect::ProtobufValue for EntropyCheckReady { type RuntimeType = ::protobuf::reflect::rt::RuntimeTypeMessage; } -// @@protoc_insertion_point(message:hw.trezor.messages.management.ResetDeviceFinish) +// @@protoc_insertion_point(message:hw.trezor.messages.management.EntropyCheckContinue) #[derive(PartialEq,Clone,Default,Debug)] -pub struct ResetDeviceFinish { +pub struct EntropyCheckContinue { + // message fields + // @@protoc_insertion_point(field:hw.trezor.messages.management.EntropyCheckContinue.finish) + pub finish: ::std::option::Option, // special fields - // @@protoc_insertion_point(special_field:hw.trezor.messages.management.ResetDeviceFinish.special_fields) + // @@protoc_insertion_point(special_field:hw.trezor.messages.management.EntropyCheckContinue.special_fields) pub special_fields: ::protobuf::SpecialFields, } -impl<'a> ::std::default::Default for &'a ResetDeviceFinish { - fn default() -> &'a ResetDeviceFinish { - ::default_instance() +impl<'a> ::std::default::Default for &'a EntropyCheckContinue { + fn default() -> &'a EntropyCheckContinue { + ::default_instance() } } -impl ResetDeviceFinish { - pub fn new() -> ResetDeviceFinish { +impl EntropyCheckContinue { + pub fn new() -> EntropyCheckContinue { ::std::default::Default::default() } + // optional bool finish = 1; + + pub fn finish(&self) -> bool { + self.finish.unwrap_or(false) + } + + pub fn clear_finish(&mut self) { + self.finish = ::std::option::Option::None; + } + + pub fn has_finish(&self) -> bool { + self.finish.is_some() + } + + // Param is passed by value, moved + pub fn set_finish(&mut self, v: bool) { + self.finish = ::std::option::Option::Some(v); + } + fn generated_message_descriptor_data() -> ::protobuf::reflect::GeneratedMessageDescriptorData { - let mut fields = ::std::vec::Vec::with_capacity(0); + let mut fields = ::std::vec::Vec::with_capacity(1); let mut oneofs = ::std::vec::Vec::with_capacity(0); - ::protobuf::reflect::GeneratedMessageDescriptorData::new_2::( - "ResetDeviceFinish", + fields.push(::protobuf::reflect::rt::v2::make_option_accessor::<_, _>( + "finish", + |m: &EntropyCheckContinue| { &m.finish }, + |m: &mut EntropyCheckContinue| { &mut m.finish }, + )); + ::protobuf::reflect::GeneratedMessageDescriptorData::new_2::( + "EntropyCheckContinue", fields, oneofs, ) } } -impl ::protobuf::Message for ResetDeviceFinish { - const NAME: &'static str = "ResetDeviceFinish"; +impl ::protobuf::Message for EntropyCheckContinue { + const NAME: &'static str = "EntropyCheckContinue"; fn is_initialized(&self) -> bool { true @@ -8223,6 +8250,9 @@ impl ::protobuf::Message for ResetDeviceFinish { fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::Result<()> { while let Some(tag) = is.read_raw_tag_or_eof()? { match tag { + 8 => { + self.finish = ::std::option::Option::Some(is.read_bool()?); + }, tag => { ::protobuf::rt::read_unknown_or_skip_group(tag, is, self.special_fields.mut_unknown_fields())?; }, @@ -8235,12 +8265,18 @@ impl ::protobuf::Message for ResetDeviceFinish { #[allow(unused_variables)] fn compute_size(&self) -> u64 { let mut my_size = 0; + if let Some(v) = self.finish { + my_size += 1 + 1; + } my_size += ::protobuf::rt::unknown_fields_size(self.special_fields.unknown_fields()); self.special_fields.cached_size().set(my_size as u32); my_size } fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::Result<()> { + if let Some(v) = self.finish { + os.write_bool(1, v)?; + } os.write_unknown_fields(self.special_fields.unknown_fields())?; ::std::result::Result::Ok(()) } @@ -8253,36 +8289,38 @@ impl ::protobuf::Message for ResetDeviceFinish { &mut self.special_fields } - fn new() -> ResetDeviceFinish { - ResetDeviceFinish::new() + fn new() -> EntropyCheckContinue { + EntropyCheckContinue::new() } fn clear(&mut self) { + self.finish = ::std::option::Option::None; self.special_fields.clear(); } - fn default_instance() -> &'static ResetDeviceFinish { - static instance: ResetDeviceFinish = ResetDeviceFinish { + fn default_instance() -> &'static EntropyCheckContinue { + static instance: EntropyCheckContinue = EntropyCheckContinue { + finish: ::std::option::Option::None, special_fields: ::protobuf::SpecialFields::new(), }; &instance } } -impl ::protobuf::MessageFull for ResetDeviceFinish { +impl ::protobuf::MessageFull for EntropyCheckContinue { fn descriptor() -> ::protobuf::reflect::MessageDescriptor { static descriptor: ::protobuf::rt::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::rt::Lazy::new(); - descriptor.get(|| file_descriptor().message_by_package_relative_name("ResetDeviceFinish").unwrap()).clone() + descriptor.get(|| file_descriptor().message_by_package_relative_name("EntropyCheckContinue").unwrap()).clone() } } -impl ::std::fmt::Display for ResetDeviceFinish { +impl ::std::fmt::Display for EntropyCheckContinue { fn fmt(&self, f: &mut ::std::fmt::Formatter<'_>) -> ::std::fmt::Result { ::protobuf::text_format::fmt(self, f) } } -impl ::protobuf::reflect::ProtobufValue for ResetDeviceFinish { +impl ::protobuf::reflect::ProtobufValue for EntropyCheckContinue { type RuntimeType = ::protobuf::reflect::rt::RuntimeTypeMessage; } @@ -11654,52 +11692,52 @@ static file_descriptor_proto_data: &'static [u8] = b"\ member_count\x18\x02\x20\x02(\rR\x0bmemberCount\"b\n\x0eEntropyRequest\ \x12-\n\x12entropy_commitment\x18\x01\x20\x01(\x0cR\x11entropyCommitment\ \x12!\n\x0cprev_entropy\x18\x02\x20\x01(\x0cR\x0bprevEntropy\"&\n\nEntro\ - pyAck\x12\x18\n\x07entropy\x18\x01\x20\x02(\x0cR\x07entropy\"\x15\n\x13R\ - esetDeviceContinue\"\x13\n\x11ResetDeviceFinish\"\x8d\x04\n\x0eRecoveryD\ - evice\x12\x1d\n\nword_count\x18\x01\x20\x01(\rR\twordCount\x123\n\x15pas\ - sphrase_protection\x18\x02\x20\x01(\x08R\x14passphraseProtection\x12%\n\ - \x0epin_protection\x18\x03\x20\x01(\x08R\rpinProtection\x12\x1e\n\x08lan\ - guage\x18\x04\x20\x01(\tR\x08languageB\x02\x18\x01\x12\x14\n\x05label\ - \x18\x05\x20\x01(\tR\x05label\x12)\n\x10enforce_wordlist\x18\x06\x20\x01\ - (\x08R\x0fenforceWordlist\x12j\n\x0cinput_method\x18\x08\x20\x01(\x0e2G.\ - hw.trezor.messages.management.RecoveryDevice.RecoveryDeviceInputMethodR\ - \x0binputMethod\x12\x1f\n\x0bu2f_counter\x18\t\x20\x01(\rR\nu2fCounter\ - \x12O\n\x04type\x18\n\x20\x01(\x0e2+.hw.trezor.messages.management.Recov\ - eryType:\x0eNormalRecoveryR\x04type\";\n\x19RecoveryDeviceInputMethod\ - \x12\x12\n\x0eScrambledWords\x10\0\x12\n\n\x06Matrix\x10\x01J\x04\x08\ - \x07\x10\x08\"\xc5\x01\n\x0bWordRequest\x12N\n\x04type\x18\x01\x20\x02(\ - \x0e2:.hw.trezor.messages.management.WordRequest.WordRequestTypeR\x04typ\ - e\"f\n\x0fWordRequestType\x12\x19\n\x15WordRequestType_Plain\x10\0\x12\ - \x1b\n\x17WordRequestType_Matrix9\x10\x01\x12\x1b\n\x17WordRequestType_M\ - atrix6\x10\x02\"\x1d\n\x07WordAck\x12\x12\n\x04word\x18\x01\x20\x02(\tR\ - \x04word\"0\n\rSetU2FCounter\x12\x1f\n\x0bu2f_counter\x18\x01\x20\x02(\r\ - R\nu2fCounter\"\x13\n\x11GetNextU2FCounter\"1\n\x0eNextU2FCounter\x12\ - \x1f\n\x0bu2f_counter\x18\x01\x20\x02(\rR\nu2fCounter\"\x11\n\x0fDoPreau\ - thorized\"\x16\n\x14PreauthorizedRequest\"\x15\n\x13CancelAuthorization\ - \"\x9a\x02\n\x12RebootToBootloader\x12o\n\x0cboot_command\x18\x01\x20\ - \x01(\x0e2=.hw.trezor.messages.management.RebootToBootloader.BootCommand\ - :\rSTOP_AND_WAITR\x0bbootCommand\x12'\n\x0ffirmware_header\x18\x02\x20\ - \x01(\x0cR\x0efirmwareHeader\x123\n\x14language_data_length\x18\x03\x20\ - \x01(\r:\x010R\x12languageDataLength\"5\n\x0bBootCommand\x12\x11\n\rSTOP\ - _AND_WAIT\x10\0\x12\x13\n\x0fINSTALL_UPGRADE\x10\x01\"\x10\n\x08GetNonce\ - :\x04\x88\xb2\x19\x01\"#\n\x05Nonce\x12\x14\n\x05nonce\x18\x01\x20\x02(\ - \x0cR\x05nonce:\x04\x88\xb2\x19\x01\";\n\nUnlockPath\x12\x1b\n\taddress_\ - n\x18\x01\x20\x03(\rR\x08addressN\x12\x10\n\x03mac\x18\x02\x20\x01(\x0cR\ - \x03mac\"'\n\x13UnlockedPathRequest\x12\x10\n\x03mac\x18\x01\x20\x01(\ - \x0cR\x03mac\"\x14\n\x12ShowDeviceTutorial\"\x12\n\x10UnlockBootloader\"\ - %\n\rSetBrightness\x12\x14\n\x05value\x18\x01\x20\x01(\rR\x05value*\x99\ - \x01\n\nBackupType\x12\t\n\x05Bip39\x10\0\x12\x10\n\x0cSlip39_Basic\x10\ - \x01\x12\x13\n\x0fSlip39_Advanced\x10\x02\x12\x1c\n\x18Slip39_Single_Ext\ - endable\x10\x03\x12\x1b\n\x17Slip39_Basic_Extendable\x10\x04\x12\x1e\n\ - \x1aSlip39_Advanced_Extendable\x10\x05*G\n\x10SafetyCheckLevel\x12\n\n\ - \x06Strict\x10\0\x12\x10\n\x0cPromptAlways\x10\x01\x12\x15\n\x11PromptTe\ - mporarily\x10\x02*=\n\x0fDisplayRotation\x12\t\n\x05North\x10\0\x12\x08\ - \n\x04East\x10Z\x12\n\n\x05South\x10\xb4\x01\x12\t\n\x04West\x10\x8e\x02\ - *0\n\x10HomescreenFormat\x12\x08\n\x04Toif\x10\x01\x12\x08\n\x04Jpeg\x10\ - \x02\x12\x08\n\x04ToiG\x10\x03*H\n\x0cRecoveryType\x12\x12\n\x0eNormalRe\ - covery\x10\0\x12\n\n\x06DryRun\x10\x01\x12\x18\n\x14UnlockRepeatedBackup\ - \x10\x02BB\n#com.satoshilabs.trezor.lib.protobufB\x17TrezorMessageManage\ - ment\x80\xa6\x1d\x01\ + pyAck\x12\x18\n\x07entropy\x18\x01\x20\x02(\x0cR\x07entropy\"\x13\n\x11E\ + ntropyCheckReady\"5\n\x14EntropyCheckContinue\x12\x1d\n\x06finish\x18\ + \x01\x20\x01(\x08:\x05falseR\x06finish\"\x8d\x04\n\x0eRecoveryDevice\x12\ + \x1d\n\nword_count\x18\x01\x20\x01(\rR\twordCount\x123\n\x15passphrase_p\ + rotection\x18\x02\x20\x01(\x08R\x14passphraseProtection\x12%\n\x0epin_pr\ + otection\x18\x03\x20\x01(\x08R\rpinProtection\x12\x1e\n\x08language\x18\ + \x04\x20\x01(\tR\x08languageB\x02\x18\x01\x12\x14\n\x05label\x18\x05\x20\ + \x01(\tR\x05label\x12)\n\x10enforce_wordlist\x18\x06\x20\x01(\x08R\x0fen\ + forceWordlist\x12j\n\x0cinput_method\x18\x08\x20\x01(\x0e2G.hw.trezor.me\ + ssages.management.RecoveryDevice.RecoveryDeviceInputMethodR\x0binputMeth\ + od\x12\x1f\n\x0bu2f_counter\x18\t\x20\x01(\rR\nu2fCounter\x12O\n\x04type\ + \x18\n\x20\x01(\x0e2+.hw.trezor.messages.management.RecoveryType:\x0eNor\ + malRecoveryR\x04type\";\n\x19RecoveryDeviceInputMethod\x12\x12\n\x0eScra\ + mbledWords\x10\0\x12\n\n\x06Matrix\x10\x01J\x04\x08\x07\x10\x08\"\xc5\ + \x01\n\x0bWordRequest\x12N\n\x04type\x18\x01\x20\x02(\x0e2:.hw.trezor.me\ + ssages.management.WordRequest.WordRequestTypeR\x04type\"f\n\x0fWordReque\ + stType\x12\x19\n\x15WordRequestType_Plain\x10\0\x12\x1b\n\x17WordRequest\ + Type_Matrix9\x10\x01\x12\x1b\n\x17WordRequestType_Matrix6\x10\x02\"\x1d\ + \n\x07WordAck\x12\x12\n\x04word\x18\x01\x20\x02(\tR\x04word\"0\n\rSetU2F\ + Counter\x12\x1f\n\x0bu2f_counter\x18\x01\x20\x02(\rR\nu2fCounter\"\x13\n\ + \x11GetNextU2FCounter\"1\n\x0eNextU2FCounter\x12\x1f\n\x0bu2f_counter\ + \x18\x01\x20\x02(\rR\nu2fCounter\"\x11\n\x0fDoPreauthorized\"\x16\n\x14P\ + reauthorizedRequest\"\x15\n\x13CancelAuthorization\"\x9a\x02\n\x12Reboot\ + ToBootloader\x12o\n\x0cboot_command\x18\x01\x20\x01(\x0e2=.hw.trezor.mes\ + sages.management.RebootToBootloader.BootCommand:\rSTOP_AND_WAITR\x0bboot\ + Command\x12'\n\x0ffirmware_header\x18\x02\x20\x01(\x0cR\x0efirmwareHeade\ + r\x123\n\x14language_data_length\x18\x03\x20\x01(\r:\x010R\x12languageDa\ + taLength\"5\n\x0bBootCommand\x12\x11\n\rSTOP_AND_WAIT\x10\0\x12\x13\n\ + \x0fINSTALL_UPGRADE\x10\x01\"\x10\n\x08GetNonce:\x04\x88\xb2\x19\x01\"#\ + \n\x05Nonce\x12\x14\n\x05nonce\x18\x01\x20\x02(\x0cR\x05nonce:\x04\x88\ + \xb2\x19\x01\";\n\nUnlockPath\x12\x1b\n\taddress_n\x18\x01\x20\x03(\rR\ + \x08addressN\x12\x10\n\x03mac\x18\x02\x20\x01(\x0cR\x03mac\"'\n\x13Unloc\ + kedPathRequest\x12\x10\n\x03mac\x18\x01\x20\x01(\x0cR\x03mac\"\x14\n\x12\ + ShowDeviceTutorial\"\x12\n\x10UnlockBootloader\"%\n\rSetBrightness\x12\ + \x14\n\x05value\x18\x01\x20\x01(\rR\x05value*\x99\x01\n\nBackupType\x12\ + \t\n\x05Bip39\x10\0\x12\x10\n\x0cSlip39_Basic\x10\x01\x12\x13\n\x0fSlip3\ + 9_Advanced\x10\x02\x12\x1c\n\x18Slip39_Single_Extendable\x10\x03\x12\x1b\ + \n\x17Slip39_Basic_Extendable\x10\x04\x12\x1e\n\x1aSlip39_Advanced_Exten\ + dable\x10\x05*G\n\x10SafetyCheckLevel\x12\n\n\x06Strict\x10\0\x12\x10\n\ + \x0cPromptAlways\x10\x01\x12\x15\n\x11PromptTemporarily\x10\x02*=\n\x0fD\ + isplayRotation\x12\t\n\x05North\x10\0\x12\x08\n\x04East\x10Z\x12\n\n\x05\ + South\x10\xb4\x01\x12\t\n\x04West\x10\x8e\x02*0\n\x10HomescreenFormat\ + \x12\x08\n\x04Toif\x10\x01\x12\x08\n\x04Jpeg\x10\x02\x12\x08\n\x04ToiG\ + \x10\x03*H\n\x0cRecoveryType\x12\x12\n\x0eNormalRecovery\x10\0\x12\n\n\ + \x06DryRun\x10\x01\x12\x18\n\x14UnlockRepeatedBackup\x10\x02BB\n#com.sat\ + oshilabs.trezor.lib.protobufB\x17TrezorMessageManagement\x80\xa6\x1d\x01\ "; /// `FileDescriptorProto` object which was a source for this generated file @@ -11747,8 +11785,8 @@ pub fn file_descriptor() -> &'static ::protobuf::reflect::FileDescriptor { messages.push(BackupDevice::generated_message_descriptor_data()); messages.push(EntropyRequest::generated_message_descriptor_data()); messages.push(EntropyAck::generated_message_descriptor_data()); - messages.push(ResetDeviceContinue::generated_message_descriptor_data()); - messages.push(ResetDeviceFinish::generated_message_descriptor_data()); + messages.push(EntropyCheckReady::generated_message_descriptor_data()); + messages.push(EntropyCheckContinue::generated_message_descriptor_data()); messages.push(RecoveryDevice::generated_message_descriptor_data()); messages.push(WordRequest::generated_message_descriptor_data()); messages.push(WordAck::generated_message_descriptor_data());