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

SON127 - Add son parameter extensions to genesis, push proposal fix (#310)

Browse source 
* SON276 - Fix SON proposal exceptions - I

* SON127 - Add son parameter extensions to genesis, push proposal fix

Co-authored-by: satyakoneru <15652887+satyakoneru@users.noreply.github.com>
This commit is contained in:
sierra19XX 2020-03-18 00:01:31 +11:00 committed by GitHub
parent ff7e1baaf1
commit ed4ebfdb80
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libraries/chain/db_block.cpp
View file

@ -336,8 +336,6 @@ processed_transaction database::validate_transaction( const signed_transaction&
processed_transaction database::push_proposal(const proposal_object& proposal) processed_transaction database::push_proposal(const proposal_object& proposal)
{ try { { try {
FC_ASSERT( _undo_db.size() < _undo_db.max_size(), "Undo database is full!" );
transaction_evaluation_state eval_state(this); transaction_evaluation_state eval_state(this);
eval_state._is_proposed_trx = true; eval_state._is_proposed_trx = true;
@ -347,6 +345,8 @@ processed_transaction database::push_proposal(const proposal_object& proposal)
size_t old_applied_ops_size = _applied_ops.size(); size_t old_applied_ops_size = _applied_ops.size();
try { try {
if( _undo_db.size() >= _undo_db.max_size() )
_undo_db.set_max_size( _undo_db.size() + 1 );
auto session = _undo_db.start_undo_session(true); auto session = _undo_db.start_undo_session(true);
for( auto& op : proposal.proposed_transaction.operations ) for( auto& op : proposal.proposed_transaction.operations )
eval_state.operation_results.emplace_back(apply_operation(eval_state, op)); eval_state.operation_results.emplace_back(apply_operation(eval_state, op));

12
programs/witness_node/genesis.json
View file

@ -352,7 +352,15 @@
"maximum_tournament_start_time_in_future": 2419200, "maximum_tournament_start_time_in_future": 2419200,
"maximum_tournament_start_delay": 604800, "maximum_tournament_start_delay": 604800,
"maximum_tournament_number_of_wins": 100, "maximum_tournament_number_of_wins": 100,
"extensions": {} "extensions": {
"son_vesting_amount": 5000000,
"son_vesting_period": 172800,
"son_pay_daily_max": 20000000,
"son_pay_time": 86400,
"son_deregister_time": 43200,
"son_heartbeat_frequency": 180,
"son_down_time": 360
}
}, },
"initial_bts_accounts": [], "initial_bts_accounts": [],
"initial_accounts": [{ "initial_accounts": [{
@ -493,4 +501,4 @@
"num_special_accounts": 0, "num_special_accounts": 0,
"num_special_assets": 0 "num_special_assets": 0
} }
} }