From 1d66b859c910aa66571adee0db0df23230ada788 Mon Sep 17 00:00:00 2001 From: pbattu123 Date: Wed, 18 Mar 2020 17:18:15 -0300 Subject: [PATCH] update GPOS HF to fall in before SONS HF, remove check --- libraries/chain/hardfork.d/GPOS.hf | 4 ++-- libraries/chain/vesting_balance_evaluator.cpp | 3 --- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/libraries/chain/hardfork.d/GPOS.hf b/libraries/chain/hardfork.d/GPOS.hf index 39dd7ac4..8e93f80f 100644 --- a/libraries/chain/hardfork.d/GPOS.hf +++ b/libraries/chain/hardfork.d/GPOS.hf @@ -1,4 +1,4 @@ -// GPOS HARDFORK Monday, 16 March 2020 19:00:00 GMT +// GPOS HARDFORK Monday, 31 Dec 2019 00:00:00 GMT #ifndef HARDFORK_GPOS_TIME -#define HARDFORK_GPOS_TIME (fc::time_point_sec( 1584385200 )) +#define HARDFORK_GPOS_TIME (fc::time_point_sec( 1577750400 )) #endif diff --git a/libraries/chain/vesting_balance_evaluator.cpp b/libraries/chain/vesting_balance_evaluator.cpp index 9f93a5ff..dc91a449 100644 --- a/libraries/chain/vesting_balance_evaluator.cpp +++ b/libraries/chain/vesting_balance_evaluator.cpp @@ -42,9 +42,6 @@ void_result vesting_balance_create_evaluator::do_evaluate( const vesting_balance FC_ASSERT( d.get_balance( creator_account.id, op.amount.asset_id ) >= op.amount ); FC_ASSERT( !op.amount.asset_id(d).is_transfer_restricted() ); - if(d.head_block_time() < HARDFORK_SON_TIME) // Todo: can be removed after gpos hf time pass - FC_ASSERT( op.balance_type == vesting_balance_type::normal); - if(d.head_block_time() >= HARDFORK_SON_TIME && op.balance_type == vesting_balance_type::son) // Todo: hf check can be removed after pass FC_ASSERT( op.amount.amount >= d.get_global_properties().parameters.son_vesting_amount() );