|
|
|
@ -102,10 +102,37 @@ namespace tools
|
|
|
|
|
de.amount = it->amount;
|
|
|
|
|
dsts.push_back(de);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
std::vector<uint8_t> extra;
|
|
|
|
|
if (!req.payment_id.empty()) {
|
|
|
|
|
|
|
|
|
|
/* Just to clarify */
|
|
|
|
|
const std::string& payment_id_str = req.payment_id;
|
|
|
|
|
|
|
|
|
|
crypto::hash payment_id;
|
|
|
|
|
/* Parse payment ID */
|
|
|
|
|
if (!wallet2::parse_payment_id(payment_id_str, payment_id)) {
|
|
|
|
|
er.code = WALLET_RPC_ERROR_CODE_WRONG_PAYMENT_ID;
|
|
|
|
|
er.message = "Payment id has invalid format: \"" + payment_id_str + "\", expected 64-character string";
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
std::string extra_nonce;
|
|
|
|
|
cryptonote::set_payment_id_to_tx_extra_nonce(extra_nonce, payment_id);
|
|
|
|
|
|
|
|
|
|
/* Append Payment ID data into extra */
|
|
|
|
|
if (!cryptonote::add_extra_nonce_to_tx_extra(extra, extra_nonce)) {
|
|
|
|
|
er.code = WALLET_RPC_ERROR_CODE_WRONG_PAYMENT_ID;
|
|
|
|
|
er.message = "Something went wront with payment_id. Please check its format: \"" + payment_id_str + "\", expected 64-character string";
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
try
|
|
|
|
|
{
|
|
|
|
|
cryptonote::transaction tx;
|
|
|
|
|
m_wallet.transfer(dsts, req.mixin, req.unlock_time, req.fee, std::vector<uint8_t>(), tx);
|
|
|
|
|
m_wallet.transfer(dsts, req.mixin, req.unlock_time, req.fee, extra, tx);
|
|
|
|
|
res.tx_hash = boost::lexical_cast<std::string>(cryptonote::get_transaction_hash(tx));
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|