aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorRiccardo Spagni <ric@spagni.net>2019-03-17 17:51:52 +0200
committerRiccardo Spagni <ric@spagni.net>2019-03-17 17:51:52 +0200
commit47c278c90f09ddd015711bef04ed1deb394ad778 (patch)
treed1d296e588758eda8ee6f15047a7b88ffa72dcef /src
parentMerge pull request #5165 (diff)
parentdevice/trezor: dummy payment ID fix (diff)
downloadmonero-47c278c90f09ddd015711bef04ed1deb394ad778.tar.xz
Merge pull request #5166
75e5aafd device/trezor: dummy payment ID fix (Dusan Klinec)
Diffstat (limited to 'src')
-rw-r--r--src/device_trezor/device_trezor.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/device_trezor/device_trezor.cpp b/src/device_trezor/device_trezor.cpp
index 1c726d102..ceb6111e0 100644
--- a/src/device_trezor/device_trezor.cpp
+++ b/src/device_trezor/device_trezor.cpp
@@ -396,7 +396,7 @@ namespace trezor {
const bool nonce_required = tdata.tsx_data.has_payment_id() && tdata.tsx_data.payment_id().size() > 0;
const bool has_nonce = cryptonote::find_tx_extra_field_by_type(tx_extra_fields, nonce);
- CHECK_AND_ASSERT_THROW_MES(has_nonce == nonce_required, "Transaction nonce presence inconsistent");
+ CHECK_AND_ASSERT_THROW_MES(has_nonce || !nonce_required, "Transaction nonce not present");
if (nonce_required){
const std::string & payment_id = tdata.tsx_data.payment_id();