mirror of
https://github.com/monero-project/monero.git
synced 2024-11-18 00:37:43 +00:00
Merge pull request #5120
45b7df70
wallet_rpc_server: remove detached short payment ids support (moneromooo-monero)
This commit is contained in:
commit
4f06639d63
1 changed files with 1 additions and 5 deletions
|
@ -691,13 +691,9 @@ namespace tools
|
||||||
if (wallet2::parse_long_payment_id(payment_id_str, long_payment_id)) {
|
if (wallet2::parse_long_payment_id(payment_id_str, long_payment_id)) {
|
||||||
cryptonote::set_payment_id_to_tx_extra_nonce(extra_nonce, long_payment_id);
|
cryptonote::set_payment_id_to_tx_extra_nonce(extra_nonce, long_payment_id);
|
||||||
}
|
}
|
||||||
/* or short payment ID */
|
|
||||||
else if (wallet2::parse_short_payment_id(payment_id_str, short_payment_id)) {
|
|
||||||
cryptonote::set_encrypted_payment_id_to_tx_extra_nonce(extra_nonce, short_payment_id);
|
|
||||||
}
|
|
||||||
else {
|
else {
|
||||||
er.code = WALLET_RPC_ERROR_CODE_WRONG_PAYMENT_ID;
|
er.code = WALLET_RPC_ERROR_CODE_WRONG_PAYMENT_ID;
|
||||||
er.message = "Payment id has invalid format: \"" + payment_id_str + "\", expected 16 or 64 character string";
|
er.message = "Payment id has invalid format: \"" + payment_id_str + "\", expected 64 character string";
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue