Merge remote-tracking branch 'origin/main' into obj_store

Author: mmsqe

server/v2/cometbft/abci_test.go

@@ -959,10 +959,10 @@ func TestOptimisticExecution(t *testing.T) {
 	require.Equal(t, resp.Status, abciproto.PROCESS_PROPOSAL_STATUS_ACCEPT)
 
 	// Initialize FinalizeBlock with correct hash - should use optimistic result
-	theHash = sha256.Sum256([]byte("test"))
+	theHash2 := sha256.Sum256([]byte("test"))
 	fbReq := &abciproto.FinalizeBlockRequest{
 		Height: 2,
-		Hash:   theHash[:],
+		Hash:   theHash2[:],
 		Time:   ppReq.Time,
 		Txs:    ppReq.Txs,
 	}