diff options
| author | Riccardo Spagni <ric@spagni.net> | 2016-01-31 15:19:40 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2016-01-31 15:19:40 +0200 |
| commit | ac961f66f69642563fe46c3be40efdad521c2c4e (patch) | |
| tree | c662b2241380a793c64c2f1254de14cdf34339c8 /src/cryptonote_core/tx_pool.h | |
| parent | Merge pull request #629 (diff) | |
| parent | new flush_txpool command, and associated RPC call (diff) | |
| download | monero-ac961f66f69642563fe46c3be40efdad521c2c4e.tar.xz | |
Merge pull request #630
bf6d147 new flush_txpool command, and associated RPC call (moneromooo-monero)
6288295 rpc: add missing return on error when getting a tx (moneromooo-monero)
b7e37b7 simplewallet: show_transfers can now show just failed txes (moneromooo-monero)
b11539f wallet: detect and handle failed outgoing transfers (moneromooo-monero)
4b23714 tx_pool: serialize missing kept_by_block flag (moneromooo-monero)
Diffstat (limited to 'src/cryptonote_core/tx_pool.h')
| -rw-r--r-- | src/cryptonote_core/tx_pool.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/cryptonote_core/tx_pool.h b/src/cryptonote_core/tx_pool.h index 34dc1f72f..0d2a81ca5 100644 --- a/src/cryptonote_core/tx_pool.h +++ b/src/cryptonote_core/tx_pool.h @@ -110,7 +110,7 @@ namespace cryptonote /*bool flush_pool(const std::strig& folder); bool inflate_pool(const std::strig& folder);*/ -#define CURRENT_MEMPOOL_ARCHIVE_VER 10 +#define CURRENT_MEMPOOL_ARCHIVE_VER 11 template<class archive_t> void serialize(archive_t & a, const unsigned int version) @@ -243,6 +243,9 @@ namespace boost return; ar & td.last_relayed_time; ar & td.relayed; + if (version < 11) + return; + ar & td.kept_by_block; } } } |