From 27f401d24e9632b8959a556a84eb500a63683433 Mon Sep 17 00:00:00 2001 From: sierra19XX <15652887+sierra19XX@users.noreply.github.com> Date: Wed, 1 Apr 2020 23:05:22 +1100 Subject: [PATCH] [SON-313] - Limit SON functionality when min no. of sons are not present (#329) * [SON-313] - Limit SON functionality when min no. of sons are not present * Revert SON HF related checks and tests * Remove the capability to process proposals in plugin Co-authored-by: satyakoneru <15652887+satyakoneru@users.noreply.github.com> --- libraries/chain/db_maint.cpp | 6 +++--- libraries/chain/include/graphene/chain/config.hpp | 3 +-- .../graphene/chain/protocol/chain_parameters.hpp | 13 ++++--------- libraries/chain/son_evaluator.cpp | 4 ---- libraries/chain/son_wallet_deposit_evaluator.cpp | 2 ++ libraries/chain/son_wallet_withdraw_evaluator.cpp | 2 ++ .../peerplays_sidechain/sidechain_net_handler.hpp | 1 + .../peerplays_sidechain_plugin.cpp | 3 --- .../peerplays_sidechain/sidechain_net_handler.cpp | 8 ++++++++ programs/witness_node/genesis.json | 3 ++- tests/tests/son_operations_tests.cpp | 2 +- 11 files changed, 24 insertions(+), 23 deletions(-) diff --git a/libraries/chain/db_maint.cpp b/libraries/chain/db_maint.cpp index 98f998eb..db46b7b9 100644 --- a/libraries/chain/db_maint.cpp +++ b/libraries/chain/db_maint.cpp @@ -170,8 +170,6 @@ void database::pay_sons() if(s.txs_signed > 0){ auto son_params = get_global_properties().parameters; share_type pay = (s.txs_signed * son_budget.value)/total_txs_signed; - // TODO: Remove me after QA - ilog( "pay ${p} to ${s} for ${t} transactions signed", ("p", pay.value)("s", s.id)("t",s.txs_signed) ); const auto& idx = get_index_type().indices().get(); auto son_obj = idx.find( s.owner ); modify( *son_obj, [&]( son_object& _son_obj) @@ -339,6 +337,8 @@ void database::update_son_wallet(const vector& new_active_sons) } } + should_recreate_pw = should_recreate_pw && (new_active_sons.size() >= get_chain_properties().immutable_parameters.min_son_count); + if (should_recreate_pw) { // Create new son_wallet_object, to initiate wallet recreation create( [&]( son_wallet_object& obj ) { @@ -830,7 +830,7 @@ void database::process_budget() pay_sons(); rec.leftover_son_funds = dpo.son_budget; available_funds += rec.leftover_son_funds; - son_budget = gpo.parameters.son_pay_daily_max(); + son_budget = gpo.parameters.son_pay_max(); son_budget = std::min(son_budget, available_funds); rec.son_budget = son_budget; available_funds -= son_budget; diff --git a/libraries/chain/include/graphene/chain/config.hpp b/libraries/chain/include/graphene/chain/config.hpp index 1aa63d45..14554ddc 100644 --- a/libraries/chain/include/graphene/chain/config.hpp +++ b/libraries/chain/include/graphene/chain/config.hpp @@ -229,14 +229,13 @@ #define TOURNAMENT_MAX_WHITELIST_LENGTH 1000 #define TOURNAMENT_MAX_START_TIME_IN_FUTURE (60*60*24*7*4) // 1 month #define TOURNAMENT_MAX_START_DELAY (60*60*24*7) // 1 week -#define MIN_SON_MEMBER_COUNT 15 #define SON_VESTING_AMOUNT (50*GRAPHENE_BLOCKCHAIN_PRECISION) // 50 PPY #define SON_VESTING_PERIOD (60*60*24*2) // 2 days #define SON_DEREGISTER_TIME (60*60*12) // 12 Hours in seconds #define SON_HEARTBEAT_FREQUENCY (60*3) // 3 minutes in seconds #define SON_DOWN_TIME (60*3*2) // 2 Heartbeats in seconds #define SON_PAY_TIME (60*60*24) // 1 day -#define MIN_SON_PAY_DAILY_MAX (GRAPHENE_BLOCKCHAIN_PRECISION * int64_t(200)) +#define SON_PAY_MAX (GRAPHENE_BLOCKCHAIN_PRECISION * int64_t(200)) #define SWEEPS_DEFAULT_DISTRIBUTION_PERCENTAGE (2*GRAPHENE_1_PERCENT) #define SWEEPS_DEFAULT_DISTRIBUTION_ASSET (graphene::chain::asset_id_type(0)) #define SWEEPS_VESTING_BALANCE_MULTIPLIER 100000000 diff --git a/libraries/chain/include/graphene/chain/protocol/chain_parameters.hpp b/libraries/chain/include/graphene/chain/protocol/chain_parameters.hpp index 2c5c979a..03b26183 100644 --- a/libraries/chain/include/graphene/chain/protocol/chain_parameters.hpp +++ b/libraries/chain/include/graphene/chain/protocol/chain_parameters.hpp @@ -50,10 +50,9 @@ namespace graphene { namespace chain { optional < uint32_t > gpos_period_start = HARDFORK_GPOS_TIME.sec_since_epoch(); optional < uint32_t > gpos_vesting_lockin_period = GPOS_VESTING_LOCKIN_PERIOD; - optional < uint16_t > son_count; optional < uint32_t > son_vesting_amount; optional < uint32_t > son_vesting_period; - optional < uint32_t > son_pay_daily_max; + optional < uint32_t > son_pay_max; optional < uint32_t > son_pay_time; optional < uint32_t > son_deregister_time; optional < uint32_t > son_heartbeat_frequency; @@ -139,17 +138,14 @@ namespace graphene { namespace chain { inline account_id_type sweeps_vesting_accumulator_account()const { return extensions.value.sweeps_vesting_accumulator_account.valid() ? *extensions.value.sweeps_vesting_accumulator_account : SWEEPS_ACCUMULATOR_ACCOUNT; } - inline uint16_t son_count()const { - return extensions.value.son_count.valid() ? *extensions.value.son_count : MIN_SON_MEMBER_COUNT; - } inline uint32_t son_vesting_amount()const { return extensions.value.son_vesting_amount.valid() ? *extensions.value.son_vesting_amount : SON_VESTING_AMOUNT; /// current period start date } inline uint32_t son_vesting_period()const { return extensions.value.son_vesting_period.valid() ? *extensions.value.son_vesting_period : SON_VESTING_PERIOD; /// current period start date } - inline uint16_t son_pay_daily_max()const { - return extensions.value.son_pay_daily_max.valid() ? *extensions.value.son_pay_daily_max : MIN_SON_PAY_DAILY_MAX; + inline uint16_t son_pay_max()const { + return extensions.value.son_pay_max.valid() ? *extensions.value.son_pay_max : SON_PAY_MAX; } inline uint16_t son_pay_time()const { return extensions.value.son_pay_time.valid() ? *extensions.value.son_pay_time : SON_PAY_TIME; @@ -188,7 +184,6 @@ FC_REFLECT( graphene::chain::parameter_extension, (betting_rake_fee_percentage) (permitted_betting_odds_increments) (live_betting_delay_time) - (son_count) (sweeps_distribution_percentage) (sweeps_distribution_asset) (sweeps_vesting_accumulator_account) @@ -198,7 +193,7 @@ FC_REFLECT( graphene::chain::parameter_extension, (gpos_vesting_lockin_period) (son_vesting_amount) (son_vesting_period) - (son_pay_daily_max) + (son_pay_max) (son_pay_time) (son_deregister_time) (son_heartbeat_frequency) diff --git a/libraries/chain/son_evaluator.cpp b/libraries/chain/son_evaluator.cpp index 021d8d20..3974550f 100644 --- a/libraries/chain/son_evaluator.cpp +++ b/libraries/chain/son_evaluator.cpp @@ -141,8 +141,6 @@ object_id_type son_heartbeat_evaluator::do_apply(const son_heartbeat_operation& { sso.current_interval_downtime += op.ts.sec_since_epoch() - sso.last_down_timestamp.sec_since_epoch(); sso.last_active_timestamp = op.ts; - // TODO: Remove me after sidechain tx signing is finished - sso.txs_signed = sso.txs_signed + 1; } ); db().modify(*itr, [&is_son_active](son_object &so) { @@ -156,8 +154,6 @@ object_id_type son_heartbeat_evaluator::do_apply(const son_heartbeat_operation& db().modify( itr->statistics( db() ), [&]( son_statistics_object& sso ) { sso.last_active_timestamp = op.ts; - // TODO: Remove me after sidechain tx signing is finished - sso.txs_signed = sso.txs_signed + 1; } ); } } diff --git a/libraries/chain/son_wallet_deposit_evaluator.cpp b/libraries/chain/son_wallet_deposit_evaluator.cpp index 643c967c..88336b2e 100644 --- a/libraries/chain/son_wallet_deposit_evaluator.cpp +++ b/libraries/chain/son_wallet_deposit_evaluator.cpp @@ -1,6 +1,7 @@ #include #include +#include #include #include #include @@ -130,6 +131,7 @@ void_result process_son_wallet_deposit_evaluator::do_evaluate(const son_wallet_d { try{ FC_ASSERT(db().head_block_time() >= HARDFORK_SON_TIME, "Not allowed until SON HARDFORK"); FC_ASSERT( op.payer == db().get_global_properties().parameters.son_account(), "SON paying account must be set as payer." ); + FC_ASSERT(db().get_global_properties().active_sons.size() >= db().get_chain_properties().immutable_parameters.min_son_count, "Min required voted SONs not present"); const auto& idx = db().get_index_type().indices().get(); const auto& itr = idx.find(op.son_wallet_deposit_id); diff --git a/libraries/chain/son_wallet_withdraw_evaluator.cpp b/libraries/chain/son_wallet_withdraw_evaluator.cpp index 8f843bd1..4552cc0f 100644 --- a/libraries/chain/son_wallet_withdraw_evaluator.cpp +++ b/libraries/chain/son_wallet_withdraw_evaluator.cpp @@ -1,6 +1,7 @@ #include #include +#include #include #include #include @@ -128,6 +129,7 @@ void_result process_son_wallet_withdraw_evaluator::do_evaluate(const son_wallet_ { try{ FC_ASSERT(db().head_block_time() >= HARDFORK_SON_TIME, "Not allowed until SON HARDFORK"); FC_ASSERT( op.payer == db().get_global_properties().parameters.son_account(), "SON paying account must be set as payer." ); + FC_ASSERT(db().get_global_properties().active_sons.size() >= db().get_chain_properties().immutable_parameters.min_son_count, "Min required voted SONs not present"); const auto& idx = db().get_index_type().indices().get(); const auto& itr = idx.find(op.son_wallet_withdraw_id); diff --git a/libraries/plugins/peerplays_sidechain/include/graphene/peerplays_sidechain/sidechain_net_handler.hpp b/libraries/plugins/peerplays_sidechain/include/graphene/peerplays_sidechain/sidechain_net_handler.hpp index 60582de6..7cfb7469 100644 --- a/libraries/plugins/peerplays_sidechain/include/graphene/peerplays_sidechain/sidechain_net_handler.hpp +++ b/libraries/plugins/peerplays_sidechain/include/graphene/peerplays_sidechain/sidechain_net_handler.hpp @@ -6,6 +6,7 @@ #include #include +#include #include #include #include diff --git a/libraries/plugins/peerplays_sidechain/peerplays_sidechain_plugin.cpp b/libraries/plugins/peerplays_sidechain/peerplays_sidechain_plugin.cpp index d15d4eee..ca46c6d5 100644 --- a/libraries/plugins/peerplays_sidechain/peerplays_sidechain_plugin.cpp +++ b/libraries/plugins/peerplays_sidechain/peerplays_sidechain_plugin.cpp @@ -445,9 +445,6 @@ bool peerplays_sidechain_plugin_impl::is_valid_son_proposal(const chain::proposa } } - ilog("=================================================="); - ilog("Proposal not approved ${proposal}", ("proposal", proposal)); - ilog("=================================================="); return false; } diff --git a/libraries/plugins/peerplays_sidechain/sidechain_net_handler.cpp b/libraries/plugins/peerplays_sidechain/sidechain_net_handler.cpp index 34a1cd85..b43d6097 100644 --- a/libraries/plugins/peerplays_sidechain/sidechain_net_handler.cpp +++ b/libraries/plugins/peerplays_sidechain/sidechain_net_handler.cpp @@ -143,6 +143,10 @@ void sidechain_net_handler::sidechain_event_data_received(const sidechain_event_ } void sidechain_net_handler::process_deposits() { + if (database.get_global_properties().active_sons.size() < database.get_chain_properties().immutable_parameters.min_son_count) { + return; + } + const auto &idx = database.get_index_type().indices().get(); const auto &idx_range = idx.equal_range(std::make_tuple(sidechain, true, false)); @@ -188,6 +192,10 @@ void sidechain_net_handler::process_deposits() { } void sidechain_net_handler::process_withdrawals() { + if (database.get_global_properties().active_sons.size() < database.get_chain_properties().immutable_parameters.min_son_count) { + return; + } + const auto &idx = database.get_index_type().indices().get(); const auto &idx_range = idx.equal_range(std::make_tuple(sidechain, true, false)); diff --git a/programs/witness_node/genesis.json b/programs/witness_node/genesis.json index 12f2581e..6ed0a612 100644 --- a/programs/witness_node/genesis.json +++ b/programs/witness_node/genesis.json @@ -344,6 +344,7 @@ "maximum_asset_feed_publishers": 10, "maximum_witness_count": 1001, "maximum_committee_count": 1001, + "maximum_son_count": 15, "maximum_authority_membership": 10, "reserve_percent_of_fee": 2000, "network_percent_of_fee": 2000, @@ -383,7 +384,7 @@ "gpos_vesting_lockin_period": 2592000, "son_vesting_amount": 5000000, "son_vesting_period": 172800, - "son_pay_daily_max": 20000000, + "son_pay_max": 20000000, "son_pay_time": 86400, "son_deregister_time": 43200, "son_heartbeat_frequency": 180, diff --git a/tests/tests/son_operations_tests.cpp b/tests/tests/son_operations_tests.cpp index 050b9c65..33a69a83 100644 --- a/tests/tests/son_operations_tests.cpp +++ b/tests/tests/son_operations_tests.cpp @@ -329,7 +329,7 @@ BOOST_AUTO_TEST_CASE( son_pay_test ) // Make witness budget zero so that amount can be allocated to SON db.modify( db.get_global_properties(), [&]( global_property_object& _gpo ) { - _gpo.parameters.extensions.value.son_pay_daily_max = 200; + _gpo.parameters.extensions.value.son_pay_max = 200; _gpo.parameters.witness_pay_per_block = 0; } ); // Upgrades pay fee and this goes to reserve