feat: fill block hash in tx response

follow up for #576 (comment)

Author: mmsqe

CHANGELOG.md

@@ -22,7 +22,8 @@
 - [\#496](https://github.com/cosmos/evm/pull/496) Simplify mempool instantiation by using configs instead of objects.
 - [\#568](https://github.com/cosmos/evm/pull/568) Avoid unnecessary block notifications when the event bus is already set up.
 - [\#511](https://github.com/cosmos/evm/pull/511) Minor code cleanup for `AddPrecompileFn`.
-- [\#544](https://github.com/cosmos/evm/pull/544) Parse logs from the txResult.Data and avoid emitting EVM events to cosmos-sdk events.
+- [\#576](https://github.com/cosmos/evm/pull/576) Parse logs from the txResult.Data and avoid emitting EVM events to cosmos-sdk events.
+- [\#585](https://github.com/cosmos/evm/pull/585) Add block hash for tx response.
 
 ### FEATURES
 

api/cosmos/evm/vm/v1/tx.pulsar.go

@@ -73,6 +73,8 @@ message MsgEthereumTxResponse {
   uint64 gas_used = 5;
   // max_used_gas specifies the gas consumed by the transaction, not including refunds
   uint64 max_used_gas = 6;
+  // include the block hash for json-rpc to use
+  bytes block_hash = 7;
 }
 
 // MsgUpdateParams defines a Msg for updating the x/vm module parameters.

proto/cosmos/evm/vm/v1/tx.proto

@@ -729,7 +729,6 @@ func (s *KeeperTestSuite) TestAddLog() {
 			},
 			&ethtypes.Log{
 				Address: addr,
-				TxHash:  txHash,
 				Topics:  make([]common.Hash, 0),
 			},
 			func(vm.StateDB) {},
@@ -743,7 +742,6 @@ func (s *KeeperTestSuite) TestAddLog() {
 			},
 			&ethtypes.Log{
 				Address: addr,
-				TxHash:  txHash3,
 				Topics:  make([]common.Hash, 0),
 			},
 			func(vm.StateDB) {},

tests/integration/x/vm/test_statedb.go

@@ -515,6 +515,7 @@ func (k *Keeper) ApplyMessageWithConfig(ctx sdk.Context, msg core.Message, trace
 		Ret:        ret,
 		Logs:       types.NewLogsFromEth(logs),
 		Hash:       txConfig.TxHash.Hex(),
+		BlockHash:  ctx.HeaderHash(),
 	}, nil
 }
 

x/vm/keeper/state_transition.go

@@ -218,7 +218,6 @@ func (s *StateDB) cache() error {
 func (s *StateDB) AddLog(log *ethtypes.Log) {
 	s.journal.append(addLogChange{})
 
-	log.TxHash = s.txConfig.TxHash
 	log.TxIndex = s.txConfig.TxIndex
 	log.Index = s.txConfig.LogIndex + uint(len(s.logs))
 	s.logs = append(s.logs, log)

x/vm/statedb/statedb.go

@@ -606,7 +606,6 @@ func (suite *StateDBTestSuite) TestLog() {
 		BlockNumber:    1,
 		BlockHash:      blockHash,
 		BlockTimestamp: 1,
-		TxHash:         txHash,
 		TxIndex:        1,
 		Index:          1,
 	}

x/vm/statedb/statedb_test.go

@@ -82,6 +82,9 @@ func logsFromTxResponse(dst []*ethtypes.Log, rsp *MsgEthereumTxResponse, blockNu
 		l := log.ToEthereum()
 		l.TxHash = txHash
 		l.BlockNumber = blockNumber
+		if len(rsp.BlockHash) > 0 {
+			l.BlockHash = common.BytesToHash(rsp.BlockHash)
+		}
 		dst = append(dst, l)
 	}
 	return dst