From 14a8da9c2830802df1474f463377669513da64fd Mon Sep 17 00:00:00 2001 From: Tomas Susanka Date: Wed, 1 Jul 2020 13:56:31 +0000 Subject: [PATCH] common: remove underscore from 'overwintered' field Due to some Suite/Connect compatibility issues. --- common/protob/messages-bitcoin.proto | 4 ++-- python/src/trezorlib/messages/SignTx.py | 6 +++--- python/src/trezorlib/messages/TransactionType.py | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/common/protob/messages-bitcoin.proto b/common/protob/messages-bitcoin.proto index 39d041db4..6ec28d244 100644 --- a/common/protob/messages-bitcoin.proto +++ b/common/protob/messages-bitcoin.proto @@ -130,7 +130,7 @@ message SignTx { optional uint32 version = 4 [default=1]; // transaction version optional uint32 lock_time = 5 [default=0]; // transaction lock_time optional uint32 expiry = 6; // only for Decred and Zcash - optional bool _overwintered = 7 [deprecated=true]; // deprecated in 2.3.2, the field is not needed as it can be derived from `version` + optional bool overwintered = 7 [deprecated=true]; // deprecated in 2.3.2, the field is not needed as it can be derived from `version` optional uint32 version_group_id = 8; // only for Zcash, nVersionGroupId optional uint32 timestamp = 9; // only for Peercoin optional uint32 branch_id = 10; // only for Zcash, BRANCH_ID @@ -196,7 +196,7 @@ message TxAck { optional bytes extra_data = 8; // only for Dash, Zcash optional uint32 extra_data_len = 9; // only for Dash, Zcash optional uint32 expiry = 10; // only for Decred and Zcash - optional bool _overwintered = 11 [deprecated=true]; // Zcash only; deprecated in 2.3.2, the field is not needed, it can be derived from `version` + optional bool overwintered = 11 [deprecated=true]; // Zcash only; deprecated in 2.3.2, the field is not needed, it can be derived from `version` optional uint32 version_group_id = 12; // only for Zcash, nVersionGroupId optional uint32 timestamp = 13; // only for Peercoin optional uint32 branch_id = 14; // only for Zcash, BRANCH_ID diff --git a/python/src/trezorlib/messages/SignTx.py b/python/src/trezorlib/messages/SignTx.py index 31bc2fb7e..c34c04bb1 100644 --- a/python/src/trezorlib/messages/SignTx.py +++ b/python/src/trezorlib/messages/SignTx.py @@ -21,7 +21,7 @@ class SignTx(p.MessageType): version: int = None, lock_time: int = None, expiry: int = None, - _overwintered: bool = None, + overwintered: bool = None, version_group_id: int = None, timestamp: int = None, branch_id: int = None, @@ -32,7 +32,7 @@ class SignTx(p.MessageType): self.version = version self.lock_time = lock_time self.expiry = expiry - self._overwintered = _overwintered + self.overwintered = overwintered self.version_group_id = version_group_id self.timestamp = timestamp self.branch_id = branch_id @@ -46,7 +46,7 @@ class SignTx(p.MessageType): 4: ('version', p.UVarintType, 0), # default=1 5: ('lock_time', p.UVarintType, 0), # default=0 6: ('expiry', p.UVarintType, 0), - 7: ('_overwintered', p.BoolType, 0), + 7: ('overwintered', p.BoolType, 0), 8: ('version_group_id', p.UVarintType, 0), 9: ('timestamp', p.UVarintType, 0), 10: ('branch_id', p.UVarintType, 0), diff --git a/python/src/trezorlib/messages/TransactionType.py b/python/src/trezorlib/messages/TransactionType.py index 3b96cefed..c3eb7698d 100644 --- a/python/src/trezorlib/messages/TransactionType.py +++ b/python/src/trezorlib/messages/TransactionType.py @@ -28,7 +28,7 @@ class TransactionType(p.MessageType): extra_data: bytes = None, extra_data_len: int = None, expiry: int = None, - _overwintered: bool = None, + overwintered: bool = None, version_group_id: int = None, timestamp: int = None, branch_id: int = None, @@ -43,7 +43,7 @@ class TransactionType(p.MessageType): self.extra_data = extra_data self.extra_data_len = extra_data_len self.expiry = expiry - self._overwintered = _overwintered + self.overwintered = overwintered self.version_group_id = version_group_id self.timestamp = timestamp self.branch_id = branch_id @@ -61,7 +61,7 @@ class TransactionType(p.MessageType): 8: ('extra_data', p.BytesType, 0), 9: ('extra_data_len', p.UVarintType, 0), 10: ('expiry', p.UVarintType, 0), - 11: ('_overwintered', p.BoolType, 0), + 11: ('overwintered', p.BoolType, 0), 12: ('version_group_id', p.UVarintType, 0), 13: ('timestamp', p.UVarintType, 0), 14: ('branch_id', p.UVarintType, 0),