Fix bug

baseapp/baseapp.go

@@ -284,13 +284,13 @@ func (app *BaseApp) SetOption(req abci.RequestSetOption) (res abci.ResponseSetOp
 // Implements ABCI
 // InitChain runs the initialization logic directly on the CommitMultiStore and commits it.
 func (app *BaseApp) InitChain(req abci.RequestInitChain) (res abci.ResponseInitChain) {
-	if app.initChainer == nil {
-		return
-	}
-
 	// Initialize the deliver state and check state with ChainID and run initChain
 	app.setDeliverState(abci.Header{ChainID: req.ChainId})
 	app.setCheckState(abci.Header{ChainID: req.ChainId})
+
+	if app.initChainer == nil {
+		return
+	}
 	app.initChainer(app.deliverState.ctx, req) // no error
 
 	// NOTE: we don't commit, but BeginBlock for block 1
@@ -381,6 +381,8 @@ func (app *BaseApp) BeginBlock(req abci.RequestBeginBlock) (res abci.ResponseBeg
 	// if this is a test and InitChain was never called.
 	if app.deliverState == nil {
 		app.setDeliverState(req.Header)
+	} else {
+		app.deliverState.ctx = app.deliverState.ctx.WithBlockHeader(req.Header)
 	}
 	if app.beginBlocker != nil {
 		res = app.beginBlocker(app.deliverState.ctx, req)

baseapp/baseapp_test.go

@@ -386,13 +386,15 @@ func TestSimulateTx(t *testing.T) {
 		return ttx, nil
 	})
 
+	app.InitChain(abci.RequestInitChain{})
+
 	nBlocks := 3
 	for blockN := 0; blockN < nBlocks; blockN++ {
 		// block1
 		header.Height = int64(blockN + 1)
 		app.BeginBlock(abci.RequestBeginBlock{Header: header})
 		result := app.Simulate(tx)
-		require.Equal(t, result.Code, sdk.ABCICodeOK)
+		require.Equal(t, result.Code, sdk.ABCICodeOK, result.Log)
 		require.Equal(t, int64(80), result.GasUsed)
 		counter--
 		encoded, err := json.Marshal(tx)
@@ -405,8 +407,8 @@ func TestSimulateTx(t *testing.T) {
 		require.Equal(t, queryResult.Code, uint32(sdk.ABCICodeOK))
 		var res sdk.Result
 		app.cdc.MustUnmarshalBinary(queryResult.Value, &res)
-		require.Equal(t, sdk.ABCICodeOK, res.Code)
-		require.Equal(t, int64(160), res.GasUsed)
+		require.Equal(t, sdk.ABCICodeOK, res.Code, res.Log)
+		require.Equal(t, int64(160), res.GasUsed, res.Log)
 		app.EndBlock(abci.RequestEndBlock{})
 		app.Commit()
 	}