Skip to content

Commit b6bfe44

Browse files
authored
chore: prepare v11.15.0 (#353)
prepare v11.15.0
1 parent 8b595ef commit b6bfe44

File tree

4 files changed

+73
-4
lines changed

4 files changed

+73
-4
lines changed

app/app.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,13 +56,13 @@ import (
5656

5757
"github.com/persistenceOne/persistenceCore/v11/app/keepers"
5858
"github.com/persistenceOne/persistenceCore/v11/app/upgrades"
59-
v11_15_0_rc0 "github.com/persistenceOne/persistenceCore/v11/app/upgrades/testnet/v11.15.0-rc0"
59+
v11_15_0 "github.com/persistenceOne/persistenceCore/v11/app/upgrades/v11.15.0"
6060
"github.com/persistenceOne/persistenceCore/v11/client/docs"
6161
)
6262

6363
var (
6464
DefaultNodeHome string
65-
Upgrades = []upgrades.Upgrade{v11_15_0_rc0.Upgrade}
65+
Upgrades = []upgrades.Upgrade{v11_15_0.Upgrade}
6666
ModuleBasics = module.NewBasicManager(keepers.AppModuleBasics...)
6767
)
6868

app/upgrades/v11.15.0/constants.go

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
package v11_15_0
2+
3+
import (
4+
store "github.com/cosmos/cosmos-sdk/store/types"
5+
6+
"github.com/persistenceOne/persistenceCore/v11/app/upgrades"
7+
)
8+
9+
const (
10+
// UpgradeName defines the on-chain upgrade name.
11+
UpgradeName = "v11.15.0"
12+
)
13+
14+
var Upgrade = upgrades.Upgrade{
15+
UpgradeName: UpgradeName,
16+
CreateUpgradeHandler: CreateUpgradeHandler,
17+
StoreUpgrades: store.StoreUpgrades{},
18+
}

app/upgrades/v11.15.0/upgrades.go

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
package v11_15_0
2+
3+
import (
4+
"cosmossdk.io/errors"
5+
sdk "github.com/cosmos/cosmos-sdk/types"
6+
sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
7+
"github.com/cosmos/cosmos-sdk/types/module"
8+
vestingtypes "github.com/cosmos/cosmos-sdk/x/auth/vesting/types"
9+
upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
10+
11+
"github.com/persistenceOne/persistenceCore/v11/app/upgrades"
12+
)
13+
14+
func CreateUpgradeHandler(args upgrades.UpgradeHandlerArgs) upgradetypes.UpgradeHandler {
15+
return func(ctx sdk.Context, plan upgradetypes.Plan, vm module.VersionMap) (module.VersionMap, error) {
16+
ctx.Logger().Info("running module migrations...")
17+
err := MigrateVestingAccounts(ctx, args)
18+
if err != nil {
19+
return vm, err
20+
}
21+
return args.ModuleManager.RunMigrations(ctx, args.Configurator, vm)
22+
}
23+
}
24+
25+
func MigrateVestingAccounts(ctx sdk.Context, args upgrades.UpgradeHandlerArgs) error {
26+
accounts := args.Keepers.AccountKeeper.GetAllAccounts(ctx)
27+
for _, account := range accounts {
28+
switch account.(type) {
29+
case *vestingtypes.PeriodicVestingAccount:
30+
a, ok := account.(*vestingtypes.PeriodicVestingAccount)
31+
if !ok {
32+
return errors.Wrapf(sdkerrors.ErrInvalidType, "invalid account type: %T", account)
33+
}
34+
args.Keepers.AccountKeeper.SetAccount(ctx, a.BaseAccount)
35+
case *vestingtypes.ContinuousVestingAccount:
36+
a, ok := account.(*vestingtypes.ContinuousVestingAccount)
37+
if !ok {
38+
return errors.Wrapf(sdkerrors.ErrInvalidType, "invalid account type: %T", account)
39+
}
40+
args.Keepers.AccountKeeper.SetAccount(ctx, a.BaseAccount)
41+
case *vestingtypes.DelayedVestingAccount:
42+
a, ok := account.(*vestingtypes.DelayedVestingAccount)
43+
if !ok {
44+
return errors.Wrapf(sdkerrors.ErrInvalidType, "invalid account type: %T", account)
45+
}
46+
args.Keepers.AccountKeeper.SetAccount(ctx, a.BaseAccount)
47+
default:
48+
}
49+
}
50+
return nil
51+
}

interchaintest/chain_upgrade_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ const (
2929
func TestPersistenceUpgradeBasic(t *testing.T) {
3030
var (
3131
chainName = "persistence"
32-
initialVersion = "v11.13.0-rc0"
33-
upgradeName = "v11.15.0-rc0"
32+
initialVersion = "v11.14.0"
33+
upgradeName = "v11.15.0"
3434
upgradeRepo = PersistenceCoreImage.Repository
3535
upgradeBranchVersion = PersistenceCoreImage.Version
3636
)

0 commit comments

Comments
 (0)