Merge pull request #8067

53be72c make_uri disallows standalone payment ids (woodser)
This commit is contained in:
luigi1111 2021-11-30 17:05:48 -05:00
commit 3ed0cc6e20
No known key found for this signature in database
GPG key ID: F4ACA0183641E010

View file

@ -13728,12 +13728,8 @@ std::string wallet2::make_uri(const std::string &address, const std::string &pay
if (!payment_id.empty()) if (!payment_id.empty())
{ {
crypto::hash pid32; error = "Standalone payment id deprecated, use integrated address instead";
if (!wallet2::parse_long_payment_id(payment_id, pid32)) return std::string();
{
error = "Invalid payment id";
return std::string();
}
} }
std::string uri = "monero:" + address; std::string uri = "monero:" + address;