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

adding proposed transactons to the result of get_full_account

Browse source
This commit is contained in:
Daniel Larimer 2015-08-18 10:50:06 -04:00
parent 9c2af06cc6
commit d5cc6da54a
3 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
libraries/app/api.cpp
View file

@ -276,6 +276,18 @@ namespace graphene { namespace app {
{
acnt.cashback_balance = account->cashback_balance(_db);
}
// Add the account's proposals
const auto& proposal_idx = _db.get_index_type<proposal_index>();
const auto& pidx = dynamic_cast<const primary_index<proposal_index>&>(proposal_idx);
const auto& proposals_by_account = pidx.get_secondary_index<graphene::chain::required_approval_index>();
auto required_approvals_itr = proposals_by_account._account_to_proposals.find( account->id );
if( required_approvals_itr != proposals_by_account._account_to_proposals.end() )
{
acnt.proposals.reserve( required_approvals_itr->second.size() );
for( auto proposal_id : required_approvals_itr->second )
acnt.proposals.push_back( proposal_id(_db) );
}
// Add the account's balances
auto balance_range = _db.get_index_type<account_balance_index>().indices().get<by_account>().equal_range(account->id);

5
libraries/app/include/graphene/app/full_account.hpp
View file

@ -20,6 +20,7 @@ namespace graphene { namespace app {
vector<vesting_balance_object> vesting_balances;
vector<limit_order_object> limit_orders;
vector<call_order_object> call_orders;
vector<proposal_object> proposals;
};
} }
@ -35,4 +36,6 @@ FC_REFLECT( graphene::app::full_account,
(balances)
(vesting_balances)
(limit_orders)
(call_orders) )
(call_orders)
(proposals)
)

2
libraries/fc

@ -1 +1 @@
Subproject commit 18ed468c6f0b19bb1e322548d8be64d7faafe4e5
Subproject commit 458b601774c36b702e2d4712320b5d53c6b2ee1c