Merge pull request #4888

b0d9d605 cn_deserialize: allow parsing partially valid tx extra (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2018-12-04 17:31:43 +02:00
commit 0e0777e4d1
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD

View File

@ -169,6 +169,7 @@ int main(int argc, char* argv[])
return 1;
}
bool full;
cryptonote::block block;
cryptonote::transaction tx;
std::vector<cryptonote::tx_extra_field> fields;
@ -200,9 +201,9 @@ int main(int argc, char* argv[])
std::cout << "No fields were found in tx_extra" << std::endl;
}
}
else if (cryptonote::parse_tx_extra(std::vector<uint8_t>(blob.begin(), blob.end()), fields) && !fields.empty())
else if (((full = cryptonote::parse_tx_extra(std::vector<uint8_t>(blob.begin(), blob.end()), fields)) || true) && !fields.empty())
{
std::cout << "Parsed tx_extra:" << std::endl;
std::cout << "Parsed" << (full ? "" : " partial") << " tx_extra:" << std::endl;
print_extra_fields(fields);
}
else