From 6172a1a0bf9b406b2de68fcbcd41ed69ff14f890 Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Thu, 29 Jun 2023 14:32:15 +0000
Subject: [PATCH] chore: add apphash to finalize block calls (backport #16744)
 (#16770)

Co-authored-by: Marko <marbar3778@yahoo.com>
---
 baseapp/abci.go | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/baseapp/abci.go b/baseapp/abci.go
index 316e2be3dd..c977f03ed8 100644
--- a/baseapp/abci.go
+++ b/baseapp/abci.go
@@ -667,6 +667,7 @@ func (app *BaseApp) FinalizeBlock(req *abci.RequestFinalizeBlock) (*abci.Respons
 		Time:               req.Time,
 		ProposerAddress:    req.ProposerAddress,
 		NextValidatorsHash: req.NextValidatorsHash,
+		AppHash:            app.LastCommitID().Hash,
 	}
 
 	// Initialize the FinalizeBlock state. If this is the first block, it should
@@ -685,6 +686,7 @@ func (app *BaseApp) FinalizeBlock(req *abci.RequestFinalizeBlock) (*abci.Respons
 				Height:  req.Height,
 				Time:    req.Time,
 				Hash:    req.Hash,
+				AppHash: app.LastCommitID().Hash,
 			})
 	}
 
@@ -701,6 +703,7 @@ func (app *BaseApp) FinalizeBlock(req *abci.RequestFinalizeBlock) (*abci.Respons
 			Height:  req.Height,
 			Time:    req.Time,
 			Hash:    req.Hash,
+			AppHash: app.LastCommitID().Hash,
 		}).WithCometInfo(cometInfo{
 		Misbehavior:     req.Misbehavior,
 		ValidatorsHash:  req.NextValidatorsHash,