TrueCloudLab/neoneo-go
7
0
Fork 2
Code Issues Pull requests Projects Releases Packages Wiki Activity

core: fix bug with mempool.verifiedMap

Browse source 
Transaction is added to verifiedMap before OOM check, so we may have a
case when OOM occurs during tx1 pooling, but mp.containsKey(tx1)
returns `true` after this. Fixed.
This commit is contained in:
Anna Shaleva 2020-12-16 13:14:30 +03:00
parent 44b4c92992
commit 93a5c37696
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkg/core/mempool/mem_pool.go
View file

@ -216,7 +216,6 @@ func (mp *Pool) Add(t *transaction.Transaction, fee Feer, data ...interface{}) e
mp.oracleResp[id] = t.Hash() mp.oracleResp[id] = t.Hash()
} }
mp.verifiedMap[t.Hash()] = t
if fee.P2PSigExtensionsEnabled() { if fee.P2PSigExtensionsEnabled() {
// Remove conflicting transactions. // Remove conflicting transactions.
for _, conflictingTx := range conflictsToBeRemoved { for _, conflictingTx := range conflictsToBeRemoved {
@ -254,6 +253,7 @@ func (mp *Pool) Add(t *transaction.Transaction, fee Feer, data ...interface{}) e
copy(mp.verifiedTxes[n+1:], mp.verifiedTxes[n:]) copy(mp.verifiedTxes[n+1:], mp.verifiedTxes[n:])
mp.verifiedTxes[n] = pItem mp.verifiedTxes[n] = pItem
} }
mp.verifiedMap[t.Hash()] = t
if fee.P2PSigExtensionsEnabled() { if fee.P2PSigExtensionsEnabled() {
// Add conflicting hashes to the mp.conflicts list. // Add conflicting hashes to the mp.conflicts list.
for _, attr := range t.GetAttributes(transaction.ConflictsT) { for _, attr := range t.GetAttributes(transaction.ConflictsT) {

3
pkg/core/mempool/mem_pool_test.go
View file

@ -148,6 +148,9 @@ func TestOverCapacity(t *testing.T) {
txcnt++ txcnt++
require.Error(t, mp.Add(tx, fs)) require.Error(t, mp.Add(tx, fs))
require.Equal(t, mempoolSize, mp.Count()) require.Equal(t, mempoolSize, mp.Count())
require.Equal(t, mempoolSize, len(mp.verifiedMap))
require.Equal(t, mempoolSize, len(mp.verifiedTxes))
require.False(t, mp.containsKey(tx.Hash()))
require.Equal(t, true, sort.IsSorted(sort.Reverse(mp.verifiedTxes))) require.Equal(t, true, sort.IsSorted(sort.Reverse(mp.verifiedTxes)))
// Low net fee, but higher per-byte fee is still a better combination. // Low net fee, but higher per-byte fee is still a better combination.