update deps cosmos-sdk, ibc-go

Author: puneet2019

app/app.go

@@ -173,9 +173,7 @@ func NewApplication(
 
 	app.moduleManager = module.NewManager(appModules(app, encodingConfiguration, skipGenesisInvariants)...)
 
-	app.moduleManager.SetOrderPreBlockers(
-		upgradetypes.ModuleName,
-	)
+	app.moduleManager.SetOrderPreBlockers(orderPreBlockers()...)
 	app.moduleManager.SetOrderBeginBlockers(orderBeginBlockers()...)
 	app.moduleManager.SetOrderEndBlockers(orderEndBlockers()...)
 	app.moduleManager.SetOrderInitGenesis(orderInitGenesis()...)

app/encoding.go

@@ -8,13 +8,13 @@ package app
 import (
 	"github.com/cosmos/cosmos-sdk/std"
 	grouptypes "github.com/cosmos/cosmos-sdk/x/group"
-	interchainquerytypes "github.com/persistenceOne/persistence-sdk/v5/x/interchainquery/types"
-	"github.com/persistenceOne/persistence-sdk/v5/x/lsm/distribution"
-	"github.com/persistenceOne/persistence-sdk/v5/x/lsm/staking"
-	oracletypes "github.com/persistenceOne/persistence-sdk/v5/x/oracle/types"
-	liquidstakeibctypes "github.com/persistenceOne/pstake-native/v5/x/liquidstakeibc/types"
-	lscosmostypes "github.com/persistenceOne/pstake-native/v5/x/lscosmos/types"
-	ratesynctypes "github.com/persistenceOne/pstake-native/v5/x/ratesync/types"
+	interchainquerytypes "github.com/persistenceOne/persistence-sdk/v6/x/interchainquery/types"
+	"github.com/persistenceOne/persistence-sdk/v6/x/lsm/distribution"
+	"github.com/persistenceOne/persistence-sdk/v6/x/lsm/staking"
+	oracletypes "github.com/persistenceOne/persistence-sdk/v6/x/oracle/types"
+	liquidstakeibctypes "github.com/persistenceOne/pstake-native/v6/x/liquidstakeibc/types"
+	lscosmostypes "github.com/persistenceOne/pstake-native/v6/x/lscosmos/types"
+	ratesynctypes "github.com/persistenceOne/pstake-native/v6/x/ratesync/types"
 
 	"github.com/persistenceOne/persistenceCore/v16/app/params"
 )

app/keepers/keepers.go

@@ -32,6 +32,8 @@ import (
 	crisistypes "github.com/cosmos/cosmos-sdk/x/crisis/types"
 	distributionkeeper "github.com/cosmos/cosmos-sdk/x/distribution/keeper"
 	distributiontypes "github.com/cosmos/cosmos-sdk/x/distribution/types"
+	epochskeeper "github.com/cosmos/cosmos-sdk/x/epochs/keeper"
+	epochstypes "github.com/cosmos/cosmos-sdk/x/epochs/types"
 	govkeeper "github.com/cosmos/cosmos-sdk/x/gov/keeper"
 	govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"
 	govv1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1"
@@ -69,12 +71,10 @@ import (
 	ibcexported "github.com/cosmos/ibc-go/v10/modules/core/exported"
 	ibckeeper "github.com/cosmos/ibc-go/v10/modules/core/keeper"
 	ibctm "github.com/cosmos/ibc-go/v10/modules/light-clients/07-tendermint"
-	epochskeeper "github.com/persistenceOne/persistence-sdk/v5/x/epochs/keeper"
-	epochstypes "github.com/persistenceOne/persistence-sdk/v5/x/epochs/types"
-	"github.com/persistenceOne/persistence-sdk/v5/x/halving"
-	halvingtypes "github.com/persistenceOne/persistence-sdk/v5/x/halving/types"
-	liquidstakekeeper "github.com/persistenceOne/pstake-native/v5/x/liquidstake/keeper"
-	liquidstaketypes "github.com/persistenceOne/pstake-native/v5/x/liquidstake/types"
+	"github.com/persistenceOne/persistence-sdk/v6/x/halving"
+	halvingtypes "github.com/persistenceOne/persistence-sdk/v6/x/halving/types"
+	liquidstakekeeper "github.com/persistenceOne/pstake-native/v6/x/liquidstake/keeper"
+	liquidstaketypes "github.com/persistenceOne/pstake-native/v6/x/liquidstake/types"
 	"github.com/spf13/cast"
 
 	"github.com/persistenceOne/persistenceCore/v16/app/constants"
@@ -290,7 +290,8 @@ func NewAppKeeper(
 			appKeepers.LiquidKeeper.Hooks()),
 	)
 
-	appKeepers.EpochsKeeper = epochskeeper.NewKeeper(appKeepers.keys[epochstypes.StoreKey])
+	sdkEpochsKeeper := epochskeeper.NewKeeper(runtime.NewKVStoreService(appKeepers.keys[epochstypes.StoreKey]), appCodec)
+	appKeepers.EpochsKeeper = &sdkEpochsKeeper
 
 	appKeepers.IBCKeeper = ibckeeper.NewKeeper(
 		appCodec,

app/keepers/keys.go

@@ -12,6 +12,7 @@ import (
 	consensusparamstypes "github.com/cosmos/cosmos-sdk/x/consensus/types"
 	crisistypes "github.com/cosmos/cosmos-sdk/x/crisis/types"
 	distributiontypes "github.com/cosmos/cosmos-sdk/x/distribution/types"
+	epochstypes "github.com/cosmos/cosmos-sdk/x/epochs/types"
 	govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"
 	minttypes "github.com/cosmos/cosmos-sdk/x/mint/types"
 	paramstypes "github.com/cosmos/cosmos-sdk/x/params/types"
@@ -24,9 +25,8 @@ import (
 	icahosttypes "github.com/cosmos/ibc-go/v10/modules/apps/27-interchain-accounts/host/types"
 	ibctransfertypes "github.com/cosmos/ibc-go/v10/modules/apps/transfer/types"
 	ibcexported "github.com/cosmos/ibc-go/v10/modules/core/exported"
-	epochstypes "github.com/persistenceOne/persistence-sdk/v5/x/epochs/types"
-	"github.com/persistenceOne/persistence-sdk/v5/x/halving"
-	liquidstaketypes "github.com/persistenceOne/pstake-native/v5/x/liquidstake/types"
+	"github.com/persistenceOne/persistence-sdk/v6/x/halving"
+	liquidstaketypes "github.com/persistenceOne/pstake-native/v6/x/liquidstake/types"
 )
 
 func (appKeepers *AppKeepers) GenerateKeys() {

app/keepers/modules.go

@@ -13,6 +13,7 @@ import (
 	"github.com/cosmos/cosmos-sdk/x/consensus"
 	"github.com/cosmos/cosmos-sdk/x/crisis"
 	"github.com/cosmos/cosmos-sdk/x/distribution"
+	"github.com/cosmos/cosmos-sdk/x/epochs"
 	"github.com/cosmos/cosmos-sdk/x/genutil"
 	genutiltypes "github.com/cosmos/cosmos-sdk/x/genutil/types"
 	"github.com/cosmos/cosmos-sdk/x/gov"
@@ -29,9 +30,8 @@ import (
 	"github.com/cosmos/ibc-go/v10/modules/apps/transfer"
 	ibc "github.com/cosmos/ibc-go/v10/modules/core"
 	ibctm "github.com/cosmos/ibc-go/v10/modules/light-clients/07-tendermint"
-	"github.com/persistenceOne/persistence-sdk/v5/x/epochs"
-	"github.com/persistenceOne/persistence-sdk/v5/x/halving"
-	"github.com/persistenceOne/pstake-native/v5/x/liquidstake"
+	"github.com/persistenceOne/persistence-sdk/v6/x/halving"
+	"github.com/persistenceOne/pstake-native/v6/x/liquidstake"
 )
 
 // AppModuleBasics defines the module BasicManager is in charge of setting up basic,
@@ -63,7 +63,7 @@ var AppModuleBasics = append([]module.AppModuleBasic{
 	wasm.AppModuleBasic{},
 	halving.AppModuleBasic{},
 	ica.AppModuleBasic{},
-	epochs.AppModuleBasic{},
+	epochs.AppModule{},
 	liquid.AppModuleBasic{},
 	liquidstake.AppModuleBasic{},
 	consensus.AppModuleBasic{},

app/modules.go

@@ -24,6 +24,8 @@ import (
 	crisistypes "github.com/cosmos/cosmos-sdk/x/crisis/types"
 	"github.com/cosmos/cosmos-sdk/x/distribution"
 	distributiontypes "github.com/cosmos/cosmos-sdk/x/distribution/types"
+	"github.com/cosmos/cosmos-sdk/x/epochs"
+	epochstypes "github.com/cosmos/cosmos-sdk/x/epochs/types"
 	"github.com/cosmos/cosmos-sdk/x/genutil"
 	genutiltypes "github.com/cosmos/cosmos-sdk/x/genutil/types"
 	"github.com/cosmos/cosmos-sdk/x/gov"
@@ -48,12 +50,10 @@ import (
 	ibc "github.com/cosmos/ibc-go/v10/modules/core"
 	ibcexported "github.com/cosmos/ibc-go/v10/modules/core/exported"
 	ibctm "github.com/cosmos/ibc-go/v10/modules/light-clients/07-tendermint"
-	"github.com/persistenceOne/persistence-sdk/v5/x/epochs"
-	epochstypes "github.com/persistenceOne/persistence-sdk/v5/x/epochs/types"
-	"github.com/persistenceOne/persistence-sdk/v5/x/halving"
+	"github.com/persistenceOne/persistence-sdk/v6/x/halving"
 	appparams "github.com/persistenceOne/persistenceCore/v16/app/params"
-	"github.com/persistenceOne/pstake-native/v5/x/liquidstake"
-	liquidstaketypes "github.com/persistenceOne/pstake-native/v5/x/liquidstake/types"
+	"github.com/persistenceOne/pstake-native/v6/x/liquidstake"
+	liquidstaketypes "github.com/persistenceOne/pstake-native/v6/x/liquidstake/types"
 )
 
 var ModuleAccountPermissions = map[string][]string{
@@ -125,6 +125,13 @@ func overrideSimulationModules(
 	}
 }
 
+func orderPreBlockers() []string {
+	return []string{
+		upgradetypes.ModuleName,
+		authtypes.ModuleName,
+	}
+}
+
 func orderBeginBlockers() []string {
 	return []string{
 		upgradetypes.ModuleName,

go.mod

@@ -9,30 +9,30 @@ require (
 	cosmossdk.io/client/v2 v2.0.0-beta.7
 	cosmossdk.io/core v0.11.3
 	cosmossdk.io/errors v1.0.2
-	cosmossdk.io/log v1.5.1
+	cosmossdk.io/log v1.6.1
 	cosmossdk.io/math v1.5.3
 	cosmossdk.io/store v1.1.2
 	cosmossdk.io/tools/confix v0.1.2
 	cosmossdk.io/x/evidence v0.1.1
 	cosmossdk.io/x/feegrant v0.1.1
-	cosmossdk.io/x/tx v0.13.7
-	cosmossdk.io/x/upgrade v0.1.4
-	github.com/CosmWasm/wasmd v0.55.1
+	cosmossdk.io/x/tx v0.14.0
+	cosmossdk.io/x/upgrade v0.2.0
+	github.com/CosmWasm/wasmd v0.60.1
 	github.com/cometbft/cometbft v0.38.19
 	github.com/cosmos/cosmos-db v1.1.3
-	github.com/cosmos/cosmos-sdk v0.50.14
+	github.com/cosmos/cosmos-sdk v0.53.4
 	github.com/cosmos/gaia/v24 v24.0.0
 	github.com/cosmos/gogoproto v1.7.0
 	github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v10 v10.1.0
 	github.com/cosmos/ibc-apps/modules/ibc-hooks/v10 v10.0.0-20250919123430-5596e0a03585
-	github.com/cosmos/ibc-go/v10 v10.1.1
+	github.com/cosmos/ibc-go/v10 v10.4.0
 	github.com/cosmos/rosetta v0.50.12
-	github.com/persistenceOne/persistence-sdk/v5 v5.1.0
-	github.com/persistenceOne/pstake-native/v5 v5.1.1
+	github.com/persistenceOne/persistence-sdk/v6 v6.0.0-rc0
+	github.com/persistenceOne/pstake-native/v6 v6.0.0-rc0
 	github.com/prometheus/client_golang v1.23.0
 	github.com/spf13/cast v1.9.2
-	github.com/spf13/cobra v1.9.1
-	github.com/spf13/pflag v1.0.7
+	github.com/spf13/cobra v1.10.1
+	github.com/spf13/pflag v1.0.9
 	github.com/spf13/viper v1.20.1
 	github.com/stretchr/testify v1.11.1
 	google.golang.org/protobuf v1.36.10
@@ -47,8 +47,9 @@ require (
 	cloud.google.com/go/iam v1.5.2 // indirect
 	cloud.google.com/go/monitoring v1.24.2 // indirect
 	cloud.google.com/go/storage v1.50.0 // indirect
-	cosmossdk.io/collections v0.4.0 // indirect
-	cosmossdk.io/depinject v1.2.0 // indirect
+	cosmossdk.io/collections v1.2.1 // indirect
+	cosmossdk.io/depinject v1.2.1 // indirect
+	cosmossdk.io/schema v1.1.0 // indirect
 	filippo.io/edwards25519 v1.1.0 // indirect
 	github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 // indirect
 	github.com/99designs/keyring v1.2.2 // indirect
@@ -61,11 +62,11 @@ require (
 	github.com/Microsoft/go-winio v0.6.2 // indirect
 	github.com/PuerkitoBio/purell v1.1.1 // indirect
 	github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
-	github.com/aws/aws-sdk-go v1.44.224 // indirect
+	github.com/aws/aws-sdk-go v1.49.0 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect
 	github.com/bgentry/speakeasy v0.2.0 // indirect
-	github.com/bits-and-blooms/bitset v1.17.0 // indirect
+	github.com/bits-and-blooms/bitset v1.22.0 // indirect
 	github.com/bytedance/gopkg v0.1.3 // indirect
 	github.com/bytedance/sonic v1.14.1 // indirect
 	github.com/bytedance/sonic/loader v0.3.0 // indirect
@@ -75,7 +76,7 @@ require (
 	github.com/cloudwego/base64x v0.1.6 // indirect
 	github.com/cncf/xds/go v0.0.0-20250501225837-2ac532fd4443 // indirect
 	github.com/cockroachdb/apd/v2 v2.0.2 // indirect
-	github.com/cockroachdb/errors v1.11.3 // indirect
+	github.com/cockroachdb/errors v1.12.0 // indirect
 	github.com/cockroachdb/fifo v0.0.0-20240816210425-c5d0cb0b6fc0 // indirect
 	github.com/cockroachdb/logtags v0.0.0-20241215232642-bb51bb14a506 // indirect
 	github.com/cockroachdb/pebble v1.1.5 // indirect
@@ -105,7 +106,7 @@ require (
 	github.com/emicklei/dot v1.6.2 // indirect
 	github.com/envoyproxy/go-control-plane/envoy v1.32.4 // indirect
 	github.com/envoyproxy/protoc-gen-validate v1.2.1 // indirect
-	github.com/ethereum/go-ethereum v1.15.5 // indirect
+	github.com/ethereum/go-ethereum v1.15.11 // indirect
 	github.com/fatih/color v1.17.0 // indirect
 	github.com/felixge/httpsnoop v1.0.4 // indirect
 	github.com/fsnotify/fsnotify v1.9.0 // indirect
@@ -121,7 +122,6 @@ require (
 	github.com/gogo/googleapis v1.4.1 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect
-	github.com/golang/mock v1.6.0 // indirect
 	github.com/golang/protobuf v1.5.4 // indirect
 	github.com/golang/snappy v0.0.5-0.20231225225746-43d5d4cd4e0e // indirect
 	github.com/google/btree v1.1.3 // indirect
@@ -150,7 +150,7 @@ require (
 	github.com/hashicorp/go-version v1.7.0 // indirect
 	github.com/hashicorp/golang-lru v1.0.2 // indirect
 	github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
-	github.com/hashicorp/yamux v0.1.1 // indirect
+	github.com/hashicorp/yamux v0.1.2 // indirect
 	github.com/hdevalence/ed25519consensus v0.2.0 // indirect
 	github.com/holiman/uint256 v1.3.2 // indirect
 	github.com/huandu/skiplist v1.2.1 // indirect
@@ -169,6 +169,7 @@ require (
 	github.com/manifoldco/promptui v0.9.0 // indirect
 	github.com/mattn/go-colorable v0.1.14 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
+	github.com/mdp/qrterminal/v3 v3.2.1 // indirect
 	github.com/minio/highwayhash v1.0.3 // indirect
 	github.com/mitchellh/go-homedir v1.1.0 // indirect
 	github.com/mitchellh/mapstructure v1.5.0 // indirect
@@ -216,9 +217,11 @@ require (
 	go.opentelemetry.io/otel/sdk v1.37.0 // indirect
 	go.opentelemetry.io/otel/sdk/metric v1.37.0 // indirect
 	go.opentelemetry.io/otel/trace v1.37.0 // indirect
+	go.uber.org/mock v0.5.2 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
 	go.uber.org/zap v1.27.0 // indirect
-	golang.org/x/arch v0.15.0 // indirect
+	go.yaml.in/yaml/v2 v2.4.2 // indirect
+	golang.org/x/arch v0.17.0 // indirect
 	golang.org/x/crypto v0.41.0 // indirect
 	golang.org/x/exp v0.0.0-20250305212735-054e65f0b394 // indirect
 	golang.org/x/net v0.43.0 // indirect
@@ -238,7 +241,8 @@ require (
 	gotest.tools/v3 v3.5.2 // indirect
 	nhooyr.io/websocket v1.8.17 // indirect
 	pgregory.net/rapid v1.2.0 // indirect
-	sigs.k8s.io/yaml v1.4.0 // indirect
+	rsc.io/qr v0.2.0 // indirect
+	sigs.k8s.io/yaml v1.6.0 // indirect
 )
 
 replace (
@@ -247,6 +251,3 @@ replace (
 	// Downgraded to avoid bugs in following commits which caused simulations to fail.
 	github.com/syndtr/goleveldb => github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7
 )
-
-// replace with persistence's LSM fork
-replace github.com/cosmos/gaia/v24 => github.com/persistenceOne/gaia/v24 v24.0.0-liquid-fix