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

Merge branch 'rock-paper-scissors' of http://syncad.storm.pl:56780/blocktrades/graphene into rock-paper-scissors

Browse source
This commit is contained in:
Roman Olearski 2016-11-08 15:57:57 +01:00
commit 6abffc0963
2 changed files with 8363 additions and 9038 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17397
genesis.json
View file

File diff suppressed because it is too large Load diff

4
libraries/chain/tournament_object.cpp
View file

@ -269,12 +269,12 @@ namespace graphene { namespace chain {
const account_id_type& winner = *event.match.match_winners.begin(); const account_id_type& winner = *event.match.match_winners.begin();
uint16_t rake_fee_percentage = event.db.get_global_properties().parameters.rake_fee_percentage; uint16_t rake_fee_percentage = event.db.get_global_properties().parameters.rake_fee_percentage;
share_type rake_amount = (fc::uint128_t(fsm.tournament_obj->prize_pool.value) * rake_fee_percentage / GRAPHENE_1_PERCENT).to_uint64(); share_type rake_amount = (fc::uint128_t(fsm.tournament_obj->prize_pool.value) * rake_fee_percentage / GRAPHENE_1_PERCENT).to_uint64();
#ifdef TOURNAMENT_RAKE_FEE_ACCOUNT_ID
event.db.adjust_balance(account_id_type(TOURNAMENT_RAKE_FEE_ACCOUNT_ID), event.db.adjust_balance(account_id_type(TOURNAMENT_RAKE_FEE_ACCOUNT_ID),
asset(rake_amount, fsm.tournament_obj->options.buy_in.asset_id)); asset(rake_amount, fsm.tournament_obj->options.buy_in.asset_id));
#endif
event.db.adjust_balance(winner, asset(fsm.tournament_obj->prize_pool - rake_amount, event.db.adjust_balance(winner, asset(fsm.tournament_obj->prize_pool - rake_amount,
fsm.tournament_obj->options.buy_in.asset_id)); fsm.tournament_obj->options.buy_in.asset_id));
tournament_object& tournament = *fsm.tournament_obj;
tournament.end_time = event.db.head_block_time();
} }
}; };