Peerplays_Blockchain/peerplays_migrated
1
0
Fork 0
Code Issues 35 Pull requests 4 Projects Releases 20 Packages Wiki Activity Actions

Merge pull request #222 from peerplays-network/feature/BLOCKBACK-182

Browse source 
[BLOCKBACK-182] set extensions default values
This commit is contained in:
pbattu123 2019-11-25 10:49:25 -04:00 committed by GitHub
commit 0ecf2e8d0e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
libraries/chain/committee_member_evaluator.cpp
View file

@ -77,15 +77,7 @@ void_result committee_member_update_evaluator::do_apply( const committee_member_
void_result committee_member_update_global_parameters_evaluator::do_evaluate(const committee_member_update_global_parameters_operation& o) void_result committee_member_update_global_parameters_evaluator::do_evaluate(const committee_member_update_global_parameters_operation& o)
{ try { { try {
FC_ASSERT(trx_state->_is_proposed_trx); FC_ASSERT(trx_state->_is_proposed_trx);
if( db().head_block_time() < HARDFORK_1000_TIME ) // TODO: remove after hf
FC_ASSERT( !o.new_parameters.extensions.value.min_bet_multiplier.valid()
&& !o.new_parameters.extensions.value.max_bet_multiplier.valid()
&& !o.new_parameters.extensions.value.betting_rake_fee_percentage.valid()
&& !o.new_parameters.extensions.value.permitted_betting_odds_increments.valid()
&& !o.new_parameters.extensions.value.live_betting_delay_time.valid(),
"Parameter extensions are not allowed yet!" );
dgpo = &db().get_global_properties(); dgpo = &db().get_global_properties();
if( o.new_parameters.extensions.value.min_bet_multiplier.valid() if( o.new_parameters.extensions.value.min_bet_multiplier.valid()
&& !o.new_parameters.extensions.value.max_bet_multiplier.valid() ) && !o.new_parameters.extensions.value.max_bet_multiplier.valid() )

23
libraries/chain/include/graphene/chain/protocol/chain_parameters.hpp
View file

@ -34,19 +34,20 @@ namespace graphene { namespace chain { struct fee_schedule; } }
namespace graphene { namespace chain { namespace graphene { namespace chain {
struct parameter_extension struct parameter_extension
{ {
optional< bet_multiplier_type > min_bet_multiplier; optional< bet_multiplier_type > min_bet_multiplier = GRAPHENE_DEFAULT_MIN_BET_MULTIPLIER;
optional< bet_multiplier_type > max_bet_multiplier; optional< bet_multiplier_type > max_bet_multiplier = GRAPHENE_DEFAULT_MAX_BET_MULTIPLIER;
optional< uint16_t > betting_rake_fee_percentage; optional< uint16_t > betting_rake_fee_percentage = GRAPHENE_DEFAULT_RAKE_FEE_PERCENTAGE;
optional< flat_map<bet_multiplier_type, bet_multiplier_type> > permitted_betting_odds_increments; optional< flat_map<bet_multiplier_type, bet_multiplier_type> >
optional< uint16_t > live_betting_delay_time; permitted_betting_odds_increments = flat_map<bet_multiplier_type, bet_multiplier_type>(GRAPHENE_DEFAULT_PERMITTED_BETTING_ODDS_INCREMENTS);
optional< uint16_t > sweeps_distribution_percentage; optional< uint16_t > live_betting_delay_time = GRAPHENE_DEFAULT_LIVE_BETTING_DELAY_TIME;
optional< asset_id_type > sweeps_distribution_asset; optional< uint16_t > sweeps_distribution_percentage = SWEEPS_DEFAULT_DISTRIBUTION_PERCENTAGE;
optional< account_id_type > sweeps_vesting_accumulator_account; optional< asset_id_type > sweeps_distribution_asset = SWEEPS_DEFAULT_DISTRIBUTION_ASSET;
optional< account_id_type > sweeps_vesting_accumulator_account= SWEEPS_ACCUMULATOR_ACCOUNT;
/* gpos parameters */ /* gpos parameters */
optional < uint32_t > gpos_period; optional < uint32_t > gpos_period = GPOS_PERIOD;
optional < uint32_t > gpos_subperiod; optional < uint32_t > gpos_subperiod = GPOS_SUBPERIOD;
optional < uint32_t > gpos_period_start; optional < uint32_t > gpos_period_start;
optional < uint32_t > gpos_vesting_lockin_period; optional < uint32_t > gpos_vesting_lockin_period = GPOS_VESTING_LOCKIN_PERIOD;
}; };
struct chain_parameters struct chain_parameters

10
libraries/chain/proposal_evaluator.cpp
View file

@ -45,15 +45,7 @@ struct proposal_operation_hardfork_visitor
template<typename T> template<typename T>
void operator()(const T &v) const {} void operator()(const T &v) const {}
void operator()(const committee_member_update_global_parameters_operation &op) const { void operator()(const committee_member_update_global_parameters_operation &op) const {}
if( block_time < HARDFORK_1000_TIME ) // TODO: remove after hf
FC_ASSERT( !op.new_parameters.extensions.value.min_bet_multiplier.valid()
&& !op.new_parameters.extensions.value.max_bet_multiplier.valid()
&& !op.new_parameters.extensions.value.betting_rake_fee_percentage.valid()
&& !op.new_parameters.extensions.value.permitted_betting_odds_increments.valid()
&& !op.new_parameters.extensions.value.live_betting_delay_time.valid(),
"Parameter extensions are not allowed yet!" );
}
void operator()(const graphene::chain::tournament_payout_operation &o) const { void operator()(const graphene::chain::tournament_payout_operation &o) const {
// TODO: move check into tournament_payout_operation::validate after HARDFORK_999_TIME // TODO: move check into tournament_payout_operation::validate after HARDFORK_999_TIME