From 5d68f8819670ea1a86ab52052bb454538af0fe82 Mon Sep 17 00:00:00 2001 From: Roman Khimov Date: Fri, 13 Dec 2019 23:23:33 +0300 Subject: [PATCH] core: fix and speed up mempool Verify() First of all, it was wrong, it was not checking for inputs really, it compared tx hashes for some reason, second, when it did compare inputs it compared only the PrevIndex part of them which is also wrong. Also, there is absolutely no reason to go through GetVerifiedTransactions() here, we don't need this copy of pointers and it can also be outdated by the time we're to finish our check. Before: BenchmarkTXPerformanceTest-4 5000 485506 ns/op 65886 B/op 409 allocs/op ok github.com/CityOfZion/neo-go/integration 3.212s After: enchmarkTXPerformanceTest-4 5000 371104 ns/op 44367 B/op 408 allocs/op ok github.com/CityOfZion/neo-go/integration 2.712s --- pkg/core/mem_pool.go | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/pkg/core/mem_pool.go b/pkg/core/mem_pool.go index a01793a5d..2a629d403 100644 --- a/pkg/core/mem_pool.go +++ b/pkg/core/mem_pool.go @@ -287,23 +287,17 @@ func (mp *MemPool) GetVerifiedTransactions() []*transaction.Transaction { // If yes, the transaction tx is not a valid transaction and the function return false. // If no, the transaction tx is a valid transaction and the function return true. func (mp MemPool) Verify(tx *transaction.Transaction) bool { - count := 0 - inputs := make([]*transaction.Input, 0) - for _, item := range mp.GetVerifiedTransactions() { - if tx.Hash().Equals(item.Hash()) { - for i := range item.Inputs { - inputs = append(inputs, &item.Inputs[i]) + mp.lock.RLock() + defer mp.lock.RUnlock() + for _, item := range mp.unsortedTxn { + for i := range item.txn.Inputs { + for j := 0; j < len(tx.Inputs); j++ { + if item.txn.Inputs[i] == tx.Inputs[j] { + return false + } } } } - for i := 0; i < len(inputs); i++ { - for j := 0; j < len(tx.Inputs); j++ { - if inputs[i].PrevHash.Equals(tx.Inputs[j].PrevHash) { - count++ - } - } - } - - return count == 0 + return true }