Call "isBadlyGuarded()" of the node.

Author: andreibancioiu

testscommon/txcachemocks/accountStateProviderMock.go

@@ -4,6 +4,7 @@ import (
 	"math/big"
 	"sync"
 
+	"github.com/multiversx/mx-chain-core-go/data"
 	"github.com/multiversx/mx-chain-storage-go/types"
 )
 
@@ -13,6 +14,7 @@ type AccountStateProviderMock struct {
 
 	AccountStateByAddress map[string]*types.AccountState
 	GetAccountStateCalled func(address []byte) (*types.AccountState, error)
+	IsBadlyGuardedCalled  func(tx data.TransactionHandler) bool
 }
 
 // NewAccountStateProviderMock -
@@ -67,6 +69,15 @@ func (mock *AccountStateProviderMock) GetAccountState(address []byte) (*types.Ac
 	return newDefaultAccountState(), nil
 }
 
+// IsBadlyGuarded -
+func (mock *AccountStateProviderMock) IsBadlyGuarded(tx data.TransactionHandler) bool {
+	if mock.IsBadlyGuardedCalled != nil {
+		return mock.IsBadlyGuardedCalled(tx)
+	}
+
+	return false
+}
+
 // IsInterfaceNil -
 func (mock *AccountStateProviderMock) IsInterfaceNil() bool {
 	return mock == nil

txcache/interface.go

@@ -16,6 +16,7 @@ type TxGasHandler interface {
 // AccountStateProvider defines the behavior of a component able to provide the state of an account
 type AccountStateProvider interface {
 	GetAccountState(accountKey []byte) (*types.AccountState, error)
+	IsBadlyGuarded(tx data.TransactionHandler) bool
 	IsInterfaceNil() bool
 }
 

txcache/selection.go

@@ -71,7 +71,7 @@ func selectTransactionsFromBunches(accountStateProvider AccountStateProvider, bu
 			continue
 		}
 
-		shouldSkipTransaction := detectSkippableTransaction(item)
+		shouldSkipTransaction := detectSkippableTransaction(accountStateProvider, item)
 		if shouldSkipTransaction {
 			// Transaction isn't selected, but the sender is still in the game (will contribute with other transactions).
 		} else {
@@ -104,11 +104,11 @@ func detectSkippableSender(item *transactionsHeapItem) bool {
 	return false
 }
 
-func detectSkippableTransaction(item *transactionsHeapItem) bool {
+func detectSkippableTransaction(accountStateProvider AccountStateProvider, item *transactionsHeapItem) bool {
 	if item.detectLowerNonce() {
 		return true
 	}
-	if item.detectBadlyGuarded() {
+	if item.detectBadlyGuarded(accountStateProvider) {
 		return true
 	}
 	if item.detectNonceDuplicate() {

txcache/transactionsHeapItem.go

@@ -157,9 +157,16 @@ func (item *transactionsHeapItem) detectLowerNonce() bool {
 	return isLowerNonce
 }
 
-func (item *transactionsHeapItem) detectBadlyGuarded() bool {
-	// See MX-16179.
-	return false
+func (item *transactionsHeapItem) detectBadlyGuarded(accountStateProvider AccountStateProvider) bool {
+	isBadlyGuarded := accountStateProvider.IsBadlyGuarded(item.currentTransaction.Tx)
+	if isBadlyGuarded {
+		logSelect.Trace("transactionsHeapItem.detectBadlyGuarded",
+			"tx", item.currentTransaction.TxHash,
+			"sender", item.sender,
+		)
+	}
+
+	return isBadlyGuarded
 }
 
 func (item *transactionsHeapItem) detectNonceDuplicate() bool {