feat: Ignore transactions that do not meet the baseFee.

MXCzkEVM · Jul 7, 2023 · 6f93f45 · 6f93f45
1 parent 6eed5c7
commit 6f93f45
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/core/taiko_pool_content_splitter.go → core/mxc_pool_content_splitter.go b/core/taiko_pool_content_splitter.go → core/mxc_pool_content_splitter.go
diff --git a/core/taiko_pool_content_splitter_test.go → core/mxc_pool_content_splitter_test.go b/core/taiko_pool_content_splitter_test.go → core/mxc_pool_content_splitter_test.go
diff --git a/eth/mxc_api_backend.go b/eth/mxc_api_backend.go
@@ -69,7 +69,7 @@ func (s *MxcAPIBackend) TxPoolContent(
 	minTxGasLimit uint64,
 	locals []string,
 ) ([]types.Transactions, error) {
-	pending := s.eth.TxPool().Pending(true)
+	pending := s.eth.TxPool().Pending(false)
 
 	log.Debug(
 		"Fetching L2 pending transactions finished",
@@ -97,7 +97,7 @@ func (s *MxcAPIBackend) TxPoolContent(
 		txsCount = 0
 		txLists  []types.Transactions
 	)
-	for _, splittedTxs := range contentSplitter.Split(filterTxs(pending)) {
+	for _, splittedTxs := range contentSplitter.Split(filterTxs(pending, s.eth.blockchain.CurrentHeader().BaseFee)) {
 		if txsCount+splittedTxs.Len() < int(maxTransactionsPerBlock) {
 			txLists = append(txLists, splittedTxs)
 			txsCount += splittedTxs.Len()
@@ -111,14 +111,20 @@ func (s *MxcAPIBackend) TxPoolContent(
 	return txLists, nil
 }
 
-func filterTxs(pendings map[common.Address]types.Transactions) map[common.Address]types.Transactions {
+func filterTxs(pendings map[common.Address]types.Transactions, baseFee *big.Int) map[common.Address]types.Transactions {
 	executableTxs := make(map[common.Address]types.Transactions)
+	gasPriceLowerLimit := big.NewInt(0).Div(big.NewInt(0).Mul(baseFee, big.NewInt(95)), big.NewInt(100))
 
 	for addr, txs := range pendings {
 		pendingTxs := make(types.Transactions, 0)
 		for _, tx := range txs {
 			// Check baseFee, should not be zero
-			if tx.GasFeeCap().Uint64() == 0 {
+			if tx.GasFeeCap().Uint64() == 0 || tx.GasPrice().Cmp(gasPriceLowerLimit) < 0 {
+				log.Debug("Ignore max fee per gas less than block base fee",
+					"gas price", baseFee.Uint64(),
+					"tx gas price", tx.GasPrice().Uint64(),
+					"lower limit", gasPriceLowerLimit.Uint64(),
+				)
 				break
 			}