From c01d04f26e0b53ebbea8bd74a1ea5d040f858455 Mon Sep 17 00:00:00 2001 From: matejcik Date: Thu, 6 Feb 2020 15:14:51 +0100 Subject: [PATCH] common/protob: drop a default field declaration which triggers nanopb bug https://github.com/nanopb/nanopb/issues/487 --- common/protob/messages-lisk.proto | 2 +- core/src/trezor/messages/LiskTransactionCommon.py | 2 +- python/src/trezorlib/messages/LiskTransactionCommon.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/common/protob/messages-lisk.proto b/common/protob/messages-lisk.proto index ceeb26c9b..b91cd9950 100644 --- a/common/protob/messages-lisk.proto +++ b/common/protob/messages-lisk.proto @@ -56,7 +56,7 @@ message LiskSignTx { */ message LiskTransactionCommon { optional LiskTransactionType type = 1; - optional uint64 amount = 2 [default=0]; + optional uint64 amount = 2; optional uint64 fee = 3; optional string recipient_id = 4; optional bytes sender_public_key = 5; diff --git a/core/src/trezor/messages/LiskTransactionCommon.py b/core/src/trezor/messages/LiskTransactionCommon.py index 38391cfe4..1670dd641 100644 --- a/core/src/trezor/messages/LiskTransactionCommon.py +++ b/core/src/trezor/messages/LiskTransactionCommon.py @@ -41,7 +41,7 @@ class LiskTransactionCommon(p.MessageType): def get_fields(cls) -> Dict: return { 1: ('type', p.EnumType("LiskTransactionType", (0, 1, 2, 3, 4, 5, 6, 7)), 0), - 2: ('amount', p.UVarintType, 0), # default=0 + 2: ('amount', p.UVarintType, 0), 3: ('fee', p.UVarintType, 0), 4: ('recipient_id', p.UnicodeType, 0), 5: ('sender_public_key', p.BytesType, 0), diff --git a/python/src/trezorlib/messages/LiskTransactionCommon.py b/python/src/trezorlib/messages/LiskTransactionCommon.py index 6b27a2d29..ef237c703 100644 --- a/python/src/trezorlib/messages/LiskTransactionCommon.py +++ b/python/src/trezorlib/messages/LiskTransactionCommon.py @@ -41,7 +41,7 @@ class LiskTransactionCommon(p.MessageType): def get_fields(cls) -> Dict: return { 1: ('type', p.EnumType("LiskTransactionType", (0, 1, 2, 3, 4, 5, 6, 7)), 0), - 2: ('amount', p.UVarintType, 0), # default=0 + 2: ('amount', p.UVarintType, 0), 3: ('fee', p.UVarintType, 0), 4: ('recipient_id', p.UnicodeType, 0), 5: ('sender_public_key', p.BytesType, 0),