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

Graphene Updates and DApp Support #643

Closed
nathanielhourt wants to merge 84 commits from dapp-support into develop
pull from: dapp-support
merge into: Peerplays_Blockchain:develop
Conversation 10 Commits 84 Files changed 376 +3 -2
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit a9135cbdd2 - Show all commits

5
libraries/protocol/transaction.cpp
View file

@ -231,7 +231,7 @@ struct sign_state
sign_state( const flat_set<public_key_type>& sigs,
const std::function<const authority*(account_id_type)>& a,
const flat_set<public_key_type>& keys = flat_set<public_key_type>() )
const flat_set<public_key_type>& keys )
:get_active(a),available_keys(keys)
{
for( const auto& key : sigs )
@ -260,8 +260,9 @@ void verify_authority( const vector<operation>& ops, const flat_set<public_key_t
flat_set<account_id_type> required_active;
flat_set<account_id_type> required_owner;
vector<authority> other;
flat_set<public_key_type> available_keys;
sign_state s(sigs,get_active);
sign_state s(sigs,get_active, available_keys);
s.max_recursion = max_recursion_depth;
for( auto& id : active_aprovals )
s.approved_by.insert( id );