tiamak/salvium
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix V1/V2 use of hard fork related parameters

Browse Source 
Some of it uses hardcoded height, which will need some thinking
for next (voted upon) fork.
This commit is contained in:
moneromooo-monero
2016-01-29 15:09:17 +00:00
parent 60b064c759
commit 3b1d7e03fc
13 changed files with 89 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/cryptonote_core/cryptonote_core.cpp
+6 -1
View File
@@ -358,6 +358,10 @@ namespace cryptonote
r = m_blockchain_storage.init(db, m_testnet, m_fakechain);
// now that we have a valid m_blockchain_storage, we can clean out any
// transactions in the pool that do not conform to the current fork
m_mempool.validate(m_blockchain_storage.get_current_hard_fork_version());
bool show_time_stats = command_line::get_arg(vm, command_line::arg_show_time_stats) != 0;
m_blockchain_storage.set_show_time_stats(show_time_stats);
#else
@@ -607,7 +611,8 @@ namespace cryptonote
return true;
}
return m_mempool.add_tx(tx, tx_hash, blob_size, tvc, keeped_by_block, relayed);
uint8_t version = m_blockchain_storage.get_current_hard_fork_version();
return m_mempool.add_tx(tx, tx_hash, blob_size, tvc, keeped_by_block, relayed, version);
}
//-----------------------------------------------------------------------------------------------
bool core::relay_txpool_transactions()