fix!: add migration of non-legacy proposals (#3316)

* init commit * Update app/upgrades/v20/upgrades.go Co-authored-by: Marius Poke <[email protected]> * Update app/upgrades/v20/upgrades.go Co-authored-by: Marius Poke <[email protected]> * Update app/upgrades/v20/upgrades.go Co-authored-by: Marius Poke <[email protected]> * Update app/upgrades/v20/upgrades.go Co-authored-by: Marius Poke <[email protected]> * small fixes; took into account comments * fix linter issues * bump ICS to v6 * fix linter * make format --------- Co-authored-by: Marius Poke <[email protected]>
cosmos · Sep 9, 2024 · e465609 · e465609
1 parent ff22e5b
commit e465609
Show file tree

Hide file tree

Showing 13 changed files with 509 additions and 172 deletions.
diff --git a/app/app.go b/app/app.go
@@ -20,7 +20,7 @@ import (
 	dbm "github.com/cosmos/cosmos-db"
 	"github.com/cosmos/gogoproto/proto"
 	ibctesting "github.com/cosmos/ibc-go/v8/testing"
-	providertypes "github.com/cosmos/interchain-security/v5/x/ccv/provider/types"
+	providertypes "github.com/cosmos/interchain-security/v6/x/ccv/provider/types"
 
 	autocliv1 "cosmossdk.io/api/cosmos/autocli/v1"
 	reflectionv1 "cosmossdk.io/api/cosmos/reflection/v1"

diff --git a/app/app_helpers.go b/app/app_helpers.go
@@ -4,8 +4,8 @@ import (
 	capabilitykeeper "github.com/cosmos/ibc-go/modules/capability/keeper"
 	ibckeeper "github.com/cosmos/ibc-go/v8/modules/core/keeper"
 	ibctestingtypes "github.com/cosmos/ibc-go/v8/testing/types"
-	icstest "github.com/cosmos/interchain-security/v5/testutil/integration"
-	ibcproviderkeeper "github.com/cosmos/interchain-security/v5/x/ccv/provider/keeper"
+	icstest "github.com/cosmos/interchain-security/v6/testutil/integration"
+	ibcproviderkeeper "github.com/cosmos/interchain-security/v6/x/ccv/provider/keeper"
 )
 
 // ProviderApp interface implementations for icstest tests

diff --git a/app/keepers/keepers.go b/app/keepers/keepers.go
@@ -33,9 +33,9 @@ import (
 	porttypes "github.com/cosmos/ibc-go/v8/modules/core/05-port/types"
 	ibcexported "github.com/cosmos/ibc-go/v8/modules/core/exported"
 	ibckeeper "github.com/cosmos/ibc-go/v8/modules/core/keeper"
-	icsprovider "github.com/cosmos/interchain-security/v5/x/ccv/provider"
-	icsproviderkeeper "github.com/cosmos/interchain-security/v5/x/ccv/provider/keeper"
-	providertypes "github.com/cosmos/interchain-security/v5/x/ccv/provider/types"
+	icsprovider "github.com/cosmos/interchain-security/v6/x/ccv/provider"
+	icsproviderkeeper "github.com/cosmos/interchain-security/v6/x/ccv/provider/keeper"
+	providertypes "github.com/cosmos/interchain-security/v6/x/ccv/provider/types"
 
 	"cosmossdk.io/log"
 	storetypes "cosmossdk.io/store/types"
@@ -376,8 +376,7 @@ func NewAppKeeper(
 	govRouter := govv1beta1.NewRouter()
 	govRouter.
 		AddRoute(govtypes.RouterKey, govv1beta1.ProposalHandler).
-		AddRoute(paramproposal.RouterKey, params.NewParamChangeProposalHandler(appKeepers.ParamsKeeper)).
-		AddRoute(providertypes.RouterKey, icsprovider.NewProviderProposalHandler(appKeepers.ProviderKeeper))
+		AddRoute(paramproposal.RouterKey, params.NewParamChangeProposalHandler(appKeepers.ParamsKeeper))
 
 	// Set legacy router for backwards compatibility with gov v1beta1
 	appKeepers.GovKeeper.SetLegacyRouter(govRouter)

diff --git a/app/keepers/keys.go b/app/keepers/keys.go
@@ -11,7 +11,7 @@ import (
 	ibcfeetypes "github.com/cosmos/ibc-go/v8/modules/apps/29-fee/types"
 	ibctransfertypes "github.com/cosmos/ibc-go/v8/modules/apps/transfer/types"
 	ibcexported "github.com/cosmos/ibc-go/v8/modules/core/exported"
-	providertypes "github.com/cosmos/interchain-security/v5/x/ccv/provider/types"
+	providertypes "github.com/cosmos/interchain-security/v6/x/ccv/provider/types"
 
 	storetypes "cosmossdk.io/store/types"
 	evidencetypes "cosmossdk.io/x/evidence/types"

diff --git a/app/modules.go b/app/modules.go
@@ -15,9 +15,9 @@ import (
 	ibc "github.com/cosmos/ibc-go/v8/modules/core"
 	ibcexported "github.com/cosmos/ibc-go/v8/modules/core/exported"
 	ibctm "github.com/cosmos/ibc-go/v8/modules/light-clients/07-tendermint"
-	no_valupdates_genutil "github.com/cosmos/interchain-security/v5/x/ccv/no_valupdates_genutil"
-	no_valupdates_staking "github.com/cosmos/interchain-security/v5/x/ccv/no_valupdates_staking"
-	providertypes "github.com/cosmos/interchain-security/v5/x/ccv/provider/types"
+	no_valupdates_genutil "github.com/cosmos/interchain-security/v6/x/ccv/no_valupdates_genutil"
+	no_valupdates_staking "github.com/cosmos/interchain-security/v6/x/ccv/no_valupdates_staking"
+	providertypes "github.com/cosmos/interchain-security/v6/x/ccv/provider/types"
 
 	"cosmossdk.io/x/evidence"
 	evidencetypes "cosmossdk.io/x/evidence/types"