Skip to content

Commit

Permalink
v3 update (#329)
Browse files Browse the repository at this point in the history
Co-authored-by: ba1ciu <[email protected]>
  • Loading branch information
ba1ciu and ba1ciu authored Nov 21, 2022
1 parent 4b47d0a commit 9dc9cce
Show file tree
Hide file tree
Showing 4 changed files with 39 additions and 3 deletions.
3 changes: 2 additions & 1 deletion chain/app/app.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import (

"github.com/empowerchain/empowerchain/app/upgrades"
v2 "github.com/empowerchain/empowerchain/app/upgrades/v2"
v3 "github.com/empowerchain/empowerchain/app/upgrades/v3"

"github.com/empowerchain/empowerchain/app/params"
"github.com/gorilla/mux"
Expand Down Expand Up @@ -167,7 +168,7 @@ var (
ibctransfertypes.ModuleName: {authtypes.Minter, authtypes.Burner},
}

Upgrades = []upgrades.Upgrade{v2.Upgrade}
Upgrades = []upgrades.Upgrade{v2.Upgrade, v3.Upgrade}
)

var (
Expand Down
27 changes: 27 additions & 0 deletions chain/app/upgrades/v3/upgrade.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
package v3

import (
storetypes "github.com/cosmos/cosmos-sdk/store/types"
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/empowerchain/empowerchain/app/upgrades"
)

// UpgradeName defines the on-chain upgrade name for the EmpowerChain v3 upgrade.
const UpgradeName = "v3"

var Upgrade = upgrades.Upgrade{
UpgradeName: UpgradeName,
CreateUpgradeHandler: CreateUpgradeHandler,
StoreUpgrades: storetypes.StoreUpgrades{
Added: []string{},
Deleted: []string{},
},
}

func CreateUpgradeHandler(mm *module.Manager, configurator module.Configurator) upgradetypes.UpgradeHandler {
return func(ctx sdk.Context, plan upgradetypes.Plan, fromVM module.VersionMap) (module.VersionMap, error) {
return mm.RunMigrations(ctx, configurator, fromVM)
}
}
5 changes: 5 additions & 0 deletions chain/x/proofofexistence/keeper/migrations.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,8 @@ func NewMigrator(keeper Keeper) Migrator {
func (m Migrator) Migrate1to2(ctx sdk.Context) error {
return v2.MigrateStore(ctx, m.keeper.storeKey, m.keeper.cdc)
}

// Handler for no store changes
func (m Migrator) NoOp(ctx sdk.Context) error {
return nil
}
7 changes: 5 additions & 2 deletions chain/x/proofofexistence/module.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
)

// ConsensusVersion defines the current x/proofofexistence module consensus version.
const ConsensusVersion = 3
const ConsensusVersion = 4

var (
_ module.AppModule = AppModule{}
Expand Down Expand Up @@ -109,10 +109,13 @@ func (am AppModule) RegisterServices(cfg module.Configurator) {

m := keeper.NewMigrator(am.keeper)
// For some reason this was hardcoded to 2 in the previous version https://github.com/empowerchain/empowerchain/blob/f7e68c0cd2901c9a60bd2ce00b43cf0db2c33f0e/chain/x/proofofexistence/module.go#L171
// When resetting all this before main net, get it back to 1
// TODO When resetting all this before main net, get it back to 1
if err := cfg.RegisterMigration(types.ModuleName, 2, m.Migrate1to2); err != nil {
panic(err)
}
if err := cfg.RegisterMigration(types.ModuleName, 3, m.NoOp); err != nil {
panic(err)
}
}

func (AppModule) ConsensusVersion() uint64 {
Expand Down

1 comment on commit 9dc9cce

@vercel
Copy link

@vercel vercel bot commented on 9dc9cce Nov 21, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.