cometbft · mzabaluev · Nov 27, 2023 · Nov 21, 2023 · Nov 22, 2023 · Nov 22, 2023
diff --git a/.changelog/unreleased/breaking-changes/1533-proto-renames-fix-buf-lints.md b/.changelog/unreleased/breaking-changes/1533-proto-renames-fix-buf-lints.md
@@ -1,6 +1,6 @@
 - `[abci]` Renamed the alias types for gRPC requests, responses, and service
   instances to follow the naming changes in the proto-derived
-  `api/cometbft/abci/v1beta4` package
+  `api/cometbft/abci/v1` package
   ([\#1533](https://github.com/cometbft/cometbft/pull/1533)):
   * The prefixed naming pattern `RequestFoo`, `ReponseFoo` changed to
     suffixed `FooRequest`, `FooResponse`.

diff --git a/.changelog/unreleased/breaking-changes/495-proto-version-packages.md b/.changelog/unreleased/breaking-changes/495-proto-version-packages.md
@@ -1,8 +1,9 @@
 - `[proto]` Renamed the packages from `tendermint.*` to `cometbft.*`
   and introduced versioned packages to distinguish between proto definitions
-  released in 0.34.x, 0.37.x, 0.38.x, and 0.39.x versions.
-  Prior to the eventual 1.0 release, the versioned packages are suffixed with
-  `.v1beta1`, `.v1beta2`, and so on.
+  released in 0.34.x, 0.37.x, 0.38.x, and 1.0.x versions.
+  Prior to the 1.0 release, the versioned packages are suffixed with
+  `.v1beta1`, `.v1beta2`, and so on; all definitions describing the protocols
+  as per the 1.0.0 release are in packages suffixed with `.v1`. 
   Relocated generated Go code into a new `api` folder and changed the import
   paths accordingly.
   ([\#495](https://github.com/cometbft/cometbft/pull/495)

diff --git a/abci/client/mocks/client.go b/abci/client/mocks/client.go
diff --git a/abci/cmd/abci-cli/abci-cli.go b/abci/cmd/abci-cli/abci-cli.go
@@ -20,7 +20,7 @@ import (
 	servertest "github.com/cometbft/cometbft/abci/tests/server"
 	"github.com/cometbft/cometbft/abci/types"
 	"github.com/cometbft/cometbft/abci/version"
-	crypto "github.com/cometbft/cometbft/api/cometbft/crypto/v1beta1"
+	crypto "github.com/cometbft/cometbft/api/cometbft/crypto/v1"
 )
 
 // client is a global variable so it can be reused by the console

diff --git a/abci/example/kvstore/helpers.go b/abci/example/kvstore/helpers.go
@@ -7,7 +7,7 @@ import (
 	"strings"
 
 	"github.com/cometbft/cometbft/abci/types"
-	pbcrypto "github.com/cometbft/cometbft/api/cometbft/crypto/v1beta1"
+	pbcrypto "github.com/cometbft/cometbft/api/cometbft/crypto/v1"
 	cryptoencoding "github.com/cometbft/cometbft/crypto/encoding"
 	cmtrand "github.com/cometbft/cometbft/internal/rand"
 )

diff --git a/abci/example/kvstore/kvstore.go b/abci/example/kvstore/kvstore.go
@@ -13,7 +13,7 @@ import (
 	dbm "github.com/cometbft/cometbft-db"
 
 	"github.com/cometbft/cometbft/abci/types"
-	cryptoproto "github.com/cometbft/cometbft/api/cometbft/crypto/v1beta1"
+	cryptoproto "github.com/cometbft/cometbft/api/cometbft/crypto/v1"
 	cryptoencoding "github.com/cometbft/cometbft/crypto/encoding"
 	"github.com/cometbft/cometbft/libs/log"
 	"github.com/cometbft/cometbft/version"

diff --git a/abci/types/messages.go b/abci/types/messages.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/cosmos/gogoproto/proto"
 
-	pb "github.com/cometbft/cometbft/api/cometbft/abci/v1beta4"
+	pb "github.com/cometbft/cometbft/api/cometbft/abci/v1"
 	"github.com/cometbft/cometbft/internal/protoio"
 )
 

diff --git a/abci/types/messages_test.go b/abci/types/messages_test.go
@@ -9,7 +9,7 @@ import (
 	"github.com/cosmos/gogoproto/proto"
 	"github.com/stretchr/testify/assert"
 
-	cmtproto "github.com/cometbft/cometbft/types/proto"
+	cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v1"
 )
 
 func TestMarshalJSON(t *testing.T) {