From ad6a0bc2a27fdee0ee2fbc01404f8daba196687a Mon Sep 17 00:00:00 2001 From: Andrew Kozlik Date: Wed, 23 Sep 2020 18:00:06 +0200 Subject: [PATCH] chore(common): Add new request types TXORIGINPUT and TXORIGOUTPUT. --- common/protob/messages-bitcoin.proto | 2 ++ core/src/trezor/messages/RequestType.py | 2 ++ core/src/trezor/messages/TxRequest.py | 4 ++-- python/src/trezorlib/messages/RequestType.py | 2 ++ python/src/trezorlib/messages/TxRequest.py | 4 ++-- 5 files changed, 10 insertions(+), 4 deletions(-) diff --git a/common/protob/messages-bitcoin.proto b/common/protob/messages-bitcoin.proto index 9c5a335e6..098cfeab1 100644 --- a/common/protob/messages-bitcoin.proto +++ b/common/protob/messages-bitcoin.proto @@ -195,6 +195,8 @@ message TxRequest { TXMETA = 2; TXFINISHED = 3; TXEXTRADATA = 4; + TXORIGINPUT = 5; + TXORIGOUTPUT = 6; } /** * Structure representing request details diff --git a/core/src/trezor/messages/RequestType.py b/core/src/trezor/messages/RequestType.py index 810076752..42899b107 100644 --- a/core/src/trezor/messages/RequestType.py +++ b/core/src/trezor/messages/RequestType.py @@ -8,3 +8,5 @@ TXOUTPUT = 1 # type: Literal[1] TXMETA = 2 # type: Literal[2] TXFINISHED = 3 # type: Literal[3] TXEXTRADATA = 4 # type: Literal[4] +TXORIGINPUT = 5 # type: Literal[5] +TXORIGOUTPUT = 6 # type: Literal[6] diff --git a/core/src/trezor/messages/TxRequest.py b/core/src/trezor/messages/TxRequest.py index 5e3a867bf..98badef6e 100644 --- a/core/src/trezor/messages/TxRequest.py +++ b/core/src/trezor/messages/TxRequest.py @@ -9,7 +9,7 @@ if __debug__: try: from typing import Dict, List # noqa: F401 from typing_extensions import Literal # noqa: F401 - EnumTypeRequestType = Literal[0, 1, 2, 3, 4] + EnumTypeRequestType = Literal[0, 1, 2, 3, 4, 5, 6] except ImportError: pass @@ -31,7 +31,7 @@ class TxRequest(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('request_type', p.EnumType("RequestType", (0, 1, 2, 3, 4)), None), + 1: ('request_type', p.EnumType("RequestType", (0, 1, 2, 3, 4, 5, 6)), None), 2: ('details', TxRequestDetailsType, None), 3: ('serialized', TxRequestSerializedType, None), } diff --git a/python/src/trezorlib/messages/RequestType.py b/python/src/trezorlib/messages/RequestType.py index 810076752..42899b107 100644 --- a/python/src/trezorlib/messages/RequestType.py +++ b/python/src/trezorlib/messages/RequestType.py @@ -8,3 +8,5 @@ TXOUTPUT = 1 # type: Literal[1] TXMETA = 2 # type: Literal[2] TXFINISHED = 3 # type: Literal[3] TXEXTRADATA = 4 # type: Literal[4] +TXORIGINPUT = 5 # type: Literal[5] +TXORIGOUTPUT = 6 # type: Literal[6] diff --git a/python/src/trezorlib/messages/TxRequest.py b/python/src/trezorlib/messages/TxRequest.py index 09fda7c9a..b3229239d 100644 --- a/python/src/trezorlib/messages/TxRequest.py +++ b/python/src/trezorlib/messages/TxRequest.py @@ -9,7 +9,7 @@ if __debug__: try: from typing import Dict, List # noqa: F401 from typing_extensions import Literal # noqa: F401 - EnumTypeRequestType = Literal[0, 1, 2, 3, 4] + EnumTypeRequestType = Literal[0, 1, 2, 3, 4, 5, 6] except ImportError: pass @@ -31,7 +31,7 @@ class TxRequest(p.MessageType): @classmethod def get_fields(cls) -> Dict: return { - 1: ('request_type', p.EnumType("RequestType", (0, 1, 2, 3, 4)), None), + 1: ('request_type', p.EnumType("RequestType", (0, 1, 2, 3, 4, 5, 6)), None), 2: ('details', TxRequestDetailsType, None), 3: ('serialized', TxRequestSerializedType, None), }