fix getBlock endpoints transactionIndex (#2123)

* fix getBlock endpoints transactionIndex

* test

Author: codchen

evmrpc/block.go

@@ -335,7 +335,7 @@ func EncodeTmBlock(
 				if !fullTx {
 					transactions = append(transactions, hash)
 				} else {
-					newTx := ethapi.NewRPCTransaction(ethtx, blockhash, number.Uint64(), uint64(blockTime.Second()), uint64(receipt.TransactionIndex), baseFeePerGas, chainConfig)
+					newTx := ethapi.NewRPCTransaction(ethtx, blockhash, number.Uint64(), uint64(blockTime.Second()), uint64(len(transactions)), baseFeePerGas, chainConfig)
 					transactions = append(transactions, newTx)
 				}
 			case *wasmtypes.MsgExecuteContract:
@@ -350,7 +350,7 @@ func EncodeTmBlock(
 				if !fullTx {
 					transactions = append(transactions, "0x"+hex.EncodeToString(th[:]))
 				} else {
-					ti := uint64(receipt.TransactionIndex)
+					ti := uint64(len(transactions))
 					to := k.GetEVMAddressOrDefault(ctx, sdk.MustAccAddressFromBech32(m.Contract))
 					transactions = append(transactions, &ethapi.RPCTransaction{
 						BlockHash:        &blockhash,
@@ -388,6 +388,8 @@ func EncodeTmBlock(
 					rpcTx.To = &recipientEvmAddr
 					amt := m.Amount.AmountOf("usei").Mul(state.SdkUseiToSweiMultiplier)
 					rpcTx.Value = (*hexutil.Big)(amt.BigInt())
+					ti := uint64(len(transactions))
+					rpcTx.TransactionIndex = (*hexutil.Uint64)(&ti)
 					transactions = append(transactions, rpcTx)
 				}
 			}

evmrpc/block_test.go

@@ -303,7 +303,7 @@ func TestEncodeWasmExecuteMsg(t *testing.T) {
 	require.Nil(t, err)
 	txs := res["transactions"].([]interface{})
 	require.Equal(t, 1, len(txs))
-	ti := uint64(1)
+	ti := uint64(0)
 	bh := common.HexToHash(MockBlockID.Hash.String())
 	to := common.Address(toSeiAddr)
 	require.Equal(t, &ethapi.RPCTransaction{
@@ -332,6 +332,7 @@ func TestEncodeBankTransferMsg(t *testing.T) {
 		ToAddress:   toSeiAddr.String(),
 		Amount:      sdk.NewCoins(sdk.NewCoin("usei", sdk.OneInt())),
 	})
+	ti := uint64(0)
 	tx := b.GetTx()
 	bz, _ := Encoder(tx)
 	resBlock := coretypes.ResultBlock{
@@ -366,14 +367,15 @@ func TestEncodeBankTransferMsg(t *testing.T) {
 	bh := common.HexToHash(MockBlockID.Hash.String())
 	to := common.Address(toSeiAddr)
 	require.Equal(t, &ethapi.RPCTransaction{
-		BlockHash:   &bh,
-		BlockNumber: (*hexutil.Big)(big.NewInt(MockHeight8)),
-		From:        fromEvmAddr,
-		To:          &to,
-		Value:       (*hexutil.Big)(big.NewInt(1_000_000_000_000)),
-		Hash:        common.Hash(sha256.Sum256(bz)),
-		V:           nil,
-		R:           nil,
-		S:           nil,
+		BlockHash:        &bh,
+		BlockNumber:      (*hexutil.Big)(big.NewInt(MockHeight8)),
+		From:             fromEvmAddr,
+		To:               &to,
+		Value:            (*hexutil.Big)(big.NewInt(1_000_000_000_000)),
+		Hash:             common.Hash(sha256.Sum256(bz)),
+		TransactionIndex: (*hexutil.Uint64)(&ti),
+		V:                nil,
+		R:                nil,
+		S:                nil,
 	}, txs[0].(*ethapi.RPCTransaction))
 }

evmrpc/tests/block_test.go

@@ -58,3 +58,16 @@ func TestGetBlockByNumber(t *testing.T) {
 		},
 	)
 }
+
+func TestGetBlockSkipTxIndex(t *testing.T) {
+	tx1 := signAndEncodeCosmosTx(bankSendMsg(mnemonic1), mnemonic1, 7, 0)
+	tx2 := signAndEncodeTx(send(0), mnemonic1)
+	SetupTestServer([][][]byte{{tx1, tx2}}, mnemonicInitializer(mnemonic1)).Run(
+		func(port int) {
+			res := sendRequestWithNamespace("eth", port, "getBlockByHash", common.HexToHash("0x2").Hex(), true)
+			txs := res["result"].(map[string]any)["transactions"].([]any)
+			require.Len(t, txs, 1)
+			require.Equal(t, "0x0", txs[0].(map[string]any)["transactionIndex"].(string))
+		},
+	)
+}

evmrpc/tests/tx.go

@@ -9,6 +9,7 @@ import (
 
 	wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
+	banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
 	"github.com/ethereum/go-ethereum/accounts/abi"
 	"github.com/ethereum/go-ethereum/common"
 	ethtypes "github.com/ethereum/go-ethereum/core/types"
@@ -107,3 +108,12 @@ func jsonExtractAsBytesFromArray(nonce uint64) ethtypes.TxData {
 		ChainID:   chainId,
 	}
 }
+
+func bankSendMsg(mnemonic string) sdk.Msg {
+	recipient, _ := testkeeper.MockAddressPair()
+	return &banktypes.MsgSend{
+		FromAddress: getSeiAddrWithMnemonic(mnemonic).String(),
+		ToAddress:   recipient.String(),
+		Amount:      sdk.NewCoins(sdk.NewCoin("usei", sdk.OneInt())),
+	}
+}

evmrpc/tests/utils.go

@@ -204,7 +204,7 @@ func signAndEncodeTx(txData ethtypes.TxData, mnemonic string) []byte {
 }
 
 func signAndEncodeCosmosTx(msg sdk.Msg, mnemonic string, acctN uint64, seq uint64) []byte {
-	tx := signCosmosTxWithMnemonic(msg, mnemonic1, acctN, seq)
+	tx := signCosmosTxWithMnemonic(msg, mnemonic, acctN, seq)
 	txBz, _ := testkeeper.EVMTestApp.GetTxConfig().TxEncoder()(tx)
 	return txBz
 }