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

Merge branch 'proposals-show-proposer' into betting-merge

Browse source
This commit is contained in:
Fabian Schuh 2018-01-29 14:19:56 +01:00
commit 9fcebf8bc0
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
libraries/chain/include/graphene/chain/proposal_object.hpp
View file

@ -50,6 +50,7 @@ class proposal_object : public abstract_object<proposal_object>
flat_set<account_id_type> required_owner_approvals; flat_set<account_id_type> required_owner_approvals;
flat_set<account_id_type> available_owner_approvals; flat_set<account_id_type> available_owner_approvals;
flat_set<public_key_type> available_key_approvals; flat_set<public_key_type> available_key_approvals;
account_id_type proposer;
bool is_authorized_to_execute(database& db)const; bool is_authorized_to_execute(database& db)const;
}; };
@ -93,4 +94,4 @@ typedef generic_index<proposal_object, proposal_multi_index_container> proposal_
FC_REFLECT_DERIVED( graphene::chain::proposal_object, (graphene::chain::object), FC_REFLECT_DERIVED( graphene::chain::proposal_object, (graphene::chain::object),
(expiration_time)(review_period_time)(proposed_transaction)(required_active_approvals) (expiration_time)(review_period_time)(proposed_transaction)(required_active_approvals)
(available_active_approvals)(required_owner_approvals)(available_owner_approvals) (available_active_approvals)(required_owner_approvals)(available_owner_approvals)
(available_key_approvals) ) (available_key_approvals)(proposer) )

1
libraries/chain/proposal_evaluator.cpp
View file

@ -85,6 +85,7 @@ object_id_type proposal_create_evaluator::do_apply(const proposal_create_operati
const proposal_object& proposal = d.create<proposal_object>([&](proposal_object& proposal) { const proposal_object& proposal = d.create<proposal_object>([&](proposal_object& proposal) {
_proposed_trx.expiration = o.expiration_time; _proposed_trx.expiration = o.expiration_time;
proposal.proposed_transaction = _proposed_trx; proposal.proposed_transaction = _proposed_trx;
proposal.proposer = o.fee_paying_account;
proposal.expiration_time = o.expiration_time; proposal.expiration_time = o.expiration_time;
if( o.review_period_seconds ) if( o.review_period_seconds )
proposal.review_period_time = o.expiration_time - *o.review_period_seconds; proposal.review_period_time = o.expiration_time - *o.review_period_seconds;