From e75f18ba571aa952adf289c92dae89c52c3713dd Mon Sep 17 00:00:00 2001 From: Peter Conrad Date: Fri, 23 Mar 2018 15:13:45 +0100 Subject: [PATCH] Removed hardfork code for CORE_429 --- libraries/chain/asset_evaluator.cpp | 11 +---------- libraries/chain/hardfork.d/CORE_429.hf | 4 ---- tests/tests/fee_tests.cpp | 2 -- 3 files changed, 1 insertion(+), 16 deletions(-) delete mode 100644 libraries/chain/hardfork.d/CORE_429.hf diff --git a/libraries/chain/asset_evaluator.cpp b/libraries/chain/asset_evaluator.cpp index 8103e2b5..1346584c 100644 --- a/libraries/chain/asset_evaluator.cpp +++ b/libraries/chain/asset_evaluator.cpp @@ -128,20 +128,11 @@ void asset_create_evaluator::pay_fee() object_id_type asset_create_evaluator::do_apply( const asset_create_operation& op ) { try { - bool hf_429 = fee_is_odd && db().head_block_time() > HARDFORK_CORE_429_TIME; - const asset_dynamic_data_object& dyn_asset = db().create( [&]( asset_dynamic_data_object& a ) { a.current_supply = 0; - a.fee_pool = core_fee_paid - (hf_429 ? 1 : 0); + a.fee_pool = core_fee_paid - (fee_is_odd ? 1 : 0); }); - if( fee_is_odd && !hf_429 ) - { - const auto& core_dd = db().get( asset_id_type() ).dynamic_data( db() ); - db().modify( core_dd, [=]( asset_dynamic_data_object& dd ) { - dd.current_supply++; - }); - } asset_bitasset_data_id_type bit_asset_id; if( op.bitasset_opts.valid() ) diff --git a/libraries/chain/hardfork.d/CORE_429.hf b/libraries/chain/hardfork.d/CORE_429.hf deleted file mode 100644 index 748f10f9..00000000 --- a/libraries/chain/hardfork.d/CORE_429.hf +++ /dev/null @@ -1,4 +0,0 @@ -// bitshares-core #429 rounding issue when creating assets -#ifndef HARDFORK_CORE_429_TIME -#define HARDFORK_CORE_429_TIME (fc::time_point_sec( 1511793600 )) -#endif diff --git a/tests/tests/fee_tests.cpp b/tests/tests/fee_tests.cpp index affa1bff..6d2d489d 100644 --- a/tests/tests/fee_tests.cpp +++ b/tests/tests/fee_tests.cpp @@ -991,8 +991,6 @@ BOOST_AUTO_TEST_CASE( issue_429_test ) verify_asset_supplies( db ); - generate_blocks( HARDFORK_CORE_429_TIME + 10 ); - { signed_transaction tx; asset_create_operation op;