Merge pull request #2269 from bitshares/hf-date-5

Set Mainnet HF time to 2020-09-28 17:02:00 UTC

Author: abitmore

libraries/chain/hardfork.d/CORE_2262.hf

@@ -1,6 +1,5 @@
 // bitshares-core issue #2262: Remove voting power from liquid BTS and tickets
 #ifndef HARDFORK_CORE_2262_TIME
-// Jan 1 2030, midnight; this is a dummy date until a hardfork date is scheduled
-#define HARDFORK_CORE_2262_TIME (fc::time_point_sec( 1893456000 ))
+#define HARDFORK_CORE_2262_TIME (fc::time_point_sec( 1601312520 )) // Monday, September 28, 2020 17:02:00 UTC
 #define HARDFORK_CORE_2262_PASSED(next_maint_time) (next_maint_time > HARDFORK_CORE_2262_TIME)
 #endif

libraries/chain/hardfork.d/LIQUIDITY_POOL.hf

@@ -1,6 +1,5 @@
 // Liquidity pool
 #ifndef HARDFORK_LIQUIDITY_POOL_TIME
-// Jan 1 2030, midnight; this is a dummy date until a hardfork date is scheduled
-#define HARDFORK_LIQUIDITY_POOL_TIME (fc::time_point_sec( 1893456000 ))
+#define HARDFORK_LIQUIDITY_POOL_TIME (fc::time_point_sec( 1601312520 )) // Monday, September 28, 2020 17:02:00 UTC
 #define HARDFORK_LIQUIDITY_POOL_PASSED(now) (now >= HARDFORK_LIQUIDITY_POOL_TIME)
 #endif

tests/tests/voting_tests.cpp

@@ -784,15 +784,16 @@ BOOST_AUTO_TEST_CASE( witness_votes_calculation )
       generate_blocks( db.get_dynamic_global_properties().next_maintenance_time );
 
       // pob activated
+      bool has_hf_2262 = ( HARDFORK_CORE_2262_PASSED( db.get_dynamic_global_properties().next_maintenance_time ) );
       expected_votes[0] = 0; // 225 days
       expected_votes[1] = 0; // 270 days
       expected_votes[2] = 0; // 315 days
       expected_votes[3] = 0; // 360 days
       int64_t base4 = 40 * 8 + (114 - 40) - 40;
-      expected_votes[4] = base4 - base4 * 2 / 8; // 405 days
+      expected_votes[4] = ( has_hf_2262 ? 0 : ( base4 - base4 * 2 / 8 ) ); // 405 days
       expected_votes[5] = 0; // 450 days
       expected_votes[6] = 0; // 495 days
-      int64_t base7 = 20 * 8 * 8 + (30 - 20) * 8 + (117 - 30 - 20) - (30 - 20);
+      int64_t base7 = 20 * 8 * 8 + ( has_hf_2262 ? 0 : ( (30 - 20) * 8 + (117 - 30 - 20) - (30 - 20) ) );
       expected_votes[7] = base7 - base7 * 5 / 8; // 540 days
       expected_votes[8] = 0; // 585 days
       expected_votes[9] = 0; // 630 days
@@ -808,16 +809,19 @@ BOOST_AUTO_TEST_CASE( witness_votes_calculation )
 
       expected_active_witnesses = original_wits;
       expected_active_witnesses.erase( *expected_active_witnesses.rbegin() );
-      expected_active_witnesses.erase( *expected_active_witnesses.rbegin() );
-      expected_active_witnesses.insert( wit_ids[4] );
+      if( !has_hf_2262 )
+      {
+         expected_active_witnesses.erase( *expected_active_witnesses.rbegin() );
+         expected_active_witnesses.insert( wit_ids[4] );
+      }
       expected_active_witnesses.insert( wit_ids[7] );
       BOOST_CHECK( db.get_global_properties().active_witnesses == expected_active_witnesses );
 
       // some days passed
       generate_blocks( tick_start_time + fc::days(60+180) );
       generate_blocks( db.get_dynamic_global_properties().next_maintenance_time );
 
-      bool has_hf_2262 = ( HARDFORK_CORE_2262_PASSED( db.get_dynamic_global_properties().next_maintenance_time ) );
+      has_hf_2262 = ( HARDFORK_CORE_2262_PASSED( db.get_dynamic_global_properties().next_maintenance_time ) );
       // check votes
       base4 = 40 * 6 + (114 - 40) - 40;
       expected_votes[4] = ( has_hf_2262 ? 0 : (base4 - base4 * 6 / 8) ); // 585 days