Merge branch 'main' into julian/use-factoryv2

.github/CODEOWNERS

@@ -10,62 +10,62 @@
 
 # Components
 
-/baseapp/ @facundomedica @aaronc @testinginprod @kocubinski @cosmos/sdk-core-dev
+/baseapp/ @cosmos/sdk-core-dev
 /client/ @julienrbrt @JulianToledano @cosmos/sdk-core-dev
 /client/v2/ @julienrbrt @JulianToledano @cosmos/sdk-core-dev
-/collections/ @testinginprod @facundomedica @cosmos/sdk-core-dev
+/collections/ @cosmos/sdk-core-dev
 /core/ @cosmos/sdk-core-dev
 /crypto/ @JulianToledano @raynaudoe @cosmos/sdk-core-dev
-/depinject/ @aaronc @kocubinski @julienrbrt @cosmos/sdk-core-dev
-/indexer/ @aaronc @cool-develope @cosmos/sdk-core-dev
-/log/ @julienrbrt @sontrinh16 @cosmos/sdk-core-dev
-/math/ @testinginprod @alpe @cosmos/sdk-core-dev
-/orm/ @aaronc @testinginprod @lucaslopezf @cosmos/sdk-core-dev
-/runtime/ @julienrbrt @hieuvubk @cosmos/sdk-core-dev
-/runtime/v2/ @julienrbrt @hieuvubk @cosmos/sdk-core-dev
-/schema/ @aaronc @testinginprod @cosmos/sdk-core-dev
+/depinject/ @julienrbrt @cosmos/sdk-core-dev
+/indexer/ @cosmos/sdk-core-dev
+/log/ @julienrbrt @cosmos/sdk-core-dev
+/math/ @alpe @cosmos/sdk-core-dev
+/orm/ @lucaslopezf @cosmos/sdk-core-dev
+/runtime/ @julienrbrt @cosmos/sdk-core-dev
+/runtime/v2/ @julienrbrt @cosmos/sdk-core-dev
+/schema/ @cosmos/sdk-core-dev
 /server/ @cosmos/sdk-core-dev
-/server/v2/ @julienrbrt @hieuvubk @kocubinski @cosmos/sdk-core-dev
-/server/v2/stf/ @testinginprod @kocubinski @cosmos/sdk-core-dev
-/server/v2/appmanager/ @testinginprod @facundomedica @cosmos/sdk-core-dev
-/server/v2/cometbft/ @facundomedica @sontrinh16 @cosmos/sdk-core-dev
-/simsx @alpe @facundomedica @kocubinski @cosmos/sdk-core-dev
-/simapp/ @facundomedica @julienrbrt @cosmos/sdk-core-dev
-/simapp/v2/ @kocubinski @julienrbrt @cosmos/sdk-core-dev
-/store/ @cool-develope @kocubinski @cosmos/sdk-core-dev
-/store/v2/ @cool-develope @kocubinski @cosmos/sdk-core-dev
-/types/mempool/ @kocubinski @cosmos/sdk-core-dev
+/server/v2/ @julienrbrt @cosmos/sdk-core-dev
+/server/v2/stf/ @cosmos/sdk-core-dev
+/server/v2/appmanager/ @cosmos/sdk-core-dev
+/server/v2/cometbft/ @cosmos/sdk-core-dev
+/simsx @alpe @cosmos/sdk-core-dev
+/simapp/ @julienrbrt @cosmos/sdk-core-dev
+/simapp/v2/ @julienrbrt @cosmos/sdk-core-dev
+/store/ @cosmos/sdk-core-dev
+/store/v2/ @cosmos/sdk-core-dev
+/types/mempool/ @cosmos/sdk-core-dev
 /tools/hubl @julienrbrt @JulianToledano @cosmos/sdk-core-dev
-/tools/cosmovisor @julienrbrt @facundomedica @cosmos/sdk-core-dev
-/tools/confix @julienrbrt @akhilkumarpilli @cosmos/sdk-core-dev
-/tests/integration/aminojson @kocubinski @cosmos/sdk-core-dev
+/tools/cosmovisor @julienrbrt @cosmos/sdk-core-dev
+/tools/confix @julienrbrt @cosmos/sdk-core-dev
+/tests/integration/aminojson @cosmos/sdk-core-dev
 
 # x modules
 
-/x/accounts/ @testinginprod @sontrinh16 @cosmos/sdk-core-dev
-/x/auth/ @facundomedica @testinginprod @aaronc @cosmos/sdk-core-dev
-/x/auth/tx/config @julienrbrt @akhilkumarpilli @kocubinski @cosmos/sdk-core-dev
-/x/authz/ @akhilkumarpilli @raynaudoe @cosmos/sdk-core-dev
-/x/bank/ @julienrbrt @sontrinh16 @cosmos/sdk-core-dev
-/x/bank/v2 @julienrbrt @hieuvubk @akhilkumarpilli @cosmos/sdk-core-dev
-/x/circuit/ @kocubinski @akhilkumarpilli @raynaudoe @cosmos/sdk-core-dev
-/x/consensus/ @testinginprod @raynaudoe @cosmos/sdk-core-dev
+/x/accounts/ @cosmos/sdk-core-dev
+/x/auth/ @cosmos/sdk-core-dev
+/x/auth/tx/config @julienrbrt @cosmos/sdk-core-dev
+/x/authz/ @raynaudoe @cosmos/sdk-core-dev
+/x/bank/ @julienrbrt @cosmos/sdk-core-dev
+/x/bank/v2 @julienrbrt @cosmos/sdk-core-dev
+/x/circuit/ @raynaudoe @cosmos/sdk-core-dev
+/x/consensus/ @raynaudoe @cosmos/sdk-core-dev
 /x/distribution/ @alpe @JulianToledano @cosmos/sdk-core-dev
-/x/epochs/ @alpe @facundomedica @cosmos/sdk-core-dev
-/x/evidence/ @alpe @akhilkumarpilli @cosmos/sdk-core-dev
-/x/feegrant/ @cool-develope @alpe @cosmos/sdk-core-dev
-/x/genutil/ @kocubinski @hieuvubk @julienrbrt @cosmos/sdk-core-dev
-/x/gov/ @julienrbrt @sontrinh16 @cosmos/sdk-core-dev
-/x/group/ @kocubinski @akhilkumarpilli @cosmos/sdk-core-dev
-/x/mint/ @lucaslopezf @facundomedica @cosmos/sdk-core-dev
+/x/epochs/ @alpe @cosmos/sdk-core-dev
+/x/evidence/ @alpe @cosmos/sdk-core-dev
+/x/feegrant/ @alpe @cosmos/sdk-core-dev
+/x/genutil/ @julienrbrt @cosmos/sdk-core-dev
+/x/gov/ @julienrbrt @cosmos/sdk-core-dev
+/x/group/ @cosmos/sdk-core-dev
+/x/mint/ @lucaslopezf @cosmos/sdk-core-dev
 /x/nft/ @alpe @lucaslopezf @cosmos/sdk-core-dev
-/x/protocolpool/ @facundomedica @hieuvubk @alpe @cosmos/sdk-core-dev
+/x/protocolpool/ @alpe @cosmos/sdk-core-dev
 /x/simulation/ @cosmos/sdk-core-dev # deprecated so whole team
-/x/slashing/ @testinginprod @raynaudoe @lucaslopezf @cosmos/sdk-core-dev
-/x/staking/ @facundomedica @testinginprod @JulianToledano @ziscky @cosmos/sdk-core-dev
-/x/tx/ @kocubinski @testinginprod @aaronc @cosmos/sdk-core-dev
-/x/upgrade/ @facundomedica @cool-develope @akhilkumarpilli @lucaslopezf @cosmos/sdk-core-dev
-/x/validate @julienrbrt @akhilkumarpilli @kocubinski @cosmos/sdk-core-dev
+/x/slashing/ @raynaudoe @lucaslopezf @cosmos/sdk-core-dev
+/x/staking/ @JulianToledano @ziscky @cosmos/sdk-core-dev
+/x/tx/ @cosmos/sdk-core-dev
+/x/upgrade/ @lucaslopezf @cosmos/sdk-core-dev
+/x/validate @julienrbrt @cosmos/sdk-core-dev
 
 # go mods
 
@@ -74,11 +74,11 @@
 
 # ci & build
 
-.github/ @auricom @julienrbrt @tac0turtle
-scripts/ @auricom @julienrbrt @tac0turtle
-contrib/ @auricom @julienrbrt @tac0turtle
-*.mk @auricom @julienrbrt @tac0turtle
-Makefile @auricom @julienrbrt @tac0turtle
+.github/ @julienrbrt @tac0turtle
+scripts/ @julienrbrt @tac0turtle
+contrib/ @julienrbrt @tac0turtle
+*.mk @julienrbrt @tac0turtle
+Makefile @julienrbrt @tac0turtle
 
 # docs configuration
 

CHANGELOG.md

@@ -41,7 +41,7 @@ Ref: https://keepachangelog.com/en/1.0.0/
 Every module contains its own CHANGELOG.md. Please refer to the module you are interested in.
 
 ### Features
-
+* (sims) [#23013](https://github.com/cosmos/cosmos-sdk/pull/23013) Integration with app v2
 * (baseapp) [#20291](https://github.com/cosmos/cosmos-sdk/pull/20291) Simulate nested messages.
 * (client/keys) [#21829](https://github.com/cosmos/cosmos-sdk/pull/21829) Add support for importing hex key using standard input.
 * (x/auth/ante) [#23128](https://github.com/cosmos/cosmos-sdk/pull/23128) Allow custom verifyIsOnCurve when validate tx for public key like ethsecp256k1.
@@ -61,6 +61,15 @@ Every module contains its own CHANGELOG.md. Please refer to the module you are i
 * (x/params) [#22995](https://github.com/cosmos/cosmos-sdk/pull/22995) Remove `x/params`.  Migrate to the new params system introduced in `v0.47` as demonstrated [here](https://github.com/cosmos/cosmos-sdk/blob/main/UPGRADING.md#xparams).
 * (testutil) [#22392](https://github.com/cosmos/cosmos-sdk/pull/22392) Remove `testutil/network` package. Use the integration framework or systemtests framework instead.
 
+#### Removal of v1 components
+
+This subsection lists the API breaking changes that are [part of the removal of v1 components](https://github.com/cosmos/cosmos-sdk/issues/22904). The v1 components were deprecated in `v0.52` and are now removed.
+
+* (simapp) [#23009](https://github.com/cosmos/cosmos-sdk/pull/23009) Simapp has been removed. Check-out Simapp/v2 instead.
+* (server) [#23018](https://github.com/cosmos/cosmos-sdk/pull/23018) [#23238](https://github.com/cosmos/cosmos-sdk/pull/23238) The server package has been removed. Use server/v2 instead
+* (x/genutil) [#23238](https://github.com/cosmos/cosmos-sdk/pull/23238) Genutil commands specific to a baseapp chain have been deleted.
+* (client) [#22904](https://github.com/cosmos/cosmos-sdk/issues/22904) v1 specific client commands have been removed.
+
 ### Deprecated
 
 * (modules) [#22994](https://github.com/cosmos/cosmos-sdk/pull/22994) Deprecate `Invariants` and associated methods.

api/go.mod

@@ -8,7 +8,7 @@ require (
 	github.com/cosmos/gogoproto v1.7.0
 	google.golang.org/genproto/googleapis/api v0.0.0-20240903143218-8af14fe29dc1
 	google.golang.org/grpc v1.68.1
-	google.golang.org/protobuf v1.36.1
+	google.golang.org/protobuf v1.36.2
 )
 
 require (

api/go.sum

@@ -22,5 +22,5 @@ google.golang.org/genproto/googleapis/rpc v0.0.0-20241202173237-19429a94021a h1:
 google.golang.org/genproto/googleapis/rpc v0.0.0-20241202173237-19429a94021a/go.mod h1:5uTbfoYQed2U9p3KIj2/Zzm02PYhndfdmML0qC3q3FU=
 google.golang.org/grpc v1.68.1 h1:oI5oTa11+ng8r8XMMN7jAOmWfPZWbYpCFaMUTACxkM0=
 google.golang.org/grpc v1.68.1/go.mod h1:+q1XYFJjShcqn0QZHvCyeR4CXPA+llXIeUIfIe00waw=
-google.golang.org/protobuf v1.36.1 h1:yBPeRvTftaleIgM3PZ/WBIZ7XM/eEYAaEyCwvyjq/gk=
-google.golang.org/protobuf v1.36.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
+google.golang.org/protobuf v1.36.2 h1:R8FeyR1/eLmkutZOM5CWghmo5itiG9z0ktFlTVLuTmU=
+google.golang.org/protobuf v1.36.2/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=

baseapp/baseapp.go

@@ -29,7 +29,6 @@ import (
 	"github.com/cosmos/cosmos-sdk/baseapp/oe"
 	"github.com/cosmos/cosmos-sdk/codec"
 	codectypes "github.com/cosmos/cosmos-sdk/codec/types"
-	servertypes "github.com/cosmos/cosmos-sdk/server/types"
 	"github.com/cosmos/cosmos-sdk/telemetry"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
@@ -58,8 +57,6 @@ const (
 	execModeFinalize                            // Finalize a block proposal
 )
 
-var _ servertypes.ABCI = (*BaseApp)(nil)
-
 // BaseApp reflects the ABCI application implementation.
 type BaseApp struct {
 	// initialized on creation

baseapp/streaming.go

@@ -12,6 +12,7 @@ import (
 	abci "github.com/cometbft/cometbft/api/cometbft/abci/v1"
 	"github.com/spf13/cast"
 
+	"cosmossdk.io/core/server"
 	"cosmossdk.io/log"
 	"cosmossdk.io/schema"
 	"cosmossdk.io/schema/appdata"
@@ -21,7 +22,6 @@ import (
 	storetypes "cosmossdk.io/store/types"
 
 	"github.com/cosmos/cosmos-sdk/client/flags"
-	servertypes "github.com/cosmos/cosmos-sdk/server/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 )
 
@@ -60,7 +60,7 @@ func (app *BaseApp) EnableIndexer(indexerOpts interface{}, keys map[string]*stor
 }
 
 // RegisterStreamingServices registers streaming services with the BaseApp.
-func (app *BaseApp) RegisterStreamingServices(appOpts servertypes.AppOptions, keys map[string]*storetypes.KVStoreKey) error {
+func (app *BaseApp) RegisterStreamingServices(appOpts server.DynamicConfig, keys map[string]*storetypes.KVStoreKey) error {
 	// register streaming services
 	streamingCfg := cast.ToStringMap(appOpts.Get(StreamingTomlKey))
 	for service := range streamingCfg {
@@ -83,7 +83,7 @@ func (app *BaseApp) RegisterStreamingServices(appOpts servertypes.AppOptions, ke
 
 // registerStreamingPlugin registers streaming plugins with the BaseApp.
 func (app *BaseApp) registerStreamingPlugin(
-	appOpts servertypes.AppOptions,
+	appOpts server.DynamicConfig,
 	keys map[string]*storetypes.KVStoreKey,
 	streamingPlugin interface{},
 ) error {
@@ -98,7 +98,7 @@ func (app *BaseApp) registerStreamingPlugin(
 
 // registerABCIListenerPlugin registers plugins that implement the ABCIListener interface.
 func (app *BaseApp) registerABCIListenerPlugin(
-	appOpts servertypes.AppOptions,
+	appOpts server.DynamicConfig,
 	keys map[string]*storetypes.KVStoreKey,
 	abciListener storetypes.ABCIListener,
 ) {

client/flags/flags.go

@@ -83,13 +83,15 @@ const (
 	FlagTip              = "tip"
 	FlagAux              = "aux"
 	FlagInitHeight       = "initial-height"
+	FlagInvCheckPeriod   = "inv-check-period"
 	// FlagOutput is the flag to set the output format.
 	// This differs from FlagOutputDocument that is used to set the output file.
 	FlagOutput = "output"
 	// FlagLogLevel defines the flag for setting the log level
 	FlagLogLevel   = "log_level"
 	FlagLogFormat  = "log_format"
 	FlagLogNoColor = "log_no_color"
+	FlagTrace      = "trace"
 )
 
 // List of supported output formats