diff --git a/rpc/ethereum/backend/backend.go b/rpc/ethereum/backend/backend.go index fb35d6619d..669bbeb9d6 100644 --- a/rpc/ethereum/backend/backend.go +++ b/rpc/ethereum/backend/backend.go @@ -64,6 +64,7 @@ type Backend interface { ChainConfig() *params.ChainConfig SuggestGasTipCap() (*big.Int, error) GetFilteredBlocks(from int64, to int64, filter [][]filters.BloomIV, filterAddresses bool) ([]int64, error) + GetEthereumMsgsFromTendermintBlock(block *tmrpctypes.ResultBlock) []*evmtypes.MsgEthereumTx } var _ Backend = (*EVMBackend)(nil) @@ -260,6 +261,14 @@ func (e *EVMBackend) EthBlockFromTendermint( } hash := ethMsg.AsTransaction().Hash() + + // check tx exists on EVM and it has the correct block height + tx, err := e.GetTxByEthHash(hash) + if err != nil || tx.Height != block.Height { + e.logger.Debug("failed to query eth tx", "hash", hash) + continue + } + if !fullTx { ethRPCTxs = append(ethRPCTxs, hash) continue @@ -532,11 +541,12 @@ func (e *EVMBackend) GetCoinbase() (sdk.AccAddress, error) { // GetTransactionByHash returns the Ethereum format transaction identified by Ethereum transaction hash func (e *EVMBackend) GetTransactionByHash(txHash common.Hash) (*types.RPCTransaction, error) { res, err := e.GetTxByEthHash(txHash) + hexTx := txHash.Hex() if err != nil { // try to find tx in mempool txs, err := e.PendingTransactions() if err != nil { - e.logger.Debug("tx not found", "hash", txHash.Hex(), "error", err.Error()) + e.logger.Debug("tx not found", "hash", hexTx, "error", err.Error()) return nil, nil } @@ -547,7 +557,7 @@ func (e *EVMBackend) GetTransactionByHash(txHash common.Hash) (*types.RPCTransac continue } - if msg.Hash == txHash.Hex() { + if msg.Hash == hexTx { rpctx, err := types.NewTransactionFromMsg( msg, common.Hash{}, @@ -562,7 +572,7 @@ func (e *EVMBackend) GetTransactionByHash(txHash common.Hash) (*types.RPCTransac } } - e.logger.Debug("tx not found", "hash", txHash.Hex()) + e.logger.Debug("tx not found", "hash", hexTx) return nil, nil } @@ -572,23 +582,23 @@ func (e *EVMBackend) GetTransactionByHash(txHash common.Hash) (*types.RPCTransac return nil, nil } - tx, err := e.clientCtx.TxConfig.TxDecoder()(res.Tx) - if err != nil { - e.logger.Debug("decoding failed", "error", err.Error()) - return nil, fmt.Errorf("failed to decode tx: %w", err) - } + var txIndex uint64 + msgs := e.GetEthereumMsgsFromTendermintBlock(resBlock) - msg, err := evmtypes.UnwrapEthereumMsg(&tx) - if err != nil { - e.logger.Debug("invalid tx", "error", err.Error()) - return nil, err + for i := range msgs { + if msgs[i].Hash == hexTx { + txIndex = uint64(i) + break + } } + msg := msgs[txIndex] + return types.NewTransactionFromMsg( msg, common.BytesToHash(resBlock.Block.Hash()), uint64(res.Height), - uint64(res.Index), + txIndex, e.chainID, ) } @@ -845,6 +855,39 @@ BLOCKS: return matchedBlocks, nil } +// GetEthereumMsgsFromTendermintBlock returns all real MsgEthereumTxs from a Tendermint block. +// It also ensures consistency over the correct txs indexes across RPC endpoints +func (e *EVMBackend) GetEthereumMsgsFromTendermintBlock(block *tmrpctypes.ResultBlock) []*evmtypes.MsgEthereumTx { + var result []*evmtypes.MsgEthereumTx + + for _, tx := range block.Block.Txs { + tx, err := e.clientCtx.TxConfig.TxDecoder()(tx) + if err != nil { + e.logger.Debug("failed to decode transaction in block", "height", block.Block.Height, "error", err.Error()) + continue + } + + for _, msg := range tx.GetMsgs() { + ethMsg, ok := msg.(*evmtypes.MsgEthereumTx) + if !ok { + continue + } + + hash := ethMsg.AsTransaction().Hash() + // check tx exists on EVM and has the correct block height + ethTx, err := e.GetTxByEthHash(hash) + if err != nil || ethTx.Height != block.Block.Height { + e.logger.Debug("failed to query eth tx hash", "hash", hash.Hex()) + continue + } + + result = append(result, ethMsg) + } + } + + return result +} + // checkMatches revised the function from // https://github.com/ethereum/go-ethereum/blob/401354976bb44f0ad4455ca1e0b5c0dc31d9a5f5/core/types/bloom9.go#L88 func checkMatches(bloom ethtypes.Bloom, filter []filters.BloomIV) bool { diff --git a/rpc/ethereum/namespaces/eth/api.go b/rpc/ethereum/namespaces/eth/api.go index 76f926c4e8..bd2f137e55 100644 --- a/rpc/ethereum/namespaces/eth/api.go +++ b/rpc/ethereum/namespaces/eth/api.go @@ -268,7 +268,8 @@ func (e *PublicAPI) GetBlockTransactionCountByHash(hash common.Hash) *hexutil.Ui return nil } - n := hexutil.Uint(len(resBlock.Block.Txs)) + ethMsgs := e.backend.GetEthereumMsgsFromTendermintBlock(resBlock) + n := hexutil.Uint(len(ethMsgs)) return &n } @@ -286,7 +287,8 @@ func (e *PublicAPI) GetBlockTransactionCountByNumber(blockNum rpctypes.BlockNumb return nil } - n := hexutil.Uint(len(resBlock.Block.Txs)) + ethMsgs := e.backend.GetEthereumMsgsFromTendermintBlock(resBlock) + n := hexutil.Uint(len(ethMsgs)) return &n } @@ -526,23 +528,13 @@ func (e *PublicAPI) GetTransactionByBlockHashAndIndex(hash common.Hash, idx hexu } i := int(idx) - if i >= len(resBlock.Block.Txs) { + ethMsgs := e.backend.GetEthereumMsgsFromTendermintBlock(resBlock) + if i >= len(ethMsgs) { e.logger.Debug("block txs index out of bound", "index", i) return nil, nil } - txBz := resBlock.Block.Txs[i] - tx, err := e.clientCtx.TxConfig.TxDecoder()(txBz) - if err != nil { - e.logger.Debug("decoding failed", "error", err.Error()) - return nil, fmt.Errorf("failed to decode tx: %w", err) - } - - msg, err := evmtypes.UnwrapEthereumMsg(&tx) - if err != nil { - e.logger.Debug("invalid tx", "error", err.Error()) - return nil, err - } + msg := ethMsgs[i] return rpctypes.NewTransactionFromMsg( msg, @@ -569,23 +561,13 @@ func (e *PublicAPI) GetTransactionByBlockNumberAndIndex(blockNum rpctypes.BlockN } i := int(idx) - if i >= len(resBlock.Block.Txs) { + ethMsgs := e.backend.GetEthereumMsgsFromTendermintBlock(resBlock) + if i >= len(ethMsgs) { e.logger.Debug("block txs index out of bound", "index", i) return nil, nil } - txBz := resBlock.Block.Txs[i] - tx, err := e.clientCtx.TxConfig.TxDecoder()(txBz) - if err != nil { - e.logger.Debug("decoding failed", "error", err.Error()) - return nil, fmt.Errorf("failed to decode tx: %w", err) - } - - msg, err := evmtypes.UnwrapEthereumMsg(&tx) - if err != nil { - e.logger.Debug("invalid tx", "error", err.Error()) - return nil, err - } + msg := ethMsgs[i] return rpctypes.NewTransactionFromMsg( msg, @@ -598,11 +580,12 @@ func (e *PublicAPI) GetTransactionByBlockNumberAndIndex(blockNum rpctypes.BlockN // GetTransactionReceipt returns the transaction receipt identified by hash. func (e *PublicAPI) GetTransactionReceipt(hash common.Hash) (map[string]interface{}, error) { - e.logger.Debug("eth_getTransactionReceipt", "hash", hash.Hex()) + hexTx := hash.Hex() + e.logger.Debug("eth_getTransactionReceipt", "hash", hexTx) res, err := e.backend.GetTxByEthHash(hash) if err != nil { - e.logger.Debug("tx not found", "hash", hash.Hex(), "error", err.Error()) + e.logger.Debug("tx not found", "hash", hexTx, "error", err.Error()) return nil, nil } @@ -656,7 +639,17 @@ func (e *PublicAPI) GetTransactionReceipt(hash common.Hash) (map[string]interfac logs, err := e.backend.GetTransactionLogs(hash) if err != nil { - e.logger.Debug("logs not found", "hash", hash.Hex(), "error", err.Error()) + e.logger.Debug("logs not found", "hash", hexTx, "error", err.Error()) + } + + // get eth index based on block's txs + var txIndex uint64 + msgs := e.backend.GetEthereumMsgsFromTendermintBlock(resBlock) + for i := range msgs { + if msgs[i].Hash == hexTx { + txIndex = uint64(i) + break + } } receipt := map[string]interface{}{ @@ -677,7 +670,7 @@ func (e *PublicAPI) GetTransactionReceipt(hash common.Hash) (map[string]interfac // transaction corresponding to this receipt. "blockHash": common.BytesToHash(resBlock.Block.Header.Hash()).Hex(), "blockNumber": hexutil.Uint64(res.Height), - "transactionIndex": hexutil.Uint64(res.Index), + "transactionIndex": hexutil.Uint64(txIndex), // sender and receiver (contract or EOA) addreses "from": from, @@ -696,7 +689,7 @@ func (e *PublicAPI) GetTransactionReceipt(hash common.Hash) (map[string]interfac return receipt, nil } -// PendingTransactions returns the transactions that are in the transaction pool +// GetPendingTransactions returns the transactions that are in the transaction pool // and have a from address that is one of the accounts this node manages. func (e *PublicAPI) GetPendingTransactions() ([]*rpctypes.RPCTransaction, error) { e.logger.Debug("eth_getPendingTransactions")