filter non eth txs in block rpc response

CHANGELOG.md

@@ -59,6 +59,7 @@ Ref: https://keepachangelog.com/en/1.0.0/
 * (evm, test) [tharsis#649](https://github.com/tharsis/ethermint/pull/649) Test DynamicFeeTx.
 * (evm) [tharsis#702](https://github.com/tharsis/ethermint/pull/702) Fix panic in web3 RPC handlers 
 * (rpc) [tharsis#720](https://github.com/tharsis/ethermint/pull/720) Fix `debug_traceTransaction` failure
+* (rpc) [tharsis#741](https://github.com/tharsis/ethermint/pull/741) Fix `eth_getBlockByNumberAndHash` return with non eth txs 
 
 ### Improvements
 

rpc/ethereum/backend/backend.go

@@ -355,6 +355,13 @@ func (e *EVMBackend) EthBlockFromTendermint(
 
 			tx := ethMsg.AsTransaction()
 
+			// check tx exists on EVM
+			_, err := e.GetTxByEthHash(tx.Hash())
+			if err != nil {
+				e.logger.Debug("failed to query eth tx hash", "hash", tx.Hash().Hex(), "error", err.Error())
+				continue
+			}
+
 			if !fullTx {
 				hash := tx.Hash()
 				ethRPCTxs = append(ethRPCTxs, hash)