Merge pull request #8213

7dcfccb wallet_rpc_server: fix make_integrated_address with no payment id (moneromooo-monero)
This commit is contained in:
luigi1111 2022-04-06 00:15:40 -04:00
commit 9a124f6811
No known key found for this signature in database
GPG key ID: F4ACA0183641E010

View file

@ -1760,12 +1760,6 @@ namespace tools
er.message = "Already integrated address"; er.message = "Already integrated address";
return false; return false;
} }
if (req.payment_id.empty())
{
er.code = WALLET_RPC_ERROR_CODE_WRONG_PAYMENT_ID;
er.message = "Payment ID shouldn't be left unspecified";
return false;
}
res.integrated_address = get_account_integrated_address_as_str(m_wallet->nettype(), info.address, payment_id); res.integrated_address = get_account_integrated_address_as_str(m_wallet->nettype(), info.address, payment_id);
} }
res.payment_id = epee::string_tools::pod_to_hex(payment_id); res.payment_id = epee::string_tools::pod_to_hex(payment_id);