diff options
| author | Riccardo Spagni <ric@spagni.net> | 2015-05-13 11:18:22 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2015-05-13 11:18:22 +0200 |
| commit | 012164fff8fa43a83ae0a61fbc98e7935f63f552 (patch) | |
| tree | 257c042c6de95e4ffe3bc11c71f43b25e1ff4b8c /src/cryptonote_core/tx_pool.h | |
| parent | Merge pull request #274 (diff) | |
| parent | Sort txs by per-kb-fee for miners (diff) | |
| download | monero-012164fff8fa43a83ae0a61fbc98e7935f63f552.tar.xz | |
resolved merge conflict in tx_pool.cpp
Diffstat (limited to 'src/cryptonote_core/tx_pool.h')
| -rw-r--r-- | src/cryptonote_core/tx_pool.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/cryptonote_core/tx_pool.h b/src/cryptonote_core/tx_pool.h index 77f2e3483..7c8f4a449 100644 --- a/src/cryptonote_core/tx_pool.h +++ b/src/cryptonote_core/tx_pool.h @@ -34,6 +34,7 @@ #include <set> #include <unordered_map> #include <unordered_set> +#include <queue> #include <boost/serialization/version.hpp> #include <boost/utility.hpp> @@ -133,6 +134,12 @@ namespace cryptonote key_images_container m_spent_key_images; epee::math_helper::once_a_time_seconds<30> m_remove_stuck_tx_interval; + typedef std::unordered_map<crypto::hash, double> tx_by_fee_entry; + + //TODO: add fee_per_kb element to type tx_details and replace this + //functionality by just making m_transactions a std::set + std::set<tx_by_fee_entry> m_txs_by_fee; + //transactions_container m_alternative_transactions; std::string m_config_folder; |