diff options
| author | Riccardo Spagni <ric@spagni.net> | 2016-10-22 22:19:43 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2016-10-22 22:19:43 +0200 |
| commit | 4f6ea2eb6a7bdc189858dc752e7b06210500db48 (patch) | |
| tree | f5160146aa628bbf6f4cfb81a1dc8c987537b7ae /src/wallet/api/wallet.cpp | |
| parent | Merge pull request #1228 (diff) | |
| parent | wallet2_api: recognize full size payment ids as valid (diff) | |
| download | monero-4f6ea2eb6a7bdc189858dc752e7b06210500db48.tar.xz | |
Merge pull request #1229
b6b86ab wallet2_api: recognize full size payment ids as valid (moneromooo-monero)
Diffstat (limited to 'src/wallet/api/wallet.cpp')
| -rw-r--r-- | src/wallet/api/wallet.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/wallet/api/wallet.cpp b/src/wallet/api/wallet.cpp index 470f51281..747263b54 100644 --- a/src/wallet/api/wallet.cpp +++ b/src/wallet/api/wallet.cpp @@ -158,8 +158,13 @@ std::string Wallet::genPaymentId() bool Wallet::paymentIdValid(const string &paiment_id) { - crypto::hash8 pid; - return tools::wallet2::parse_short_payment_id(paiment_id, pid); + crypto::hash8 pid8; + 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() |