abci++: Remove intermediate protos (tendermint#8414)

* Sync protos with their intermediates

Signed-off-by: Thane Thomson <connect@thanethomson.com>

* Remove intermediate protos and their supporting scripts

Signed-off-by: Thane Thomson <connect@thanethomson.com>

* make proto-gen

Signed-off-by: Thane Thomson <connect@thanethomson.com>

Makefile

@@ -117,12 +117,6 @@ proto-check-breaking: check-proto-deps
 	@buf breaking --against ".git"
 .PHONY: proto-check-breaking
 
-# TODO: Should be removed when work on ABCI++ is complete.
-# For more information, see https://github.com/tendermint/tendermint/issues/8066
-abci-proto-gen:
-	./scripts/abci-gen.sh
-.PHONY: abci-proto-gen
-
 ###############################################################################
 ###                              Build ABCI                                 ###
 ###############################################################################

proto/tendermint/abci/types.proto

@@ -3,8 +3,6 @@ package tendermint.abci;
 
 option go_package = "github.com/tendermint/tendermint/abci/types";
 
-// For more information on gogo.proto, see:
-// https://github.com/gogo/protobuf/blob/master/extensions.md
 import "tendermint/crypto/proof.proto";
 import "tendermint/types/types.proto";
 import "tendermint/crypto/keys.proto";
@@ -354,7 +352,6 @@ message ResponseExtendVote {
   bytes vote_extension = 1;
 }
 
-
 message ResponseVerifyVoteExtension {
   VerifyStatus status = 1;
 
@@ -383,6 +380,9 @@ message CommitInfo {
   repeated VoteInfo votes = 2 [(gogoproto.nullable) = false];
 }
 
+// ExtendedCommitInfo is similar to CommitInfo except that it is only used in
+// the PrepareProposal request such that Tendermint can provide vote extensions
+// to the application.
 message ExtendedCommitInfo {
   // The round at which the block proposer decided in the previous height.
   int32 round = 1;
@@ -476,7 +476,6 @@ message ExtendedVoteInfo {
   bytes vote_extension = 3;
 }
 
-
 enum MisbehaviorType {
   UNKNOWN             = 0;
   DUPLICATE_VOTE      = 1;