|
|
|
@ -691,13 +691,9 @@ namespace tools
|
|
|
|
|
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);
|
|
|
|
|
}
|
|
|
|
|
/* 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 {
|
|
|
|
|
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;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|