Merge pull request #1229

b6b86ab wallet2_api: recognize full size payment ids as valid (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2016-10-22 22:19:43 +02:00
commit 4f6ea2eb6a
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD

View file

@ -158,8 +158,13 @@ std::string Wallet::genPaymentId()
bool Wallet::paymentIdValid(const string &paiment_id) bool Wallet::paymentIdValid(const string &paiment_id)
{ {
crypto::hash8 pid; crypto::hash8 pid8;
return tools::wallet2::parse_short_payment_id(paiment_id, pid); if (tools::wallet2::parse_short_payment_id(paiment_id, pid8))
return true;
crypto::hash pid;
if (tools::wallet2::parse_long_payment_id(paiment_id, pid))
return true;
return false;
} }
uint64_t Wallet::maximumAllowedAmount() uint64_t Wallet::maximumAllowedAmount()