diff --git a/libraries/chain/db_maint.cpp b/libraries/chain/db_maint.cpp index 26fcc772..a11381ed 100644 --- a/libraries/chain/db_maint.cpp +++ b/libraries/chain/db_maint.cpp @@ -1088,7 +1088,6 @@ void process_dividend_assets(database& db) { dlog("Dividend payout time has arrived for asset ${holder_asset}", ("holder_asset", dividend_holder_asset_obj.symbol)); - #ifndef NDEBUG // dump balances before the payouts for debugging const auto& balance_idx = db.get_index_type().indices().get(); @@ -1108,7 +1107,7 @@ void process_dividend_assets(database& db) // the pending_payouts_range is all payouts for this dividend asset, sorted by the holder's account // we iterate in this order so we can build up a list of payouts for each account to put in the // virtual op - flat_set payouts_for_this_holder; + vector payouts_for_this_holder; fc::optional last_holder_account_id; // cache the assets the distribution account is approved to send, we will be asking @@ -1124,7 +1123,6 @@ void process_dividend_assets(database& db) return is_approved; }; - for (auto pending_balance_object_iter = pending_payouts_range.first; pending_balance_object_iter != pending_payouts_range.second; ) { const pending_dividend_payout_balance_for_holder_object& pending_balance_object = *pending_balance_object_iter; @@ -1151,8 +1149,8 @@ void process_dividend_assets(database& db) db.adjust_balance(pending_balance_object.owner, asset(pending_balance_object.pending_balance, pending_balance_object.dividend_payout_asset_type)); - payouts_for_this_holder.insert(asset(pending_balance_object.pending_balance, - pending_balance_object.dividend_payout_asset_type)); + payouts_for_this_holder.push_back(asset(pending_balance_object.pending_balance, + pending_balance_object.dividend_payout_asset_type)); last_holder_account_id = pending_balance_object.owner; amounts_paid_out_by_asset[pending_balance_object.dividend_payout_asset_type] += pending_balance_object.pending_balance; diff --git a/libraries/chain/include/graphene/chain/protocol/asset_ops.hpp b/libraries/chain/include/graphene/chain/protocol/asset_ops.hpp index 62c9c9a2..5ff353a3 100644 --- a/libraries/chain/include/graphene/chain/protocol/asset_ops.hpp +++ b/libraries/chain/include/graphene/chain/protocol/asset_ops.hpp @@ -291,7 +291,7 @@ namespace graphene { namespace chain { asset_dividend_distribution_operation() {} asset_dividend_distribution_operation(const asset_id_type& dividend_asset_id, const account_id_type& account_id, - const flat_set& amounts) : + const vector& amounts) : dividend_asset_id(dividend_asset_id), account_id(account_id), amounts(amounts) @@ -323,7 +323,7 @@ namespace graphene { namespace chain { account_id_type account_id; /// The amounts received - flat_set amounts; + vector amounts; extensions_type extensions;