diff --git a/app/app.go b/app/app.go index da193d1a..4fc3e1fb 100644 --- a/app/app.go +++ b/app/app.go @@ -60,12 +60,12 @@ import ( "github.com/persistenceOne/persistenceCore/v16/app/constants" "github.com/persistenceOne/persistenceCore/v16/app/keepers" "github.com/persistenceOne/persistenceCore/v16/app/upgrades" - v1500 "github.com/persistenceOne/persistenceCore/v16/app/upgrades/v15.0.0" + v1600rc0 "github.com/persistenceOne/persistenceCore/v16/app/upgrades/testnet/v16.0.0-rc0" ) var ( DefaultNodeHome string - Upgrades = []upgrades.Upgrade{v1500.Upgrade} + Upgrades = []upgrades.Upgrade{v1600rc0.Upgrade} ModuleBasics = module.NewBasicManager(keepers.AppModuleBasics...) ) diff --git a/app/upgrades/v15.0.0/constants.go b/app/upgrades/testnet/v16.0.0-rc0/constants.go similarity index 78% rename from app/upgrades/v15.0.0/constants.go rename to app/upgrades/testnet/v16.0.0-rc0/constants.go index 7be8a265..d74f979c 100644 --- a/app/upgrades/v15.0.0/constants.go +++ b/app/upgrades/testnet/v16.0.0-rc0/constants.go @@ -1,4 +1,4 @@ -package v15_0_0 +package v16_0_0_rc0 import ( store "cosmossdk.io/store/types" @@ -7,14 +7,14 @@ import ( const ( // UpgradeName defines the on-chain upgrade name. - UpgradeName = "v15.0.0" + UpgradeName = "v16.0.0-rc0" ) var Upgrade = upgrades.Upgrade{ UpgradeName: UpgradeName, CreateUpgradeHandler: CreateUpgradeHandler, StoreUpgrades: store.StoreUpgrades{ - Added: []string{}, + Added: []string{}, //TODO protocol pool, Deleted: []string{}, }, } diff --git a/app/upgrades/testnet/v15.0.0-rc0/upgrades.go b/app/upgrades/testnet/v16.0.0-rc0/upgrades.go similarity index 97% rename from app/upgrades/testnet/v15.0.0-rc0/upgrades.go rename to app/upgrades/testnet/v16.0.0-rc0/upgrades.go index 3e8a4860..5d960f6f 100644 --- a/app/upgrades/testnet/v15.0.0-rc0/upgrades.go +++ b/app/upgrades/testnet/v16.0.0-rc0/upgrades.go @@ -1,4 +1,4 @@ -package v15_0_0_rc0 +package v16_0_0_rc0 import ( "context" @@ -13,6 +13,7 @@ func CreateUpgradeHandler(args upgrades.UpgradeHandlerArgs) upgradetypes.Upgrade 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 { diff --git a/app/upgrades/testnet/v15.0.0-rc0/constants.go b/app/upgrades/v16.0.0/constants.go similarity index 79% rename from app/upgrades/testnet/v15.0.0-rc0/constants.go rename to app/upgrades/v16.0.0/constants.go index 12d7f483..8011d575 100644 --- a/app/upgrades/testnet/v15.0.0-rc0/constants.go +++ b/app/upgrades/v16.0.0/constants.go @@ -1,4 +1,4 @@ -package v15_0_0_rc0 +package v16_0_0 import ( store "cosmossdk.io/store/types" @@ -7,14 +7,14 @@ import ( const ( // UpgradeName defines the on-chain upgrade name. - UpgradeName = "v15.0.0-rc0" + UpgradeName = "v16.0.0" ) var Upgrade = upgrades.Upgrade{ UpgradeName: UpgradeName, CreateUpgradeHandler: CreateUpgradeHandler, StoreUpgrades: store.StoreUpgrades{ - Added: []string{}, + Added: []string{}, //TODO add protocolpool Deleted: []string{}, }, } diff --git a/app/upgrades/v15.0.0/upgrades.go b/app/upgrades/v16.0.0/upgrades.go similarity index 97% rename from app/upgrades/v15.0.0/upgrades.go rename to app/upgrades/v16.0.0/upgrades.go index a26c60e1..66b809ba 100644 --- a/app/upgrades/v15.0.0/upgrades.go +++ b/app/upgrades/v16.0.0/upgrades.go @@ -1,4 +1,4 @@ -package v15_0_0 +package v16_0_0 import ( "context" @@ -13,6 +13,7 @@ func CreateUpgradeHandler(args upgrades.UpgradeHandlerArgs) upgradetypes.Upgrade 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 { diff --git a/interchaintest/chain_upgrade_test.go b/interchaintest/chain_upgrade_test.go index bdc95f22..1dca4f48 100644 --- a/interchaintest/chain_upgrade_test.go +++ b/interchaintest/chain_upgrade_test.go @@ -32,8 +32,8 @@ const ( func TestPersistenceUpgradeBasic(t *testing.T) { var ( chainName = "persistence" - initialVersion = "v14.0.1" - upgradeName = "v15.0.0" + initialVersion = "v15.0.0-rc1" + upgradeName = "v16.0.0-rc0" upgradeRepo = PersistenceCoreImage.Repository upgradeBranchVersion = PersistenceCoreImage.Version )