diff options
| author | NoodleDoodleNoodleDoodleNoodleDoodleNoo <xeven77@outlook.com> | 2015-07-11 21:24:42 -0700 |
|---|---|---|
| committer | NoodleDoodleNoodleDoodleNoodleDoodleNoo <xeven77@outlook.com> | 2015-07-15 23:20:20 -0700 |
| commit | 2e293a563e3c237060638670d190dce467045868 (patch) | |
| tree | bd93371d28ac2797bf26eab343939380b925ef29 /src/cryptonote_core | |
| parent | Pause miner before preparing for incoming blocks (diff) | |
| download | monero-2e293a563e3c237060638670d190dce467045868.tar.xz | |
Fixed binary size issue due to embedded checkpoint data.
Fixed OSX compilation issues due to random lmdb resize points.
Fixed infinite loop bug when calling core::get_block_template(..).
Diffstat (limited to 'src/cryptonote_core')
| -rw-r--r-- | src/cryptonote_core/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/cryptonote_core/tx_pool.cpp | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/cryptonote_core/CMakeLists.txt b/src/cryptonote_core/CMakeLists.txt index 564dc3210..6315fc4f0 100644 --- a/src/cryptonote_core/CMakeLists.txt +++ b/src/cryptonote_core/CMakeLists.txt @@ -84,7 +84,7 @@ target_link_libraries(cryptonote_core ${Boost_PROGRAM_OPTIONS_LIBRARY} ${Boost_SERIALIZATION_LIBRARY} LINK_PRIVATE - ${Blocks} + ${Blocks} ${Boost_FILESYSTEM_LIBRARY} ${Boost_SYSTEM_LIBRARY} ${Boost_THREAD_LIBRARY} diff --git a/src/cryptonote_core/tx_pool.cpp b/src/cryptonote_core/tx_pool.cpp index 12fd3fe62..ac71a0e52 100644 --- a/src/cryptonote_core/tx_pool.cpp +++ b/src/cryptonote_core/tx_pool.cpp @@ -511,8 +511,8 @@ namespace cryptonote // Can not exceed maximum block size if (max_total_size < total_size + tx_it->second.blob_size) { - sorted_it++; - continue; + sorted_it++; + continue; } // If adding this tx will make the block size @@ -522,8 +522,8 @@ namespace cryptonote // to propagate at 60s block times. if ( (total_size + tx_it->second.blob_size) > CRYPTONOTE_GETBLOCKTEMPLATE_MAX_BLOCK_SIZE ) { - sorted_it++; - continue; + sorted_it++; + continue; } // If we've exceeded the penalty free size, @@ -536,8 +536,8 @@ namespace cryptonote // missing key images if (!is_transaction_ready_to_go(tx_it->second) || have_key_images(k_images, tx_it->second.tx)) { - sorted_it++; - continue; + sorted_it++; + continue; } bl.tx_hashes.push_back(tx_it->first); |