From 256eeb3eac9a279a19801c0a3e7a8e83376e3bc8 Mon Sep 17 00:00:00 2001 From: Apr Team Date: Mon, 21 May 2018 18:15:00 +0300 Subject: [PATCH] Added hardfork logic. --- libraries/chain/event_group_evaluator.cpp | 2 +- libraries/chain/hardfork.d/1000.hf | 3 +++ libraries/chain/hardfork.d/1001.hf | 4 ++++ libraries/chain/sport_evaluator.cpp | 2 +- 4 files changed, 9 insertions(+), 2 deletions(-) create mode 100644 libraries/chain/hardfork.d/1000.hf create mode 100644 libraries/chain/hardfork.d/1001.hf diff --git a/libraries/chain/event_group_evaluator.cpp b/libraries/chain/event_group_evaluator.cpp index cd4f6a78..de44aa34 100644 --- a/libraries/chain/event_group_evaluator.cpp +++ b/libraries/chain/event_group_evaluator.cpp @@ -100,7 +100,7 @@ void_result event_group_update_evaluator::do_apply(const event_group_update_oper void_result event_group_delete_evaluator::do_evaluate(const event_group_delete_operation& op) { try { - FC_ASSERT(db().head_block_time() >= HARDFORK_1000_TIME); + FC_ASSERT(db().head_block_time() >= HARDFORK_1001_TIME); FC_ASSERT(trx_state->_is_proposed_trx); //check for event group existence diff --git a/libraries/chain/hardfork.d/1000.hf b/libraries/chain/hardfork.d/1000.hf new file mode 100644 index 00000000..f0500d03 --- /dev/null +++ b/libraries/chain/hardfork.d/1000.hf @@ -0,0 +1,3 @@ +#ifndef HARDFORK_1000_TIME +#define HARDFORK_1000_TIME (fc::time_point_sec( 1458752400 )) +#endif diff --git a/libraries/chain/hardfork.d/1001.hf b/libraries/chain/hardfork.d/1001.hf new file mode 100644 index 00000000..b4962a4a --- /dev/null +++ b/libraries/chain/hardfork.d/1001.hf @@ -0,0 +1,4 @@ +// added delete sport and delete event group operations +#ifndef HARDFORK_1001_TIME +#define HARDFORK_1001_TIME (fc::time_point_sec( 1458752400 )) +#endif diff --git a/libraries/chain/sport_evaluator.cpp b/libraries/chain/sport_evaluator.cpp index 3af8093e..64994306 100644 --- a/libraries/chain/sport_evaluator.cpp +++ b/libraries/chain/sport_evaluator.cpp @@ -74,7 +74,7 @@ void_result sport_update_evaluator::do_apply(const sport_update_operation& op) void_result sport_delete_evaluator::do_evaluate( const sport_delete_operation& op ) { try { - FC_ASSERT(db().head_block_time() >= HARDFORK_1000_TIME); + FC_ASSERT(db().head_block_time() >= HARDFORK_1001_TIME); FC_ASSERT(trx_state->_is_proposed_trx); //check for sport existence