diff options
| author | Riccardo Spagni <ric@spagni.net> | 2014-09-25 08:24:42 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2014-09-25 08:24:42 +0200 |
| commit | 59a8366bb18653f14142321a9d85377ceaef8fad (patch) | |
| tree | bad5d2d8ce4e7fa651b7e03a4e749a823032a0f2 /src/cryptonote_core/tx_pool.h | |
| parent | Merge pull request #160 from tewinget/remove_ldns_dep (diff) | |
| download | monero-59a8366bb18653f14142321a9d85377ceaef8fad.tar.xz | |
Revert "low risk, potentially varint overflow bug patched thanks to BBR"
This reverts commit 4e2b2b942daa4206ec44c66e59863670dfe3fde4.
Diffstat (limited to 'src/cryptonote_core/tx_pool.h')
| -rw-r--r-- | src/cryptonote_core/tx_pool.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/cryptonote_core/tx_pool.h b/src/cryptonote_core/tx_pool.h index fb623a3d2..7617765cc 100644 --- a/src/cryptonote_core/tx_pool.h +++ b/src/cryptonote_core/tx_pool.h @@ -56,7 +56,7 @@ namespace cryptonote { public: tx_memory_pool(blockchain_storage& bchs); - bool add_tx(const transaction &tx, const crypto::hash &id, tx_verification_context& tvc, bool keeped_by_block); + bool add_tx(const transaction &tx, const crypto::hash &id, size_t blob_size, tx_verification_context& tvc, bool keeped_by_block); bool add_tx(const transaction &tx, tx_verification_context& tvc, bool keeped_by_block); //gets tx and remove it from pool bool take_tx(const crypto::hash &id, transaction &tx, size_t& blob_size, uint64_t& fee); @@ -81,7 +81,7 @@ namespace cryptonote /*bool flush_pool(const std::strig& folder); bool inflate_pool(const std::strig& folder);*/ -#define CURRENT_MEMPOOL_ARCHIVE_VER 9 +#define CURRENT_MEMPOOL_ARCHIVE_VER 8 template<class archive_t> void serialize(archive_t & a, const unsigned int version) |