Merge pull request #3775

6f859e43 cryptonote: make sure outPk setup always happens (moneromooo-monero)
3880bf39 cryptonote_protocol_handler.inl: remove span read just now that failed to pass some basic tests (stoffu)
da249fd5 cryptonote_protocol_handler.inl: fix return type mismatches (int vs bool) (stoffu)
e3c68b90 README.md: mention building deps with -fPIC for static builds (moneromooo-monero)
c1886155 unit_tests: fix build after get_output_didstribution signature change (moneromooo-monero)
82b05d50 Adding required library (dependency of boost::this_thread::sleep_for) (Gene Peters)
f9d0827b Fix broken interactive daemon 'limit' commands plus RPC calls (rbrunner7)
53a1962d epee: Drop deprecated Boost.Thread header (Jan Beich)
18c2f6e2 mlog: fix setting no logs (moneromooo-monero)
7346a59c Build: update miniupnp submodule (anonimal)
dad10775 Only log an error if fork version is higher AND is not known. (Thaer Khawaja)
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)
5bd7f760 import_multisig_info: fix sanity check crash in detach_blockchain (Mikhail Mitkevichl)
19e01378 Build: remove UPnP definition from snap (anonimal)
6b853980 Build: update CMake and p2p for in-tree miniupnp (anonimal)
859db52f CMake: update new location of in-tree miniupnpc (anonimal)
f21df05c Build: add miniupnp submodule (anonimal)
10685648 Build: remove in-tree miniupnpc (anonimal)
0b88fff3 simplewallet: fix help message of sign_transfer (stoffu)
f82c10dc WalletManagerImpl: reuse existing connection to daemon instead of reconnectivng every time (stoffu)
998c1461 daemon: read config file before reading any other args (stoffu)
f914df84 device: add a one off override keyword where appropriate (moneromooo-monero)
51b511be simplewallet: add version command (moneromooo-monero)
35d1269f daemon: add a version command (moneromooo-monero)
d8584fc8 util: log stack trace on crash (moneromooo-monero)
875c1cab wallet2: increase rpc timeout for get_output_distribution (moneromooo-monero)
70f23217 add top height to get_output_distribution, and cache it for rct (moneromooo-monero)
8c7363fb rpc: add missing perf timer for get_output_distribution (moneromooo-monero)
b5d6c723 wallet2: store subaddress lookahead settings (stoffu)
3367ed86 blockchain_blackball: fix build with CLANG 5 (moneromooo-monero)
94b899db Use 'boost' mutex instead of 'std' mutex (cslashm)
2c274e05 Fix sub-address tx scan. (cslashm)
73951cbd wallet2: request transactions in slices when scanning for known rings (moneromooo-monero)
25fe67e4 rpc: allow getting pruned blocks from gettransactions (moneromooo-monero)
08343aba tx_pool: fix loading with colliding key images (moneromooo-monero)
a9cc88ee common: make this build with unbound 1.4.20 (moneromooo-monero)
24acb66e wallet2: fix misc issues when the ringdb can't be initialized (moneromooo-monero)
0b26c4d5 wallet2: move segregation height to v7 (moneromooo-monero)
eecfb57d wallet: warn if not using the default ring size (moneromooo-monero)
aa5c2e01 simplewallet: warn about key reuse on startup (moneromooo-monero)
1e0958c0 wallet: fix default mixin (4 -> 6) (sneurlax)
0beb94f3 device: fix endianess dependence on subaddress secret key generation (moneromooo-monero)
11c933e1 fix lambda compile error on openbsd (moneromooo-monero)
c77d2bfa Add the possibility to export private view key for fast scan. (cslashm)
100b7bc1 Change mutex lock model to avoid dead lock and ensure locks are always released. (cslashm)
641dfc99 Automatic height setup when creating/restoring hw device. (cslashm)
dac3895a update block hashes for checkpoints.dat (Riccardo Spagni)
b1398fff core: fix use of uninitialised data (moneromooo-monero)

tests/unit_tests/hardfork.cpp

@@ -112,7 +112,7 @@ public:
   virtual bool for_all_outputs(std::function<bool(uint64_t amount, const crypto::hash &tx_hash, uint64_t height, size_t tx_idx)> f) const { return true; }
   virtual bool for_all_outputs(uint64_t amount, const std::function<bool(uint64_t height)> &f) const { return true; }
   virtual bool is_read_only() const { return false; }
-  virtual 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 { return std::map<uint64_t, std::tuple<uint64_t, uint64_t, uint64_t>>(); }
+  virtual 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) const { return std::map<uint64_t, std::tuple<uint64_t, uint64_t, uint64_t>>(); }
 
   virtual void add_txpool_tx(const transaction &tx, const txpool_tx_meta_t& details) {}
   virtual void update_txpool_tx(const crypto::hash &txid, const txpool_tx_meta_t& details) {}