Merge pull request #5166

75e5aafd device/trezor: dummy payment ID fix (Dusan Klinec)
This commit is contained in:
Riccardo Spagni 2019-03-17 17:51:52 +02:00
commit 47c278c90f
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD

View File

@ -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 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); 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){ if (nonce_required){
const std::string & payment_id = tdata.tsx_data.payment_id(); const std::string & payment_id = tdata.tsx_data.payment_id();