Feat - Mempool Supernova Part Two

common/interface.go

@@ -296,14 +296,6 @@ type TxSelectionOptionsAPI interface {
 	GetRequestedFields() string
 }
 
-// BlockchainInfo holds the parameters from the blockchain used for SelectTransactions
-type BlockchainInfo interface {
-	GetLatestExecutedBlockHash() []byte
-	GetLatestCommittedBlockHash() []byte
-	GetCurrentNonce() uint64
-	IsInterfaceNil() bool
-}
-
 // GasScheduleNotifierAPI defines the behavior of the gas schedule notifier components that is used for api
 type GasScheduleNotifierAPI interface {
 	core.GasScheduleNotifier
@@ -465,6 +457,7 @@ type TrieLeavesRetriever interface {
 // AccountNonceAndBalanceProvider provides the nonce and balance of accounts
 type AccountNonceAndBalanceProvider interface {
 	GetAccountNonceAndBalance(accountKey []byte) (uint64, *big.Int, bool, error)
+	GetRootHash() ([]byte, error)
 	IsInterfaceNil() bool
 }
 

dataRetriever/txpool/interface.go

@@ -5,7 +5,6 @@ import (
 	"time"
 
 	"github.com/multiversx/mx-chain-core-go/data"
-	"github.com/multiversx/mx-chain-core-go/data/block"
 	"github.com/multiversx/mx-chain-go/common"
 	"github.com/multiversx/mx-chain-go/storage"
 	"github.com/multiversx/mx-chain-go/txcache"
@@ -21,10 +20,11 @@ type txCache interface {
 	ForEachTransaction(function txcache.ForEachTransaction)
 	NumBytes() int
 	Diagnose(deep bool)
-	GetNumTrackedBlocks() uint64
+	GetTrackerDiagnosis() txcache.TrackerDiagnosis
 	GetTransactionsPoolForSender(sender string) []*txcache.WrappedTransaction
-	OnProposedBlock(blockHash []byte, blockBody *block.Body, blockHeader data.HeaderHandler, accountsProvider common.AccountNonceAndBalanceProvider, blockchainInfo common.BlockchainInfo) error
+	OnProposedBlock(blockHash []byte, blockBody data.BodyHandler, blockHeader data.HeaderHandler, accountsProvider common.AccountNonceAndBalanceProvider, latestExecutedHash []byte) error
 	OnExecutedBlock(blockHeader data.HeaderHandler) error
+	ResetTracker()
 	Cleanup(accountsProvider common.AccountNonceProvider, randomness uint64, maxNum int, cleanupLoopMaximumDurationMs time.Duration) uint64
 }
 

dataRetriever/txpool/shardedTxPool.go

@@ -418,9 +418,9 @@ func (txPool *shardedTxPool) CleanupSelfShardTxCache(accountsProvider common.Acc
 }
 
 // OnProposedBlock notifies the underlying TxCache
-func (txPool *shardedTxPool) OnProposedBlock(blockHash []byte, blockBody *block.Body, blockHeader data.HeaderHandler, accountsProvider common.AccountNonceAndBalanceProvider, blockchainInfo common.BlockchainInfo) error {
+func (txPool *shardedTxPool) OnProposedBlock(blockHash []byte, blockBody *block.Body, blockHeader data.HeaderHandler, accountsProvider common.AccountNonceAndBalanceProvider, latestExecutedHash []byte) error {
 	cache := txPool.getSelfShardTxCache()
-	return cache.OnProposedBlock(blockHash, blockBody, blockHeader, accountsProvider, blockchainInfo)
+	return cache.OnProposedBlock(blockHash, blockBody, blockHeader, accountsProvider, latestExecutedHash)
 }
 
 // OnExecutedBlock notifies the underlying TxCache

dataRetriever/txpool/shardedTxPool_test.go

@@ -13,7 +13,6 @@ import (
 	"github.com/multiversx/mx-chain-core-go/data/block"
 	"github.com/multiversx/mx-chain-core-go/data/transaction"
 	"github.com/multiversx/mx-chain-core-go/marshal"
-	"github.com/multiversx/mx-chain-go/common/holders"
 	"github.com/multiversx/mx-chain-go/config"
 	"github.com/multiversx/mx-chain-go/dataRetriever"
 	"github.com/multiversx/mx-chain-go/storage/storageunit"
@@ -579,7 +578,7 @@ func TestShardedTxPool_OnProposedBlock_And_OnExecutedBlock(t *testing.T) {
 			&block.Body{},
 			&block.HeaderV2{},
 			txcachemocks.NewAccountNonceAndBalanceProviderMock(),
-			holders.NewBlockchainInfo(nil, nil, 42),
+			nil,
 		)
 		require.Nil(t, err)
 	})