From 41221daf1a24d8c2f0f9ce2d4bb52760b1873e7f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C3=A9ter=20Szil=C3=A1gyi?= <peterke@gmail.com>
Date: Tue, 6 Jun 2023 12:06:00 +0300
Subject: [PATCH] core/txpool: use bitmaps instead of maps for tx type
 filtering

---
 core/txpool/txpool.go     |  9 ++++-----
 core/txpool/validation.go | 10 +++++-----
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/core/txpool/txpool.go b/core/txpool/txpool.go
index 495ab0b1860bf..2b119b643bdc8 100644
--- a/core/txpool/txpool.go
+++ b/core/txpool/txpool.go
@@ -581,11 +581,10 @@ func (pool *TxPool) local() map[common.Address]types.Transactions {
 func (pool *TxPool) validateTxBasics(tx *types.Transaction, local bool) error {
 	opts := &ValidationOptions{
 		Config: pool.chainconfig,
-		Accept: map[uint8]struct{}{
-			types.LegacyTxType:     {},
-			types.AccessListTxType: {},
-			types.DynamicFeeTxType: {},
-		},
+		Accept: 0 |
+			1<<types.LegacyTxType |
+			1<<types.AccessListTxType |
+			1<<types.DynamicFeeTxType,
 		MaxSize: txMaxSize,
 		MinTip:  pool.gasTip.Load(),
 	}
diff --git a/core/txpool/validation.go b/core/txpool/validation.go
index 6f51e940df694..af678277f868a 100644
--- a/core/txpool/validation.go
+++ b/core/txpool/validation.go
@@ -35,9 +35,9 @@ import (
 type ValidationOptions struct {
 	Config *params.ChainConfig // Chain configuration to selectively validate based on current fork rules
 
-	Accept  map[uint8]struct{} // Transaction types that should be accepted for the calling pool
-	MaxSize uint64             // Maximum size of a transaction that the caller can meaningfully handle
-	MinTip  *big.Int           // Minimum gas tip needed to allow a transaction into the caller pool
+	Accept  uint8    // Bitmap of transaction types that should be accepted for the calling pool
+	MaxSize uint64   // Maximum size of a transaction that the caller can meaningfully handle
+	MinTip  *big.Int // Minimum gas tip needed to allow a transaction into the caller pool
 }
 
 // ValidateTransaction is a helper method to check whether a transaction is valid
@@ -48,7 +48,7 @@ type ValidationOptions struct {
 // rules without duplicating code and running the risk of missed updates.
 func ValidateTransaction(tx *types.Transaction, blobs []kzg4844.Blob, commits []kzg4844.Commitment, proofs []kzg4844.Proof, head *types.Header, signer types.Signer, opts *ValidationOptions) error {
 	// Ensure transactions not implemented by the calling pool are rejected
-	if _, ok := opts.Accept[tx.Type()]; !ok {
+	if opts.Accept&(1<<tx.Type()) == 0 {
 		return fmt.Errorf("%w: tx type %v not supported by this pool", core.ErrTxTypeNotSupported, tx.Type())
 	}
 	// Before performing any expensive validations, sanity check that the tx is
@@ -129,7 +129,7 @@ func ValidateTransaction(tx *types.Transaction, blobs []kzg4844.Blob, commits []
 			return fmt.Errorf("invalid number of %d blob proofs compared to %d blob hashes", len(proofs), len(hashes))
 		}
 		// Blob quantities match up, validate that the provers match with the
-		// transaction hash before getting to the creyptography
+		// transaction hash before getting to the cryptography
 		hasher := sha256.New()
 		for i, want := range hashes {
 			hasher.Write(commits[i][:])