Merge branch 'main' into julien/lockup

CHANGELOG.md

@@ -59,6 +59,7 @@ Every module contains its own CHANGELOG.md. Please refer to the module you are i
 
 ### Improvements
 
+* (types) [#19869](https://github.com/cosmos/cosmos-sdk/pull/19869) Removed `Any` type from `codec/types` and replaced it with an alias for `cosmos/gogoproto/types/any`.
 * (server) [#19854](https://github.com/cosmos/cosmos-sdk/pull/19854) Add customizability to start command.
     * Add `StartCmdOptions` in `server.AddCommands` instead of `servertypes.ModuleInitFlags`. To set custom flags set them in the `StartCmdOptions` struct on the `AddFlags` field.
     * Add `StartCommandHandler` to `StartCmdOptions` to allow custom start command handlers. Users now have total control over how the app starts.

UPGRADING.md

@@ -440,6 +440,9 @@ 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.**
 
 #### Stringer

baseapp/grpcrouter_test.go

@@ -168,7 +168,7 @@ func testQueryDataRacesSameHandler(t *testing.T, makeClientConn func(*baseapp.GR
 	qr := baseapp.NewGRPCQueryRouter()
 	interfaceRegistry := testdata.NewTestInterfaceRegistry()
 	qr.SetInterfaceRegistry(interfaceRegistry)
-	testdata.RegisterQueryServer(qr, testdata.QueryImpl{})
+	testdata_pulsar.RegisterQueryServer(qr, testdata_pulsar.QueryImpl{})
 
 	// The goal is to invoke the router concurrently and check for any data races.
 	// 0. Run with: go test -race

baseapp/testutil/buf.gen.yaml

@@ -2,4 +2,4 @@ version: v1
 plugins:
   - name: gocosmos
     out: ../..
-    opt: plugins=grpc,Mgoogle/protobuf/any.proto=github.com/cosmos/cosmos-sdk/codec/types
+    opt: plugins=grpc,Mgoogle/protobuf/any.proto=github.com/cosmos/gogoproto/types/any

codec/any_test.go

@@ -3,57 +3,57 @@ package codec_test
 import (
 	"testing"
 
+	"github.com/cosmos/gogoproto/types/any/test"
 	"github.com/stretchr/testify/require"
 
 	"github.com/cosmos/cosmos-sdk/codec"
 	codectestutil "github.com/cosmos/cosmos-sdk/codec/testutil"
 	codectypes "github.com/cosmos/cosmos-sdk/codec/types"
 	"github.com/cosmos/cosmos-sdk/crypto/keys/ed25519"
 	cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types"
-	"github.com/cosmos/cosmos-sdk/testutil/testdata"
 	"github.com/cosmos/cosmos-sdk/types/module/testutil"
 )
 
 func NewTestInterfaceRegistry() codectypes.InterfaceRegistry {
 	registry := codectypes.NewInterfaceRegistry()
-	registry.RegisterInterface("Animal", (*testdata.Animal)(nil))
+	registry.RegisterInterface("Animal", (*test.Animal)(nil))
 	registry.RegisterImplementations(
-		(*testdata.Animal)(nil),
-		&testdata.Dog{},
-		&testdata.Cat{},
+		(*test.Animal)(nil),
+		&test.Dog{},
+		&test.Cat{},
 	)
 	return registry
 }
 
 func TestMarshalAny(t *testing.T) {
 	catRegistry := codectypes.NewInterfaceRegistry()
-	catRegistry.RegisterImplementations((*testdata.Animal)(nil), &testdata.Cat{})
+	catRegistry.RegisterImplementations((*test.Animal)(nil), &test.Cat{})
 
 	registry := codectypes.NewInterfaceRegistry()
 
 	cdc := codec.NewProtoCodec(registry)
 
-	kitty := &testdata.Cat{Moniker: "Kitty"}
+	kitty := &test.Cat{Moniker: "Kitty"}
 	emptyBz, err := cdc.MarshalInterface(kitty)
 	require.ErrorContains(t, err, "does not have a registered interface")
 
 	catBz, err := codec.NewProtoCodec(catRegistry).MarshalInterface(kitty)
 	require.NoError(t, err)
 	require.NotEmpty(t, catBz)
 
-	var animal testdata.Animal
+	var animal test.Animal
 
 	// deserializing cat bytes should error in an empty registry
 	err = cdc.UnmarshalInterface(catBz, &animal)
-	require.ErrorContains(t, err, "no registered implementations of type testdata.Animal")
+	require.ErrorContains(t, err, "no registered implementations of type test.Animal")
 
 	// deserializing an empty byte array will return nil, but no error
 	err = cdc.UnmarshalInterface(emptyBz, &animal)
 	require.Nil(t, animal)
 	require.NoError(t, err)
 
 	// wrong type registration should fail
-	registry.RegisterImplementations((*testdata.Animal)(nil), &testdata.Dog{})
+	registry.RegisterImplementations((*test.Animal)(nil), &test.Dog{})
 	err = cdc.UnmarshalInterface(catBz, &animal)
 	require.Error(t, err)