From b5d5595b6e23a9d2487017c4a96481d8ea9d5887 Mon Sep 17 00:00:00 2001
From: Oleg Nikonychev <oleg.nikonychev@gmail.com>
Date: Tue, 14 Jan 2025 13:19:36 +0400
Subject: [PATCH] fix: removed tx index updating for non eth txs

---
 eth/rpc/backend/tx_logs_test.go | 10 ++++++++--
 x/evm/keeper/call_contract.go   |  2 --
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/eth/rpc/backend/tx_logs_test.go b/eth/rpc/backend/tx_logs_test.go
index 7d15fb077..262db1ff9 100644
--- a/eth/rpc/backend/tx_logs_test.go
+++ b/eth/rpc/backend/tx_logs_test.go
@@ -203,6 +203,7 @@ func (s *BackendSuite) TestLogs() {
 	s.Require().NoError(err)
 	s.Require().NotNil(blockRes)
 	txIndex := 0
+	ethTxIndex := 0
 	for idx, check := range checks {
 		if txIndex+1 > len(blockRes.TxsResults) {
 			blockNumber++
@@ -210,12 +211,16 @@ func (s *BackendSuite) TestLogs() {
 				s.Fail("TX %d not found in block results", idx)
 			}
 			txIndex = 0
+			ethTxIndex = 0
 			blockRes, err = s.backend.TendermintBlockResultByNumber(&blockNumber)
 			s.Require().NoError(err)
 			s.Require().NotNil(blockRes)
 		}
-		s.assertTxLogsAndTxIndex(blockRes, txIndex, check.logs, check.expectEthTx, check.txInfo)
+		s.assertTxLogsAndTxIndex(blockRes, txIndex, ethTxIndex, check.logs, check.expectEthTx, check.txInfo)
 		txIndex++
+		if check.expectEthTx {
+			ethTxIndex++
+		}
 	}
 }
 
@@ -223,6 +228,7 @@ func (s *BackendSuite) TestLogs() {
 func (s *BackendSuite) assertTxLogsAndTxIndex(
 	blockRes *tmrpctypes.ResultBlockResults,
 	txIndex int,
+	ethTxIndex int,
 	expectedTxLogs []*gethcore.Log,
 	expectedEthTx bool,
 	txInfo string,
@@ -252,7 +258,7 @@ func (s *BackendSuite) assertTxLogsAndTxIndex(
 			ethereumTx, err := evm.EventEthereumTxFromABCIEvent(event)
 			s.Require().NoError(err)
 			s.Require().Equal(
-				fmt.Sprintf("%d", txIndex),
+				fmt.Sprintf("%d", ethTxIndex),
 				ethereumTx.Index,
 				"tx index mismatch, %s", txInfo,
 			)
diff --git a/x/evm/keeper/call_contract.go b/x/evm/keeper/call_contract.go
index 612dedb8f..d6508eef3 100644
--- a/x/evm/keeper/call_contract.go
+++ b/x/evm/keeper/call_contract.go
@@ -142,8 +142,6 @@ func (k Keeper) CallContractWithInput(
 		if err != nil {
 			return nil, nil, errors.Wrap(err, "error emitting tx logs")
 		}
-		blockTxIdx := uint64(txConfig.TxIndex) + 1
-		k.EvmState.BlockTxIndex.Set(ctx, blockTxIdx)
 	}
 	return evmResp, evmObj, nil
 }