Git-Mirrors/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2025-07-24 04:20:45 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #765

Browse source 
d5d46e6 tests: obligatory hardfork unit build fix after interface change (moneromooo-monero)
25672d3 wallet: pass std::function by const ref, not value (moneromooo-monero)
0be6e08 wallet: do not leak owned amounts to the daemon unless --trusted-daemon (moneromooo-monero)
12146da wallet: change sweep_dust to sweep_unmixable (moneromooo-monero)
600a3cf New RPC and daemon command to get output histogram (moneromooo-monero)
f9a2fd2 wallet: handle rare case where fee adjustment can bump to the next kB (moneromooo-monero)
f26651a wallet: factor fee calculation (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2016-03-27 14:09:53 +02:00
commit 2b57845766
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD
23 changed files with 390 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/cryptonote_core/blockchain.cpp
View file

@ -3322,6 +3322,11 @@ bool Blockchain::get_hard_fork_voting_info(uint8_t version, uint32_t &window, ui
return m_hardfork->get_voting_info(version, window, votes, threshold, earliest_height, voting);
}
std::map<uint64_t, uint64_t> Blockchain:: get_output_histogram(const std::vector<uint64_t> &amounts) const
{
return m_db->get_output_histogram(amounts);
}
void Blockchain::load_compiled_in_block_hashes()
{
if (m_fast_sync && get_blocks_dat_start(m_testnet) != nullptr)

9
src/cryptonote_core/blockchain.h
View file

@ -682,6 +682,15 @@ namespace cryptonote
*/
bool flush_txes_from_pool(const std::list<crypto::hash> &txids);
/**
* @brief return a histogram of outputs on the blockchain
*
* @param amounts optional set of amounts to lookup
*
* @return a set of amount/instances
*/
std::map<uint64_t, uint64_t> get_output_histogram(const std::vector<uint64_t> &amounts) const;
/**
* @brief perform a check on all key images in the blockchain
*