diff options
| author | Riccardo Spagni <ric@spagni.net> | 2018-04-28 16:56:22 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2018-04-28 16:56:22 +0200 |
| commit | 93e76e14a205a84cbea8ab0a3e35f37bf9d08b42 (patch) | |
| tree | c392fddd159783c0c4f4d343608fce3c7267e4bb /src/cryptonote_core | |
| parent | 35299644b20048264329bb36a235eb7c28fa1718 (diff) | |
| parent | ffeeefde609822bca8a05ac6919ca0de2fc3fcc0 (diff) | |
| download | monzero-core-93e76e14a205a84cbea8ab0a3e35f37bf9d08b42.tar.gz monzero-core-93e76e14a205a84cbea8ab0a3e35f37bf9d08b42.tar.xz monzero-core-93e76e14a205a84cbea8ab0a3e35f37bf9d08b42.zip | |
Merge pull request #3685
ffeeefde speedup get_output_histogram for all amounts when min_count > 0 (moneromooo-monero)
2dae0f20 wallet2: add missing parameters to get_output_histogram (moneromooo-monero)
Diffstat (limited to 'src/cryptonote_core')
| -rw-r--r-- | src/cryptonote_core/blockchain.cpp | 4 | ||||
| -rw-r--r-- | src/cryptonote_core/blockchain.h | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/cryptonote_core/blockchain.cpp b/src/cryptonote_core/blockchain.cpp index f02a1f8d6..25e97f71f 100644 --- a/src/cryptonote_core/blockchain.cpp +++ b/src/cryptonote_core/blockchain.cpp @@ -4322,9 +4322,9 @@ uint64_t Blockchain::get_difficulty_target() const return get_current_hard_fork_version() < 2 ? DIFFICULTY_TARGET_V1 : DIFFICULTY_TARGET_V2; } -std::map<uint64_t, std::tuple<uint64_t, uint64_t, uint64_t>> Blockchain:: get_output_histogram(const std::vector<uint64_t> &amounts, bool unlocked, uint64_t recent_cutoff) const +std::map<uint64_t, std::tuple<uint64_t, uint64_t, uint64_t>> Blockchain:: get_output_histogram(const std::vector<uint64_t> &amounts, bool unlocked, uint64_t recent_cutoff, uint64_t min_count) const { - return m_db->get_output_histogram(amounts, unlocked, recent_cutoff); + return m_db->get_output_histogram(amounts, unlocked, recent_cutoff, min_count); } std::list<std::pair<Blockchain::block_extended_info,uint64_t>> Blockchain::get_alternative_chains() const diff --git a/src/cryptonote_core/blockchain.h b/src/cryptonote_core/blockchain.h index 4423199de..61096fb26 100644 --- a/src/cryptonote_core/blockchain.h +++ b/src/cryptonote_core/blockchain.h @@ -827,10 +827,11 @@ namespace cryptonote * @param amounts optional set of amounts to lookup * @param unlocked whether to restrict instances to unlocked ones * @param recent_cutoff timestamp to consider outputs as recent + * @param min_count return only amounts with at least that many instances * * @return a set of amount/instances */ - std::map<uint64_t, std::tuple<uint64_t, uint64_t, uint64_t>> get_output_histogram(const std::vector<uint64_t> &amounts, bool unlocked, uint64_t recent_cutoff) const; + std::map<uint64_t, std::tuple<uint64_t, uint64_t, uint64_t>> get_output_histogram(const std::vector<uint64_t> &amounts, bool unlocked, uint64_t recent_cutoff, uint64_t min_count = 0) const; /** * @brief perform a check on all key images in the blockchain |