|
|
|
@ -1867,6 +1867,20 @@ void wallet2::cache_tx_data(const cryptonote::transaction& tx, const crypto::has
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
//----------------------------------------------------------------------------------------------------
|
|
|
|
|
bool wallet2::spends_one_of_ours(const cryptonote::transaction &tx) const
|
|
|
|
|
{
|
|
|
|
|
for (const auto &in: tx.vin)
|
|
|
|
|
{
|
|
|
|
|
if (in.type() != typeid(cryptonote::txin_to_key))
|
|
|
|
|
continue;
|
|
|
|
|
const cryptonote::txin_to_key &in_to_key = boost::get<cryptonote::txin_to_key>(in);
|
|
|
|
|
auto it = m_key_images.find(in_to_key.k_image);
|
|
|
|
|
if (it != m_key_images.end())
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
//----------------------------------------------------------------------------------------------------
|
|
|
|
|
void wallet2::process_new_transaction(const crypto::hash &txid, const cryptonote::transaction& tx, const std::vector<uint64_t> &o_indices, uint64_t height, uint8_t block_version, uint64_t ts, bool miner_tx, bool pool, bool double_spend_seen, const tx_cache_data &tx_cache_data, std::map<std::pair<uint64_t, uint64_t>, size_t> *output_tracker_cache)
|
|
|
|
|
{
|
|
|
|
|
PERF_TIMER(process_new_transaction);
|
|
|
|
@ -2153,7 +2167,7 @@ void wallet2::process_new_transaction(const crypto::hash &txid, const cryptonote
|
|
|
|
|
}
|
|
|
|
|
LOG_PRINT_L0("Received money: " << print_money(td.amount()) << ", with tx: " << txid);
|
|
|
|
|
if (0 != m_callback)
|
|
|
|
|
m_callback->on_money_received(height, txid, tx, td.m_amount, td.m_subaddr_index, td.m_tx.unlock_time);
|
|
|
|
|
m_callback->on_money_received(height, txid, tx, td.m_amount, td.m_subaddr_index, spends_one_of_ours(tx), td.m_tx.unlock_time);
|
|
|
|
|
}
|
|
|
|
|
total_received_1 += amount;
|
|
|
|
|
notify = true;
|
|
|
|
@ -2230,7 +2244,7 @@ void wallet2::process_new_transaction(const crypto::hash &txid, const cryptonote
|
|
|
|
|
|
|
|
|
|
LOG_PRINT_L0("Received money: " << print_money(td.amount()) << ", with tx: " << txid);
|
|
|
|
|
if (0 != m_callback)
|
|
|
|
|
m_callback->on_money_received(height, txid, tx, td.m_amount, td.m_subaddr_index, td.m_tx.unlock_time);
|
|
|
|
|
m_callback->on_money_received(height, txid, tx, td.m_amount, td.m_subaddr_index, spends_one_of_ours(tx), td.m_tx.unlock_time);
|
|
|
|
|
}
|
|
|
|
|
total_received_1 += extra_amount;
|
|
|
|
|
notify = true;
|
|
|
|
|