From ff1bb67abc578fdc5d5eade94957c8130670dc04 Mon Sep 17 00:00:00 2001 From: Tomas Susanka Date: Wed, 19 Feb 2020 20:33:42 +0000 Subject: [PATCH] common: return the PasshraseType button request --- common/protob/messages-common.proto | 2 +- core/src/trezor/messages/ButtonRequest.py | 4 ++-- core/src/trezor/messages/ButtonRequestType.py | 1 + python/src/trezorlib/messages/ButtonRequest.py | 4 ++-- python/src/trezorlib/messages/ButtonRequestType.py | 1 + 5 files changed, 7 insertions(+), 5 deletions(-) diff --git a/common/protob/messages-common.proto b/common/protob/messages-common.proto index aefa0f08d..a627bd17c 100644 --- a/common/protob/messages-common.proto +++ b/common/protob/messages-common.proto @@ -62,7 +62,7 @@ message ButtonRequest { ButtonRequest_PublicKey = 11; ButtonRequest_MnemonicWordCount = 12; ButtonRequest_MnemonicInput = 13; -// ButtonRequest_PassphraseType = 14; DEPRECATED + _Deprecated_ButtonRequest_PassphraseType = 14 [deprecated=true]; ButtonRequest_UnknownDerivationPath = 15; ButtonRequest_RecoveryHomepage = 16; ButtonRequest_Success = 17; diff --git a/core/src/trezor/messages/ButtonRequest.py b/core/src/trezor/messages/ButtonRequest.py index 334ff5954..20409c146 100644 --- a/core/src/trezor/messages/ButtonRequest.py +++ b/core/src/trezor/messages/ButtonRequest.py @@ -6,7 +6,7 @@ if __debug__: try: from typing import Dict, List # noqa: F401 from typing_extensions import Literal # noqa: F401 - EnumTypeButtonRequestType = Literal[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 15, 16, 17, 18, 19] + EnumTypeButtonRequestType = Literal[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19] except ImportError: pass @@ -23,5 +23,5 @@ class ButtonRequest(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('code', p.EnumType("ButtonRequestType", (1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 15, 16, 17, 18, 19)), 0), + 1: ('code', p.EnumType("ButtonRequestType", (1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19)), 0), } diff --git a/core/src/trezor/messages/ButtonRequestType.py b/core/src/trezor/messages/ButtonRequestType.py index c973ce8aa..e90b87529 100644 --- a/core/src/trezor/messages/ButtonRequestType.py +++ b/core/src/trezor/messages/ButtonRequestType.py @@ -16,6 +16,7 @@ Address = 10 # type: Literal[10] PublicKey = 11 # type: Literal[11] MnemonicWordCount = 12 # type: Literal[12] MnemonicInput = 13 # type: Literal[13] +_Deprecated_ButtonRequest_PassphraseType = 14 # type: Literal[14] UnknownDerivationPath = 15 # type: Literal[15] RecoveryHomepage = 16 # type: Literal[16] Success = 17 # type: Literal[17] diff --git a/python/src/trezorlib/messages/ButtonRequest.py b/python/src/trezorlib/messages/ButtonRequest.py index 5592eb638..1a9ad14e2 100644 --- a/python/src/trezorlib/messages/ButtonRequest.py +++ b/python/src/trezorlib/messages/ButtonRequest.py @@ -6,7 +6,7 @@ if __debug__: try: from typing import Dict, List # noqa: F401 from typing_extensions import Literal # noqa: F401 - EnumTypeButtonRequestType = Literal[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 15, 16, 17, 18, 19] + EnumTypeButtonRequestType = Literal[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19] except ImportError: pass @@ -23,5 +23,5 @@ class ButtonRequest(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('code', p.EnumType("ButtonRequestType", (1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 15, 16, 17, 18, 19)), 0), + 1: ('code', p.EnumType("ButtonRequestType", (1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19)), 0), } diff --git a/python/src/trezorlib/messages/ButtonRequestType.py b/python/src/trezorlib/messages/ButtonRequestType.py index c973ce8aa..e90b87529 100644 --- a/python/src/trezorlib/messages/ButtonRequestType.py +++ b/python/src/trezorlib/messages/ButtonRequestType.py @@ -16,6 +16,7 @@ Address = 10 # type: Literal[10] PublicKey = 11 # type: Literal[11] MnemonicWordCount = 12 # type: Literal[12] MnemonicInput = 13 # type: Literal[13] +_Deprecated_ButtonRequest_PassphraseType = 14 # type: Literal[14] UnknownDerivationPath = 15 # type: Literal[15] RecoveryHomepage = 16 # type: Literal[16] Success = 17 # type: Literal[17]