github-jwinterm/aeon
1
0
Fork 0
mirror of https://github.com/jwinterm/aeon.git synced 2026-10-17 05:01:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #17 from iamsmooth/master

Browse Source 
Track failed outgoing connections and slow down retries
Increase default transaction fee to 0.01
This commit is contained in:
aeonix
2015-08-11 03:15:11 -07:00
parent 207da48559 ca3b36dfeb
commit a2643fdbd7
3 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/cryptonote_config.h
+4 -4
View File
@@ -59,10 +59,10 @@
#define CRYPTONOTE_BLOCK_GRANTED_FULL_REWARD_ZONE 20000 //size of block (bytes) after which reward for block calculated using block size
#define CRYPTONOTE_COINBASE_BLOB_RESERVED_SIZE 600
#define CRYPTONOTE_DISPLAY_DECIMAL_POINT 12
// COIN - number of smallest units in one coin
#define COIN ((uint64_t)100000000) // pow(10, 8)
#define DEFAULT_FEE ((uint64_t)1000000) // pow(10, 6)
// COIN - number of smallest units in one coin (currently unused except by tests)
#define COIN ((uint64_t)1000000000000) // pow(10, 12)
#define DEFAULT_FEE ((uint64_t)10000000000) // pow(10, 10)
#define MINIMUM_RELAY_FEE ((uint64_t)1000000) // pow(10, 6)
#define ORPHANED_BLOCKS_MAX_COUNT 100
src/cryptonote_core/tx_pool.cpp
+6 -2
View File
@@ -86,7 +86,7 @@ namespace cryptonote
}
uint64_t fee = inputs_amount - outputs_amount;
if (!kept_by_block && fee < DEFAULT_FEE)
if (!kept_by_block && fee < MINIMUM_RELAY_FEE)
{
LOG_ERROR("transaction fee is not enough: " << print_money(fee) << ", minumim fee: " << print_money(DEFAULT_FEE));
tvc.m_verifivation_failed = true;
@@ -449,9 +449,13 @@ namespace cryptonote
if (total_size > median_size)
break;
// Don't mine transactions with too-low fee
if (DEFAULT_FEE > MINIMUM_RELAY_FEE && tx.second.fee < DEFAULT_FEE)
continue;
// Skip transactions that are not ready to be
// included into the blockchain or that are
// missing key images
// double spends of another transaction already in the template
if (!is_transaction_ready_to_go(tx.second) || have_key_images(k_images, tx.second.tx))
continue;
src/p2p/net_node.inl
+10 -1
View File
@@ -644,6 +644,13 @@ namespace nodetool
#undef LOG_PRINT_CC_PRIORITY_NODE
//-----------------------------------------------------------------------------------
template<class t_payload_net_handler>
void node_server<t_payload_net_handler>::cache_connect_fail_info(const net_address& addr)
{
CRITICAL_REGION_LOCAL(m_conn_fails_cache_lock);
m_conn_fails_cache[addr] = time(NULL);
}
//-----------------------------------------------------------------------------------
template<class t_payload_net_handler>
bool node_server<t_payload_net_handler>::is_addr_recently_failed(const net_address& addr)
@@ -703,8 +710,10 @@ namespace nodetool
<< "] last_seen: " << (pe.last_seen ? epee::misc_utils::get_time_interval_string(time(NULL) - pe.last_seen) : "never"));
if(!try_to_connect_and_handshake_with_new_peer(pe.adr, false, pe.last_seen, use_white_list))
{
cache_connect_fail_info(pe.adr);
continue;
}
return true;
}
return false;