From b8f9e8556540dc3c741a77b77fd4e905d9d2331b Mon Sep 17 00:00:00 2001
From: drklee3 <derrick@dlee.dev>
Date: Mon, 29 Apr 2024 15:43:43 -0700
Subject: [PATCH] test: Ensure evmkeeper.Tracer() correctly uses x/precompile
 keeper addresses

---
 x/evm/keeper/keeper_test.go           | 75 +++++++++++++++++++++++++++
 x/evm/keeper/state_transition_test.go |  2 -
 2 files changed, 75 insertions(+), 2 deletions(-)

diff --git a/x/evm/keeper/keeper_test.go b/x/evm/keeper/keeper_test.go
index b6db464d86..240438b06b 100644
--- a/x/evm/keeper/keeper_test.go
+++ b/x/evm/keeper/keeper_test.go
@@ -15,11 +15,14 @@ import (
 	authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
 	"github.com/evmos/ethermint/x/evm/statedb"
 	"github.com/evmos/ethermint/x/evm/testutil"
+	"github.com/evmos/ethermint/x/evm/types/mocks"
 
 	ethermint "github.com/evmos/ethermint/types"
 	"github.com/evmos/ethermint/x/evm/types"
 
 	"github.com/ethereum/go-ethereum/common"
+	coretypes "github.com/ethereum/go-ethereum/core/types"
+	"github.com/ethereum/go-ethereum/eth/tracers/logger"
 
 	abci "github.com/cometbft/cometbft/abci/types"
 )
@@ -156,3 +159,75 @@ func (suite *KeeperTestSuite) TestGetAccountOrEmpty() {
 		})
 	}
 }
+
+func (suite *KeeperTestSuite) TestTracer_AccessList() {
+	precompileKeeper := mocks.NewPrecompileKeeper(suite.T())
+
+	// Update app keeper with the mock precompile keeper with access list tracer
+	suite.SetEVMPrecompileKeeper(precompileKeeper, types.TracerAccessList)
+
+	msgAccessList := coretypes.AccessList{
+		coretypes.AccessTuple{
+			// Ensure we don't use 0x01 or an already existing native precompile address
+			Address:     common.BytesToAddress([]byte("hello")),
+			StorageKeys: nil,
+		},
+	}
+
+	tests := []struct {
+		name                    string
+		precompileAddrs         []common.Address
+		expectedAccessListAddrs []common.Address
+	}{
+		{
+			"no precompile addresses",
+			nil,
+			[]common.Address{msgAccessList[0].Address},
+		},
+		{
+			"with precompile addresses",
+			[]common.Address{msgAccessList[0].Address, common.BytesToAddress([]byte{0x02})},
+			[]common.Address{},
+		},
+	}
+
+	for _, tt := range tests {
+		suite.Run(tt.name, func() {
+			precompileKeeper.EXPECT().GetPrecompileAddresses(suite.Ctx).
+				Return(tt.precompileAddrs).
+				Once()
+
+			msg := coretypes.NewMessage(
+				suite.Address,
+				&suite.Address,
+				1,
+				big.NewInt(0),
+				2000000,
+				big.NewInt(1),
+				nil,
+				nil,
+				nil,
+				msgAccessList,
+				true,
+			)
+
+			cfg := suite.App.EvmKeeper.GetParams(suite.Ctx).
+				ChainConfig.
+				EthereumConfig(suite.App.EvmKeeper.ChainID())
+			tracer := suite.App.EvmKeeper.Tracer(suite.Ctx, msg, cfg)
+
+			// Check the access list within tracer EXCLUDES precompile addresses
+			accessListLogger := tracer.(*logger.AccessListTracer)
+			accessListAddrs := []common.Address{}
+			for _, accessTuple := range accessListLogger.AccessList() {
+				accessListAddrs = append(accessListAddrs, accessTuple.Address)
+			}
+
+			suite.Require().Equal(
+				tt.expectedAccessListAddrs,
+				accessListAddrs,
+				"access_list tracer should **exclude** precompile addresses",
+			)
+		})
+	}
+}
diff --git a/x/evm/keeper/state_transition_test.go b/x/evm/keeper/state_transition_test.go
index 2e913a8a1b..1ad76e8828 100644
--- a/x/evm/keeper/state_transition_test.go
+++ b/x/evm/keeper/state_transition_test.go
@@ -976,8 +976,6 @@ func (suite *KeeperTestSuite) SetEVMPrecompileKeeper(
 }
 
 func (suite *KeeperTestSuite) TestPrecompileAccessList() {
-	suite.SetupTest()
-
 	precompileKeeper := mocks.NewPrecompileKeeper(suite.T())
 
 	// Update app keeper with the mock precompile keeper