proto: flatten VersionParams into a single version

As we are introducing whole new cometbft packages for the proto users, it's no great sin to also apply cosmetic renamings retroactively to older releases of the protocol, to reduce versioning of messages.
cometbft · mzabaluev · Apr 21, 2023 · Apr 6, 2023 · Apr 6, 2023 · Apr 6, 2023
commit d2c36a97b35c5c68509d5d874d3bd8be262c5b07
diff --git a/proto/cometbft/types/v1/params.proto b/proto/cometbft/types/v1/params.proto
@@ -68,7 +68,8 @@ message VersionParams {
   option (gogoproto.populate) = true;
   option (gogoproto.equal)    = true;
 
-  uint64 app_version = 1;
+  // Was named app_version in Tendermint 0.34
+  uint64 app = 1;
 }
 
 // HashedParams is a subset of ConsensusParams.

diff --git a/proto/cometbft/types/v2/params.proto b/proto/cometbft/types/v2/params.proto
@@ -14,7 +14,7 @@ message ConsensusParams {
   BlockParams        block     = 1;
   v1.EvidenceParams  evidence  = 2;
   v1.ValidatorParams validator = 3;
-  VersionParams      version   = 4;
+  v1.VersionParams   version   = 4;
 }
 
 // BlockParams contains limits on the block size.
@@ -28,12 +28,3 @@ message BlockParams {
 
   reserved 3;  // was TimeIotaMs see https://github.com/tendermint/tendermint/pull/5792
 }
-
-// VersionParams contains the ABCI application version.
-message VersionParams {
-  option (gogoproto.populate) = true;
-  option (gogoproto.equal)    = true;
-
-  // Was named app_version in v1
-  uint64 app = 1;
-}
diff --git a/proto/cometbft/types/v3/params.proto b/proto/cometbft/types/v3/params.proto
@@ -15,7 +15,7 @@ message ConsensusParams {
   v2.BlockParams     block     = 1;
   v1.EvidenceParams  evidence  = 2;
   v1.ValidatorParams validator = 3;
-  v2.VersionParams   version   = 4;
+  v1.VersionParams   version   = 4;
   ABCIParams         abci      = 5;
 }