Merge pull request #1356

69b188c wallet2_api: fix payment ids from integrated addresses being ignored (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2016-11-24 12:53:59 +02:00
commit f801dc8567
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD

View file

@ -605,6 +605,17 @@ PendingTransaction *WalletImpl::createTransaction(const string &dst_addr, const
break; break;
} }
} }
else if (has_payment_id) {
std::string extra_nonce;
set_encrypted_payment_id_to_tx_extra_nonce(extra_nonce, payment_id_short);
bool r = add_extra_nonce_to_tx_extra(extra, extra_nonce);
if (!r) {
m_status = Status_Error;
m_errorString = tr("Failed to add short payment id: ") + epee::string_tools::pod_to_hex(payment_id_short);
break;
}
}
//std::vector<tools::wallet2::pending_tx> ptx_vector; //std::vector<tools::wallet2::pending_tx> ptx_vector;