4rkal/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2025-01-28 18:56:31 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #13 from monero-project/master

Browse Source 
Pull monero-project changes
This commit is contained in:
Neozaru 2014-07-06 11:54:59 +02:00
commit d47f4cecf7
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/cryptonote_config.h
View File

@ -6,6 +6,7 @@
#define CRYPTONOTE_MAX_BLOCK_NUMBER 500000000 #define CRYPTONOTE_MAX_BLOCK_NUMBER 500000000
#define CRYPTONOTE_MAX_BLOCK_SIZE 500000000 // block header blob limit, never used! #define CRYPTONOTE_MAX_BLOCK_SIZE 500000000 // block header blob limit, never used!
#define CRYPTONOTE_GETBLOCKTEMPLATE_MAX_BLOCK_SIZE 196608 //size of block (bytes) that is the maximum that miners will produce
#define CRYPTONOTE_MAX_TX_SIZE 1000000000 #define CRYPTONOTE_MAX_TX_SIZE 1000000000
#define CRYPTONOTE_PUBLIC_ADDRESS_TEXTBLOB_VER 0 #define CRYPTONOTE_PUBLIC_ADDRESS_TEXTBLOB_VER 0
#define CRYPTONOTE_PUBLIC_ADDRESS_BASE58_PREFIX 18 // addresses start with "4" #define CRYPTONOTE_PUBLIC_ADDRESS_BASE58_PREFIX 18 // addresses start with "4"

14
src/cryptonote_core/tx_pool.cpp
View File

@ -152,7 +152,7 @@ namespace cryptonote
<< "transaction id = " << get_transaction_hash(tx)); << "transaction id = " << get_transaction_hash(tx));
auto it_in_set = key_image_set.find(get_transaction_hash(tx)); auto it_in_set = key_image_set.find(get_transaction_hash(tx));
CHECK_AND_ASSERT_MES(key_image_set.size(), false, "transaction id not found in key_image set, img=" << txin.k_image << ENDL CHECK_AND_ASSERT_MES(it_in_set != key_image_set.end(), false, "transaction id not found in key_image set, img=" << txin.k_image << ENDL
<< "transaction id = " << get_transaction_hash(tx)); << "transaction id = " << get_transaction_hash(tx));
key_image_set.erase(it_in_set); key_image_set.erase(it_in_set);
if(!key_image_set.size()) if(!key_image_set.size())
@ -351,7 +351,7 @@ namespace cryptonote
ss << "id: " << txe.first << ENDL ss << "id: " << txe.first << ENDL
<< "blob_size: " << txd.blob_size << ENDL << "blob_size: " << txd.blob_size << ENDL
<< "fee: " << txd.fee << ENDL << "fee: " << txd.fee << ENDL
<< "kept_by_block: " << txd.kept_by_block << ENDL << "kept_by_block: " << (txd.kept_by_block ? "true":"false") << ENDL
<< "max_used_block_height: " << txd.max_used_block_height << ENDL << "max_used_block_height: " << txd.max_used_block_height << ENDL
<< "max_used_block_id: " << txd.max_used_block_id << ENDL << "max_used_block_id: " << txd.max_used_block_id << ENDL
<< "last_failed_height: " << txd.last_failed_height << ENDL << "last_failed_height: " << txd.last_failed_height << ENDL
@ -363,7 +363,7 @@ namespace cryptonote
<< obj_to_json_str(txd.tx) << ENDL << obj_to_json_str(txd.tx) << ENDL
<< "blob_size: " << txd.blob_size << ENDL << "blob_size: " << txd.blob_size << ENDL
<< "fee: " << txd.fee << ENDL << "fee: " << txd.fee << ENDL
<< "kept_by_block: " << txd.kept_by_block << ENDL << "kept_by_block: " << (txd.kept_by_block ? "true":"false") << ENDL
<< "max_used_block_height: " << txd.max_used_block_height << ENDL << "max_used_block_height: " << txd.max_used_block_height << ENDL
<< "max_used_block_id: " << txd.max_used_block_id << ENDL << "max_used_block_id: " << txd.max_used_block_id << ENDL
<< "last_failed_height: " << txd.last_failed_height << ENDL << "last_failed_height: " << txd.last_failed_height << ENDL
@ -424,6 +424,14 @@ namespace cryptonote
if (tx.second.blob_size > upper_transaction_size_limit) if (tx.second.blob_size > upper_transaction_size_limit)
continue; continue;
// If adding this tx will make the block size
// greater than CRYPTONOTE_GETBLOCKTEMPLATE_MAX
// _BLOCK_SIZE bytes, reject the tx; this will
// keep block sizes from becoming too unwieldly
// to propagate at 60s block times.
if ( (total_size + tx.second.blob_size) > CRYPTONOTE_GETBLOCKTEMPLATE_MAX_BLOCK_SIZE )
continue;
// If adding this tx will make the block size // If adding this tx will make the block size
// greater than 130% of the median, reject the // greater than 130% of the median, reject the
// tx; this will keep down largely punitive tx // tx; this will keep down largely punitive tx