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

solution ...issues/#10 avoid generating dividend_payout virtual operations for zero-size payouts

Browse source
This commit is contained in:
Roman Olearski 2016-11-26 16:03:33 +01:00
parent 81c9e98d7b
commit eadbae0808
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
libraries/chain/db_maint.cpp
View file

@ -949,9 +949,10 @@ void schedule_pending_dividend_balances(database& db,
} }
for (const auto& pending_payout : pending_payout_balance_index.indices()) for (const auto& pending_payout : pending_payout_balance_index.indices())
dlog("Pending payout: ${account_name} -> ${amount}", if (pending_payout.pending_balance.value)
("account_name", pending_payout.owner(db).name) dlog("Pending payout: ${account_name} -> ${amount}",
("amount", asset(pending_payout.pending_balance, pending_payout.dividend_payout_asset_type))); ("account_name", pending_payout.owner(db).name)
("amount", asset(pending_payout.pending_balance, pending_payout.dividend_payout_asset_type)));
dlog("Remaining balance not paid out: ${amount}", dlog("Remaining balance not paid out: ${amount}",
("amount", asset(remaining_amount_to_distribute, payout_asset_type))); ("amount", asset(remaining_amount_to_distribute, payout_asset_type)));
@ -1103,7 +1104,7 @@ void process_dividend_assets(database& db)
{ {
const pending_dividend_payout_balance_for_holder_object& pending_balance_object = *pending_balance_object_iter; const pending_dividend_payout_balance_for_holder_object& pending_balance_object = *pending_balance_object_iter;
if (last_holder_account_id && *last_holder_account_id != pending_balance_object.owner) if (last_holder_account_id && *last_holder_account_id != pending_balance_object.owner && payouts_for_this_holder.size())
{ {
// we've moved on to a new account, generate the dividend payment virtual op for the previous one // we've moved on to a new account, generate the dividend payment virtual op for the previous one
db.push_applied_operation(asset_dividend_distribution_operation(dividend_holder_asset_obj.id, db.push_applied_operation(asset_dividend_distribution_operation(dividend_holder_asset_obj.id,
@ -1115,7 +1116,8 @@ void process_dividend_assets(database& db)
} }
if (is_authorized_asset(db, pending_balance_object.owner(db), pending_balance_object.dividend_payout_asset_type(db)) && if (pending_balance_object.pending_balance.value &&
is_authorized_asset(db, pending_balance_object.owner(db), pending_balance_object.dividend_payout_asset_type(db)) &&
is_asset_approved_for_distribution_account(pending_balance_object.dividend_payout_asset_type)) is_asset_approved_for_distribution_account(pending_balance_object.dividend_payout_asset_type))
{ {
dlog("Processing payout of ${asset} to account ${account}", dlog("Processing payout of ${asset} to account ${account}",
@ -1138,7 +1140,7 @@ void process_dividend_assets(database& db)
++pending_balance_object_iter; ++pending_balance_object_iter;
} }
// we will always be left with the last holder's data, generate the virtual op for it now. // we will always be left with the last holder's data, generate the virtual op for it now.
if (last_holder_account_id) if (last_holder_account_id && payouts_for_this_holder.size())
{ {
// we've moved on to a new account, generate the dividend payment virtual op for the previous one // we've moved on to a new account, generate the dividend payment virtual op for the previous one
db.push_applied_operation(asset_dividend_distribution_operation(dividend_holder_asset_obj.id, db.push_applied_operation(asset_dividend_distribution_operation(dividend_holder_asset_obj.id,