refactor: undo block api renaming for compatibility (#1722)

## Description

Must maintain parity with naming of the service for running
celestia-app/v3 consensus nodes in standalone mode with a v0.38
cometbft/celestia-core.

This allows the app to create a `BlockAPI` proxy service by enabling the
core grpc server.
See: celestiaorg/cosmos-sdk#453

If this PR is non-trivial/large/complex, please ensure that you have
either
created an issue that the team's had a chance to respond to, or had some
discussion with the team prior to submitting substantial pull requests.
The team
can be reached via GitHub Discussions or the Cosmos Network Discord
server in
the #cometbft channel. GitHub Discussions is preferred over Discord as
it
allows us to keep track of conversations topically.
https://github.com/cometbft/cometbft/discussions

If the work in this PR is not aligned with the team's current
priorities, please
be advised that it may take some time before it is merged - especially
if it has
not yet been discussed with the team.

See the project board for the team's current priorities:
https://github.com/orgs/cometbft/projects/1

-->

---

#### PR checklist

- [ ] Tests written/updated
- [ ] Changelog entry added in `.changelog` (we use
[unclog](https://github.com/informalsystems/unclog) to manage our
changelog)
- [ ] Updated relevant documentation (`docs/` or `spec/`) and code
comments

Author: damiannolan

abci/types/types.pb.go

@@ -43,7 +43,7 @@ service BroadcastAPI {
 }
 
 // BlockAPI is an API for querying blocks.
-service BlockAPIService {
+service BlockAPI {
   // BlockByHash returns a block by its hash.
   rpc BlockByHash(BlockByHashRequest) returns (stream BlockByHashResponse);
   // BlockByHeight returns a block by its height.

proto/tendermint/rpc/grpc/types.pb.go

@@ -222,7 +222,7 @@ func (blockAPI *BlockAPI) Stop(ctx context.Context) error {
 	return err
 }
 
-func (blockAPI *BlockAPI) BlockByHash(req *BlockByHashRequest, stream BlockAPIService_BlockByHashServer) error {
+func (blockAPI *BlockAPI) BlockByHash(req *BlockByHashRequest, stream BlockAPI_BlockByHashServer) error {
 	blockStore := blockAPI.env.BlockStore
 	blockMeta := blockStore.LoadBlockMetaByHash(req.Hash)
 	if blockMeta == nil {
@@ -271,7 +271,7 @@ func (blockAPI *BlockAPI) BlockByHash(req *BlockByHashRequest, stream BlockAPISe
 	return nil
 }
 
-func (blockAPI *BlockAPI) BlockByHeight(req *BlockByHeightRequest, stream BlockAPIService_BlockByHeightServer) error {
+func (blockAPI *BlockAPI) BlockByHeight(req *BlockByHeightRequest, stream BlockAPI_BlockByHeightServer) error {
 	blockStore := blockAPI.env.BlockStore
 	height := req.Height
 	if height == 0 {
@@ -399,7 +399,7 @@ func (blockAPI *BlockAPI) ValidatorSet(_ context.Context, req *ValidatorSetReque
 	}, nil
 }
 
-func (blockAPI *BlockAPI) SubscribeNewHeights(_ *SubscribeNewHeightsRequest, stream BlockAPIService_SubscribeNewHeightsServer) error {
+func (blockAPI *BlockAPI) SubscribeNewHeights(_ *SubscribeNewHeightsRequest, stream BlockAPI_SubscribeNewHeightsServer) error {
 	heightListener := blockAPI.addHeightListener()
 	defer blockAPI.removeHeightListener(heightListener)
 

proto/tendermint/rpc/grpc/types.proto

@@ -29,7 +29,7 @@ func StartGRPCServer(env *core.Environment, ln net.Listener) error {
 
 	// block api
 	api := NewBlockAPI(env)
-	RegisterBlockAPIServiceServer(grpcServer, api)
+	RegisterBlockAPIServer(grpcServer, api)
 
 	// blobstream api
 	blobstreamAPI := NewBlobstreamAPI(env)
@@ -73,7 +73,7 @@ func dialerFunc(_ context.Context, addr string) (net.Conn, error) {
 
 // StartBlockAPIGRPCClient dials the gRPC server using protoAddr and returns a new
 // BlockAPIClient.
-func StartBlockAPIGRPCClient(protoAddr string, opts ...grpc.DialOption) (BlockAPIServiceClient, error) {
+func StartBlockAPIGRPCClient(protoAddr string, opts ...grpc.DialOption) (BlockAPIClient, error) {
 	if len(opts) == 0 {
 		opts = append(opts, grpc.WithTransportCredentials(insecure.NewCredentials()))
 	}
@@ -85,7 +85,7 @@ func StartBlockAPIGRPCClient(protoAddr string, opts ...grpc.DialOption) (BlockAP
 	if err != nil {
 		return nil, err
 	}
-	return NewBlockAPIServiceClient(conn), nil
+	return NewBlockAPIClient(conn), nil
 }
 
 // StartBlobstreamAPIGRPCClient dials the gRPC server using protoAddr and returns a new

rpc/grpc/api.go

@@ -209,7 +209,7 @@ func MaxReqBatchSize(o *Options) {
 	o.maxReqBatchSize = 2
 }
 
-func GetBlockAPIClient() (core_grpc.BlockAPIServiceClient, error) {
+func GetBlockAPIClient() (core_grpc.BlockAPIClient, error) {
 	grpcAddr := globalConfig.RPC.GRPCListenAddress
 	client, err := core_grpc.StartBlockAPIGRPCClient(grpcAddr)
 	if err != nil {