Merge branch 'main' into julien/encoder-autocli

Author: julienrbrt

UPGRADING.md

@@ -148,6 +148,8 @@ There is no longer a need for the Cosmos SDK to host these protos for itself and
 That package containing proto v2 generated code, but the SDK now uses [buf generated go SDK instead](https://buf.build/docs/bsr/generated-sdks/go).
 If you were depending on `cosmossdk.io/api/tendermint`, please use the buf generated go SDK instead, or ask CometBFT host the generated proto v2 code.
 
+The `codectypes.Any` has moved to `github.com/cosmos/gogoproto/types/any`. Module developers can update the `buf.gen.gogo.yaml` configuration files by adjusting the corresponding `opt` option to `Mgoogle/protobuf/any.proto=github.com/cosmos/gogoproto/types/any` for directly mapping the`Any` type to its new location. This change is optional as `codectypes.Any` is aliased to `gogoproto.Any` in the SDK.
+
 ### Modules
 
 #### `**all**`
@@ -440,10 +442,7 @@ With the deprecation of the Amino JSON codec defined in [cosmos/gogoproto](https
 
 For core SDK types equivalence is asserted by generative testing of [SignableTypes](https://github.com/cosmos/cosmos-sdk/blob/v0.50.0-beta.0/tests/integration/rapidgen/rapidgen.go#L102) in [TestAminoJSON_Equivalence](https://github.com/cosmos/cosmos-sdk/blob/v0.50.0-beta.0/tests/integration/tx/aminojson/aminojson_test.go#L94).
 
-Due to the `Any` type moving to the `github.com/cosmos/gogoproto/types/any` repository, module developers must update the `buf.gen.gogo.yaml` configuration files by adjusting the corresponding `opt` option to `Mgoogle/protobuf/any.proto=github.com/cosmos/gogoproto/types/any` for correct mapping to the new `Any` type location.
-
-
-**TODO: summarize proto annotation requirements.**
+Read more about the available annotations [here](https://docs.cosmos.network/v0.50/build/building-modules/protobuf-annotations).
 
 #### Stringer
 

client/cmd.go

@@ -168,7 +168,7 @@ func ReadPersistentCommandFlags(clientCtx Context, flagSet *pflag.FlagSet) (Cont
 				})))
 			}
 
-			grpcClient, err := grpc.Dial(grpcURI, dialOpts...)
+			grpcClient, err := grpc.NewClient(grpcURI, dialOpts...)
 			if err != nil {
 				return Context{}, err
 			}

client/config/config.go

@@ -175,7 +175,7 @@ func getGRPCClient(grpcConfig GRPCConfig) (*grpc.ClientConn, error) {
 	}
 
 	dialOptions := []grpc.DialOption{transport}
-	grpcClient, err := grpc.Dial(grpcConfig.Address, dialOptions...)
+	grpcClient, err := grpc.NewClient(grpcConfig.Address, dialOptions...)
 	if err != nil {
 		return nil, fmt.Errorf("failed to dial gRPC server at %s: %w", grpcConfig.Address, err)
 	}

server/start.go

@@ -473,7 +473,7 @@ func startGrpcServer(
 	}
 
 	// if gRPC is enabled, configure gRPC client for gRPC gateway
-	grpcClient, err := grpc.Dial(
+	grpcClient, err := grpc.NewClient(
 		config.Address,
 		grpc.WithTransportCredentials(insecure.NewCredentials()),
 		grpc.WithDefaultCallOptions(

store/db/rocksdb_noflag.go

@@ -86,29 +86,3 @@ func (itr *rocksDBIterator) Close() error {
 func (itr *rocksDBIterator) assertIsValid() {
 	panic("rocksdb must be built with -tags rocksdb")
 }
-
-type rocksDBBatch struct{}
-
-func (b *rocksDBBatch) Set(key, value []byte) error {
-	panic("rocksdb must be built with -tags rocksdb")
-}
-
-func (b *rocksDBBatch) Delete(key []byte) error {
-	panic("rocksdb must be built with -tags rocksdb")
-}
-
-func (b *rocksDBBatch) Write() error {
-	panic("rocksdb must be built with -tags rocksdb")
-}
-
-func (b *rocksDBBatch) WriteSync() error {
-	panic("rocksdb must be built with -tags rocksdb")
-}
-
-func (b *rocksDBBatch) Close() error {
-	panic("rocksdb must be built with -tags rocksdb")
-}
-
-func (b *rocksDBBatch) GetByteSize() (int, error) {
-	panic("rocksdb must be built with -tags rocksdb")
-}

store/root/migrate_test.go

@@ -88,7 +88,7 @@ func (s *MigrateStoreTestSuite) TestMigrateState() {
 	s.Require().NoError(err)
 
 	// start the migration process
-	s.rootStore.StartMigration()
+	s.Require().NoError(s.rootStore.StartMigration())
 
 	// continue to apply changeset against the original store
 	latestVersion := originalLatestVersion + 1

tests/integration/server/grpc/server_test.go

@@ -52,7 +52,7 @@ func (s *IntegrationTestSuite) SetupSuite() {
 	s.Require().NoError(err)
 
 	val0 := s.network.GetValidators()[0]
-	s.conn, err = grpc.Dial(
+	s.conn, err = grpc.NewClient(
 		val0.GetAppConfig().GRPC.Address,
 		grpc.WithInsecure(), //nolint:staticcheck // ignore SA1019, we don't need to use a secure connection for tests
 		grpc.WithDefaultCallOptions(grpc.ForceCodec(codec.NewProtoCodec(s.cfg.InterfaceRegistry).GRPCCodec())),

tests/starship/tests/suite.go

@@ -55,7 +55,7 @@ func (s *TestSuite) SetupTest() {
 
 	s.cdc = encodingConfig
 
-	grpcConn, err := grpc.Dial(
+	grpcConn, err := grpc.NewClient(
 		fmt.Sprintf("127.0.0.1:%d", config.GetChain(chainID).Ports.Grpc),
 		grpc.WithInsecure(), //nolint:staticcheck // ignore SA1019, we don't need to use a secure connection for tests
 		grpc.WithDefaultCallOptions(grpc.ForceCodec(codec.NewProtoCodec(s.cdc.InterfaceRegistry).GRPCCodec())))

tools/hubl/internal/load.go

@@ -174,7 +174,7 @@ func (c *ChainInfo) OpenClient() (*grpc.ClientConn, error) {
 		}
 
 		var err error
-		c.client, err = grpc.Dial(endpoint.Endpoint, grpc.WithTransportCredentials(creds))
+		c.client, err = grpc.NewClient(endpoint.Endpoint, grpc.WithTransportCredentials(creds))
 		if err != nil {
 			res = errors.Join(res, err)
 			continue

x/accounts/defaults/lockup/lockup.go

@@ -6,6 +6,8 @@ import (
 	"fmt"
 	"time"
 
+	"github.com/cosmos/gogoproto/proto"
+
 	"cosmossdk.io/collections"
 	collcodec "cosmossdk.io/collections/codec"
 	"cosmossdk.io/core/address"
@@ -15,9 +17,8 @@ import (
 	"cosmossdk.io/x/accounts/accountstd"
 	lockuptypes "cosmossdk.io/x/accounts/defaults/lockup/types"
 	banktypes "cosmossdk.io/x/bank/types"
-	codectypes "github.com/cosmos/cosmos-sdk/codec/types"
-	"github.com/cosmos/gogoproto/proto"
 
+	codectypes "github.com/cosmos/cosmos-sdk/codec/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
 )