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

Ref #381: Fix bad merge

Browse source 
During merge conflict resolution, I accidentally broke custom
authorities. This fixes it.
This commit is contained in:
Nathan Hourt 2020-09-03 17:15:04 -05:00
parent 5d48052da3
commit 406cc54299
No known key found for this signature in database
GPG key ID: B4344309A110851E
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
libraries/chain/protocol/transaction.cpp
View file

@ -280,7 +280,8 @@ void verify_authority( const vector<operation>& ops, const flat_set<public_key_t
for( const auto& op : ops ) { for( const auto& op : ops ) {
flat_set<account_id_type> operation_required_active; flat_set<account_id_type> operation_required_active;
operation_get_required_authorities( op, required_active, required_owner, other, ignore_custom_operation_required_auths ); operation_get_required_authorities( op, operation_required_active, required_owner, other,
ignore_custom_operation_required_auths );
auto itr = operation_required_active.begin(); auto itr = operation_required_active.begin();
while ( itr != operation_required_active.end() ) { while ( itr != operation_required_active.end() ) {