Cherry-picked all divident commits from rps to betting resolving conflicts

This commit is contained in:
Roman Olearski 2017-07-06 23:04:50 +02:00
parent 3a8b8a3b5b
commit 32433ef29f
3 changed files with 11 additions and 5 deletions

View file

@ -274,8 +274,8 @@ void database::initialize_indexes()
add_index< primary_index< simple_index< fba_accumulator_object > > >();
add_index< primary_index< betting_market_position_index > >();
add_index< primary_index< global_betting_statistics_object_index > >();
add_index< primary_index<pending_dividend_payout_balance_object_index > >();
add_index< primary_index<distributed_dividend_balance_object_index > >();
//add_index< primary_index<pending_dividend_payout_balance_object_index > >();
//add_index< primary_index<distributed_dividend_balance_object_index > >();
add_index< primary_index<pending_dividend_payout_balance_for_holder_object_index > >();
add_index< primary_index<total_distributed_dividend_balance_object_index > >();
}

View file

@ -73,6 +73,12 @@ struct get_impacted_account_visitor
}
void operator()( const asset_update_bitasset_operation& op ) {}
void operator()( const asset_update_dividend_operation& op ) {}
void operator()( const asset_dividend_distribution_operation& op )
{
_impacted.insert( op.account_id );
}
void operator()( const asset_update_feed_producers_operation& op ) {}
void operator()( const asset_issue_operation& op )

View file

@ -97,6 +97,8 @@ namespace graphene { namespace chain {
asset_settle_cancel_operation, // VIRTUAL
asset_claim_fees_operation,
fba_distribute_operation, // VIRTUAL
asset_update_dividend_operation,
asset_dividend_distribution_operation, // VIRTUAL
sport_create_operation,
competitor_create_operation,
event_group_create_operation,
@ -108,9 +110,7 @@ namespace graphene { namespace chain {
betting_market_group_resolved_operation, // VIRTUAL
bet_matched_operation, // VIRTUAL
bet_cancel_operation,
bet_canceled_operation, // VIRTUAL
asset_update_dividend_operation,
asset_dividend_distribution_operation // VIRTUAL
bet_canceled_operation // VIRTUAL
> operation;
/// @} // operations group