Charon/blockchain
1
0
Fork 0
forked from lthn/blockchain
Code Pull requests Activity

more post-merge conflicts solved

Browse source
This commit is contained in:
sowle 2022-05-26 19:00:15 +02:00
parent f24b1350ab
commit a731c338de
No known key found for this signature in database
GPG key ID: C07A24B2D89D49FC
1 changed files with 1 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/currency_core/blockchain_storage.cpp
View file

@ -3363,7 +3363,7 @@ bool blockchain_storage::push_transaction_to_global_outs_index(const transaction
global_indexes.push_back(m_db_outputs.get_item_size(ot.amount) - 1);
if (ot.target.type() == typeid(txout_htlc) && !is_hardfork_active(3))
{
LOG_ERROR("Error: Transaction with txout_htlc before is_after_hardfork_3_zone(before height " << m_core_runtime_config.hard_forks.hard_fork_03_starts_after_height << ")");
LOG_ERROR("Error: Transaction with txout_htlc before hardfork 3 (before height " << m_core_runtime_config.hard_forks.get_str_height_the_hardfork_active_after(3) << ")");
return false;
}
}
@ -5876,18 +5876,6 @@ bool blockchain_storage::is_hardfork_active(size_t hardfork_id) const
return m_core_runtime_config.is_hardfork_active_for_height(hardfork_id, m_db_blocks.size()); // note using m_db_blocks.size() ( == top_block_height + 1 )
}
//------------------------------------------------------------------
bool blockchain_storage::is_after_hardfork_4_zone()const
{
return is_after_hardfork_4_zone(m_db_blocks.size());
}
//------------------------------------------------------------------
bool blockchain_storage::is_after_hardfork_4_zone(uint64_t height)const
{
if (height > m_core_runtime_config.hard_forks.hard_fork_04_starts_after_height)
return true;
return false;
}
//------------------------------------------------------------------
bool blockchain_storage::prevalidate_block(const block& bl)
{
uint64_t block_height = get_block_height(bl);