From 9b79928a15475552ebeb18abeca982963d4436ac Mon Sep 17 00:00:00 2001 From: Alexander Suslikov Date: Tue, 26 Mar 2019 17:27:54 +0300 Subject: [PATCH] Added sidechain hardfork time --- libraries/chain/db_block.cpp | 2 +- libraries/chain/hardfork.d/sidechain.hf | 4 ++++ tests/sidechain_tests/main.cpp | 2 ++ 3 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 libraries/chain/hardfork.d/sidechain.hf diff --git a/libraries/chain/db_block.cpp b/libraries/chain/db_block.cpp index e8e18f3e..7fa091e4 100644 --- a/libraries/chain/db_block.cpp +++ b/libraries/chain/db_block.cpp @@ -604,7 +604,7 @@ void database::_apply_block( const signed_block& next_block ) uint32_t skip = get_node_properties().skip_flags; _applied_ops.clear(); - if( is_sidechain_fork_needed() ) + if( head_block_time() > HARDFORK_SIDECHAIN_TIME && is_sidechain_fork_needed() ) { perform_sidechain_fork(); } diff --git a/libraries/chain/hardfork.d/sidechain.hf b/libraries/chain/hardfork.d/sidechain.hf new file mode 100644 index 00000000..44400d44 --- /dev/null +++ b/libraries/chain/hardfork.d/sidechain.hf @@ -0,0 +1,4 @@ +// sidechain fardfork +#ifndef HARDFORK_SIDECHAIN_TIME +#define HARDFORK_SIDECHAIN_TIME (fc::time_point_sec( 1550000000 )) +#endif diff --git a/tests/sidechain_tests/main.cpp b/tests/sidechain_tests/main.cpp index 405e7c10..6c2174b0 100644 --- a/tests/sidechain_tests/main.cpp +++ b/tests/sidechain_tests/main.cpp @@ -34,6 +34,8 @@ boost::unit_test::test_suite* init_unit_test_suite(int argc, char* argv[]) { if( genesis_timestamp_str != nullptr ) { GRAPHENE_TESTING_GENESIS_TIMESTAMP = std::stoul( genesis_timestamp_str ); + } else { + GRAPHENE_TESTING_GENESIS_TIMESTAMP = 1550000001; } std::cout << "GRAPHENE_TESTING_GENESIS_TIMESTAMP is " << GRAPHENE_TESTING_GENESIS_TIMESTAMP << std::endl; return nullptr;