Merge pull request #417 from persistenceOne/puneet/remove-sdkfork

feat: remove sdkfork, add upgrade handlers

Author: puneet2019

app/app.go

@@ -60,12 +60,12 @@ import (
 	"github.com/persistenceOne/persistenceCore/v15/app/constants"
 	"github.com/persistenceOne/persistenceCore/v15/app/keepers"
 	"github.com/persistenceOne/persistenceCore/v15/app/upgrades"
-	v1400 "github.com/persistenceOne/persistenceCore/v15/app/upgrades/v14.0.0"
+	v1500rc "github.com/persistenceOne/persistenceCore/v15/app/upgrades/testnet/v15.0.0-rc0"
 )
 
 var (
 	DefaultNodeHome string
-	Upgrades        = []upgrades.Upgrade{v1400.Upgrade}
+	Upgrades        = []upgrades.Upgrade{v1500rc.Upgrade}
 	ModuleBasics    = module.NewBasicManager(keepers.AppModuleBasics...)
 )
 

app/encoding.go

@@ -7,11 +7,10 @@ package app
 
 import (
 	"github.com/cosmos/cosmos-sdk/std"
-	sdkdistr "github.com/cosmos/cosmos-sdk/x/distribution"
 	grouptypes "github.com/cosmos/cosmos-sdk/x/group"
-	sdkslashing "github.com/cosmos/cosmos-sdk/x/slashing"
-	sdkstaking "github.com/cosmos/cosmos-sdk/x/staking"
 	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"
@@ -29,11 +28,6 @@ func MakeEncodingConfig() params.EncodingConfig {
 	ModuleBasics.RegisterLegacyAminoCodec(encodingConfig.Amino)
 	ModuleBasics.RegisterInterfaces(encodingConfig.InterfaceRegistry)
 
-	//for icacontroller callback applications
-	sdkstaking.AppModuleBasic{}.RegisterInterfaces(encodingConfig.InterfaceRegistry)
-	sdkslashing.AppModuleBasic{}.RegisterInterfaces(encodingConfig.InterfaceRegistry)
-	sdkdistr.AppModuleBasic{}.RegisterInterfaces(encodingConfig.InterfaceRegistry)
-
 	//deprecated modules types
 	lscosmostypes.RegisterInterfaces(encodingConfig.InterfaceRegistry)
 	lscosmostypes.RegisterLegacyAminoCodec(encodingConfig.Amino)
@@ -54,5 +48,13 @@ func MakeEncodingConfig() params.EncodingConfig {
 	grouptypes.RegisterInterfaces(encodingConfig.InterfaceRegistry)
 	grouptypes.RegisterLegacyAminoCodec(encodingConfig.Amino)
 	//ibcfee, but was never used ...
+
+	// cosmos-sdk-lsm staking msgs
+	staking.RegisterLegacyAminoCodec(encodingConfig.Amino)
+	staking.RegisterInterfaces(encodingConfig.InterfaceRegistry)
+
+	// cosmos-sdk-lsm distribution msgs
+	distribution.RegisterLegacyAminoCodec(encodingConfig.Amino)
+	distribution.RegisterInterfaces(encodingConfig.InterfaceRegistry)
 	return encodingConfig
 }

app/upgrades/testnet/v14.0.0-rc0/upgrades.go

@@ -1,21 +1,20 @@
-package v14_0_0
+package v15_0_0_rc0
 
 import (
 	store "cosmossdk.io/store/types"
-	liquidtypes "github.com/cosmos/gaia/v24/x/liquid/types"
 	"github.com/persistenceOne/persistenceCore/v15/app/upgrades"
 )
 
 const (
 	// UpgradeName defines the on-chain upgrade name.
-	UpgradeName = "v14.0.0"
+	UpgradeName = "v15.0.0-rc0"
 )
 
 var Upgrade = upgrades.Upgrade{
 	UpgradeName:          UpgradeName,
 	CreateUpgradeHandler: CreateUpgradeHandler,
 	StoreUpgrades: store.StoreUpgrades{
-		Added:   []string{liquidtypes.ModuleName},
+		Added:   []string{},
 		Deleted: []string{},
 	},
 }

app/upgrades/v14.0.0/constants.go …pgrades/testnet/v15.0.0-rc0/constants.goapp/upgrades/v14.0.0/constants.go renamed to app/upgrades/testnet/v15.0.0-rc0/constants.go app/upgrades/v14.0.0/constants.go renamed to app/upgrades/testnet/v15.0.0-rc0/constants.go

@@ -0,0 +1,25 @@
+package v15_0_0_rc0
+
+import (
+	"context"
+
+	upgradetypes "cosmossdk.io/x/upgrade/types"
+	sdk "github.com/cosmos/cosmos-sdk/types"
+	"github.com/cosmos/cosmos-sdk/types/module"
+	"github.com/persistenceOne/persistenceCore/v15/app/upgrades"
+)
+
+func CreateUpgradeHandler(args upgrades.UpgradeHandlerArgs) upgradetypes.UpgradeHandler {
+	return func(ctx context.Context, plan upgradetypes.Plan, vm module.VersionMap) (module.VersionMap, error) {
+		sdkCtx := sdk.UnwrapSDKContext(ctx)
+		sdkCtx.Logger().Info("Running upgrade handler")
+		sdkCtx.Logger().Info("running module migrations...")
+		vm, err := args.ModuleManager.RunMigrations(sdkCtx, args.Configurator, vm)
+		if err != nil {
+			return vm, err
+		}
+
+		sdkCtx.Logger().Info("Upgrade complete")
+		return vm, nil
+	}
+}