diff --git a/genesis.json b/genesis.json index 55dd9c2c..e5b89c42 100644 --- a/genesis.json +++ b/genesis.json @@ -258,6 +258,9 @@ "maximum_tournament_start_time_in_future": 5184000, "maximum_tournament_start_delay": 259200, "maximum_tournament_number_of_wins": 25, + "gpos_period": 15552000, + "gpos_subperiod": 2592000, + "gpos_period_start": "2019-02-01T00:00:00", "extensions": [] }, "initial_bts_accounts": [], diff --git a/libraries/chain/hardfork.d/GPOS.hf b/libraries/chain/hardfork.d/GPOS.hf index c9855f5d..3137123f 100644 --- a/libraries/chain/hardfork.d/GPOS.hf +++ b/libraries/chain/hardfork.d/GPOS.hf @@ -1,4 +1,4 @@ -// GPOS HARDFORK Saturday, January 5, 2019 4:39:39 PM +// GPOS HARDFORK Friday, February 1, 2019 12:00:00 AM #ifndef HARDFORK_GPOS_TIME -#define HARDFORK_GPOS_TIME (fc::time_point_sec( 1546706379 )) +#define HARDFORK_GPOS_TIME (fc::time_point_sec( 1548979200 )) #endif \ No newline at end of file diff --git a/tests/tests/gpos_tests.cpp b/tests/tests/gpos_tests.cpp index b154eaf4..ebae4c6b 100644 --- a/tests/tests/gpos_tests.cpp +++ b/tests/tests/gpos_tests.cpp @@ -707,13 +707,13 @@ BOOST_AUTO_TEST_CASE( competing_proposals ) // only w2 is getting paid as it haves more votes and money is only enough for 1 BOOST_CHECK_EQUAL(w1.worker.get().balance(db).balance.amount.value, 0); - BOOST_CHECK_EQUAL(w2.worker.get().balance(db).balance.amount.value, 73488756706); + BOOST_CHECK_EQUAL(w2.worker.get().balance(db).balance.amount.value, 100000000000); generate_blocks(db.get_dynamic_global_properties().next_maintenance_time); generate_block(); BOOST_CHECK_EQUAL(w1.worker.get().balance(db).balance.amount.value, 0); - BOOST_CHECK_EQUAL(w2.worker.get().balance(db).balance.amount.value, 123488756706); + BOOST_CHECK_EQUAL(w2.worker.get().balance(db).balance.amount.value, 150000000000); generate_blocks(db.get_dynamic_global_properties().next_maintenance_time); generate_block(); @@ -726,7 +726,7 @@ BOOST_AUTO_TEST_CASE( competing_proposals ) BOOST_CHECK_EQUAL(w2.total_votes_for, 150); BOOST_CHECK_EQUAL(w1.worker.get().balance(db).balance.amount.value, 0); - BOOST_CHECK_EQUAL(w2.worker.get().balance(db).balance.amount.value, 173488756706); + BOOST_CHECK_EQUAL(w2.worker.get().balance(db).balance.amount.value, 200000000000); generate_blocks(db.get_dynamic_global_properties().next_maintenance_time); generate_block(); @@ -739,7 +739,7 @@ BOOST_AUTO_TEST_CASE( competing_proposals ) // worker is sil getting paid as days pass BOOST_CHECK_EQUAL(w1.worker.get().balance(db).balance.amount.value, 0); - BOOST_CHECK_EQUAL(w2.worker.get().balance(db).balance.amount.value, 223488756706); + BOOST_CHECK_EQUAL(w2.worker.get().balance(db).balance.amount.value, 250000000000); generate_blocks(db.get_dynamic_global_properties().next_maintenance_time); generate_block(); @@ -751,7 +751,7 @@ BOOST_AUTO_TEST_CASE( competing_proposals ) BOOST_CHECK_EQUAL(w2.total_votes_for, 50); BOOST_CHECK_EQUAL(w1.worker.get().balance(db).balance.amount.value, 0); - BOOST_CHECK_EQUAL(w2.worker.get().balance(db).balance.amount.value, 273488756706); + BOOST_CHECK_EQUAL(w2.worker.get().balance(db).balance.amount.value, 300000000000); generate_blocks(db.get_dynamic_global_properties().next_maintenance_time); generate_block(); @@ -764,7 +764,7 @@ BOOST_AUTO_TEST_CASE( competing_proposals ) BOOST_CHECK_EQUAL(w2.total_votes_for, 0); BOOST_CHECK_EQUAL(w1.worker.get().balance(db).balance.amount.value, 0); - BOOST_CHECK_EQUAL(w2.worker.get().balance(db).balance.amount.value, 273488756706); + BOOST_CHECK_EQUAL(w2.worker.get().balance(db).balance.amount.value, 300000000000); } catch (fc::exception &e) { edump((e.to_detail_string()));