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

digest_accumulator picks out bm_create and bmg_create and reworked duplicate check

Browse source
This commit is contained in:
dimfred 2019-02-06 13:49:31 +01:00
parent 75e339e42f
commit 87bf4be89b
1 changed files with 19 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
libraries/app/database_api.cpp
View file

@ -57,7 +57,9 @@ namespace {
{ {
for (auto& operation: proposal.proposed_ops) for (auto& operation: proposal.proposed_ops)
{ {
proposed_operations_digests.push_back(fc::digest(operation.op)); if( operation.op.which() != graphene::chain::operation::tag<graphene::chain::betting_market_group_create_operation>::value
&& operation.op.which() != graphene::chain::operation::tag<graphene::chain::betting_market_create_operation>::value )
proposed_operations_digests.push_back(fc::digest(operation.op));
} }
} }
@ -478,22 +480,25 @@ void database_api_impl::check_transaction_for_duplicated_operations(const signed
const auto& pidx = dynamic_cast<const primary_index<proposal_index>&>(idx); const auto& pidx = dynamic_cast<const primary_index<proposal_index>&>(idx);
const auto& raidx = pidx.get_secondary_index<graphene::chain::required_approval_index>(); const auto& raidx = pidx.get_secondary_index<graphene::chain::required_approval_index>();
auto& p_set = raidx._account_to_proposals.find( GRAPHENE_WITNESS_ACCOUNT )->second; auto acc_itr = raidx._account_to_proposals.find( GRAPHENE_WITNESS_ACCOUNT );
if( acc_itr != raidx._account_to_proposals.end() )
std::set<fc::sha256> existed_operations_digests;
for( auto p_itr = p_set.begin(); p_itr != p_set.end(); ++p_itr )
{ {
for( auto& operation : (*p_itr)(_db).proposed_transaction.operations ) auto& p_set = acc_itr->second;
std::set<fc::sha256> existed_operations_digests;
for( auto p_itr = p_set.begin(); p_itr != p_set.end(); ++p_itr )
{ {
existed_operations_digests.insert( fc::digest(operation) ); for( auto& operation : (*p_itr)(_db).proposed_transaction.operations )
{
existed_operations_digests.insert( fc::digest(operation) );
}
} }
}
auto proposed_operations_digests = gather_proposed_operations_digests(trx); auto proposed_operations_digests = gather_proposed_operations_digests(trx);
for (auto& digest : proposed_operations_digests) for (auto& digest : proposed_operations_digests)
{ {
FC_ASSERT(existed_operations_digests.count(digest) == 0, "Proposed operation is already pending for apsproval."); FC_ASSERT(existed_operations_digests.count(digest) == 0, "Proposed operation is already pending for apsproval.");
}
} }
} }