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

Merge pull request #227 from peerplays-network/GRPH-159

Browse source 
GRPH 159
This commit is contained in:
pbattu123 2019-11-29 14:21:45 -04:00 committed by GitHub
commit c49ce31201
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libraries/chain/account_evaluator.cpp
View file

@ -261,6 +261,8 @@ void_result account_update_evaluator::do_evaluate( const account_update_operatio
FC_ASSERT( !o.extensions.value.owner_special_authority.valid() );
FC_ASSERT( !o.extensions.value.active_special_authority.valid() );
}
if( d.head_block_time() < HARDFORK_GPOS_TIME )
FC_ASSERT( !o.extensions.value.update_last_voting_time.valid() );
try
{

2
libraries/chain/include/graphene/chain/protocol/account.hpp
View file

@ -146,7 +146,7 @@ namespace graphene { namespace chain {
optional< void_t > null_ext;
optional< special_authority > owner_special_authority;
optional< special_authority > active_special_authority;
optional< bool > update_last_voting_time = false;
optional< bool > update_last_voting_time;
};
struct fee_parameters_type

1
libraries/chain/protocol/account.cpp
View file

@ -274,6 +274,7 @@ void account_update_operation::validate()const
|| new_options.valid()
|| extensions.value.owner_special_authority.valid()
|| extensions.value.active_special_authority.valid()
|| extensions.value.update_last_voting_time.valid()
);
FC_ASSERT( has_action );