Skip to content

Commit

Permalink
Add v19 upgrade handler (#6187) (#6188)
Browse files Browse the repository at this point in the history
(cherry picked from commit 3cfae57)

Co-authored-by: Dev Ojha <[email protected]>
  • Loading branch information
mergify[bot] and ValarDragon authored Aug 28, 2023
1 parent a4abe3e commit adca952
Show file tree
Hide file tree
Showing 3 changed files with 60 additions and 1 deletion.
3 changes: 2 additions & 1 deletion app/app.go
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ import (
v16 "github.com/osmosis-labs/osmosis/v19/app/upgrades/v16"
v17 "github.com/osmosis-labs/osmosis/v19/app/upgrades/v17"
v18 "github.com/osmosis-labs/osmosis/v19/app/upgrades/v18"
v19 "github.com/osmosis-labs/osmosis/v19/app/upgrades/v19"
v3 "github.com/osmosis-labs/osmosis/v19/app/upgrades/v3"
v4 "github.com/osmosis-labs/osmosis/v19/app/upgrades/v4"
v5 "github.com/osmosis-labs/osmosis/v19/app/upgrades/v5"
Expand Down Expand Up @@ -104,7 +105,7 @@ var (

// _ sdksimapp.App = (*OsmosisApp)(nil)

Upgrades = []upgrades.Upgrade{v4.Upgrade, v5.Upgrade, v7.Upgrade, v9.Upgrade, v11.Upgrade, v12.Upgrade, v13.Upgrade, v14.Upgrade, v15.Upgrade, v16.Upgrade, v17.Upgrade, v18.Upgrade}
Upgrades = []upgrades.Upgrade{v4.Upgrade, v5.Upgrade, v7.Upgrade, v9.Upgrade, v11.Upgrade, v12.Upgrade, v13.Upgrade, v14.Upgrade, v15.Upgrade, v16.Upgrade, v17.Upgrade, v18.Upgrade, v19.Upgrade}
Forks = []upgrades.Fork{v3.Fork, v6.Fork, v8.Fork, v10.Fork}
)

Expand Down
19 changes: 19 additions & 0 deletions app/upgrades/v19/constants.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
package v18

import (
"github.com/osmosis-labs/osmosis/v19/app/upgrades"

store "github.com/cosmos/cosmos-sdk/store/types"
)

// UpgradeName defines the on-chain upgrade name for the Osmosis v18 upgrade.
const UpgradeName = "v18"

var Upgrade = upgrades.Upgrade{
UpgradeName: UpgradeName,
CreateUpgradeHandler: CreateUpgradeHandler,
StoreUpgrades: store.StoreUpgrades{
Added: []string{},
Deleted: []string{},
},
}
39 changes: 39 additions & 0 deletions app/upgrades/v19/upgrades.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
package v18

import (
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/cosmos/cosmos-sdk/types/module"
upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"

"github.com/osmosis-labs/osmosis/v19/app/keepers"
"github.com/osmosis-labs/osmosis/v19/app/upgrades"
)

// OSMO / DAI CL pool ID
const lastPoolToCorrect = 1066

func CreateUpgradeHandler(
mm *module.Manager,
configurator module.Configurator,
bpm upgrades.BaseAppParamManager,
keepers *keepers.AppKeepers,
) upgradetypes.UpgradeHandler {
return func(ctx sdk.Context, plan upgradetypes.Plan, fromVM module.VersionMap) (module.VersionMap, error) {
// Run migrations before applying any other state changes.
// NOTE: DO NOT PUT ANY STATE CHANGES BEFORE RunMigrations().
migrations, err := mm.RunMigrations(ctx, configurator, fromVM)
if err != nil {
return nil, err
}

for id := 1; id < lastPoolToCorrect; id++ {
resetSuperfluidSumtree(keepers, ctx, uint64(id))
}
return migrations, nil
}
}

func resetSuperfluidSumtree(keepers *keepers.AppKeepers, ctx sdk.Context, id uint64) {
// denom := gammtypes.GetPoolShareDenom(id)
// keepers.LockupKeeper.RebuildAccumulationStoreForDenom(ctx, denom)
}

0 comments on commit adca952

Please sign in to comment.