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

changed check_transaction to check only for proposals associated with GRAPHENE_WITNESS_ACC

Browse source
This commit is contained in:
dimfred 2019-01-28 15:05:20 +01:00
parent ee8429938c
commit 2922366e27
1 changed files with 13 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
libraries/app/database_api.cpp
View file

@ -473,27 +473,26 @@ void database_api::check_transaction_for_duplicated_operations(const signed_tran
void database_api_impl::check_transaction_for_duplicated_operations(const signed_transaction& trx) void database_api_impl::check_transaction_for_duplicated_operations(const signed_transaction& trx)
{ {
const auto& proposal_index = get_index<proposal_object>(); const auto& idx = _db.get_index_type<proposal_index>();
const auto& pidx = dynamic_cast<const primary_index<proposal_index>&>(idx);
const auto& raidx = pidx.get_secondary_index<graphene::chain::required_approval_index>();
auto& p_set = raidx._account_to_proposals.find( GRAPHENE_WITNESS_ACCOUNT )->second;
std::set<fc::sha256> existed_operations_digests; std::set<fc::sha256> existed_operations_digests;
proposal_index.inspect_all_objects( [&](const object& obj){ for( auto p_itr = p_set.begin(); p_itr != p_set.end(); ++p_itr )
const proposal_object& proposal = static_cast<const proposal_object&>(obj);
for (auto& operation: proposal.proposed_transaction.operations)
{
existed_operations_digests.insert(fc::digest(operation));
}
});
for (auto& pending_transaction: _pending_tx)
{ {
auto proposed_operations_digests = gather_proposed_operations_digests(pending_transaction); for( auto& operation : (*p_itr)(_db).proposed_transaction.operations )
existed_operations_digests.insert(proposed_operations_digests.begin(), proposed_operations_digests.end()); {
exited_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 approval."); FC_ASSERT(existed_operations_digests.count(digest) == 0, "Proposed operation is already pending for apsproval.");
} }
} }