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(..).
This commit is contained in:
NoodleDoodleNoodleDoodleNoodleDoodleNoo
2015-07-15 23:20:20 -07:00
parent 2b2ae36724
commit 2e293a563e
7 changed files with 15 additions and 9 deletions
+6 -6
View File
@@ -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);