Mirroristas/planetmint-go
2
0
Fork 0
mirror of https://github.com/planetmint/planetmint-go.git synced 2025-06-05 13:46:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: ConsensusVersion on machine module (#432)

Browse Source 
* fix: ConsensusVersion on machine module
* fix: use correct key to store activated ta counter on migration
---------
Signed-off-by: Lorenz Herzberger <lorenzherzberger@gmail.com>
This commit is contained in:
Lorenz Herzberger 2024-07-25 10:31:15 +02:00 committed by GitHub
parent c2ef2b5924
commit 5d84ae6806
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
x/machine/keeper/migrations.go
View File

@ -22,5 +22,5 @@ func (m Migrator) Migrate1to2(ctx sdk.Context) error {
} }
func (m Migrator) Migrate2to3(ctx sdk.Context) error { func (m Migrator) Migrate2to3(ctx sdk.Context) error {
return v3.MigrateStore(ctx, m.keeper.taStoreKey, m.keeper.cdc) return v3.MigrateStore(ctx, m.keeper.taStoreKey, m.keeper.storeKey)
} }

7
x/machine/migrations/v3/migrate.go
View File

@ -3,18 +3,17 @@ package v3
import ( import (
"encoding/binary" "encoding/binary"
"github.com/cosmos/cosmos-sdk/codec"
"github.com/cosmos/cosmos-sdk/store/prefix" "github.com/cosmos/cosmos-sdk/store/prefix"
storetypes "github.com/cosmos/cosmos-sdk/store/types" storetypes "github.com/cosmos/cosmos-sdk/store/types"
sdk "github.com/cosmos/cosmos-sdk/types" sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/planetmint/planetmint-go/x/machine/types" "github.com/planetmint/planetmint-go/x/machine/types"
) )
func MigrateStore(ctx sdk.Context, storeKey storetypes.StoreKey, _ codec.BinaryCodec) error { func MigrateStore(ctx sdk.Context, taStoreKey storetypes.StoreKey, storeKey storetypes.StoreKey) error {
store := prefix.NewStore(ctx.KVStore(storeKey), types.KeyPrefix(types.TrustAnchorKey)) store := ctx.KVStore(taStoreKey)
count := uint64(0) count := uint64(0)
iterator := store.Iterator(nil, nil) iterator := sdk.KVStorePrefixIterator(store, []byte(types.TrustAnchorKey))
defer iterator.Close() defer iterator.Close()
for ; iterator.Valid(); iterator.Next() { for ; iterator.Valid(); iterator.Next() {
if iterator.Value()[0] == 1 { if iterator.Value()[0] == 1 {

2
x/machine/module.go
View File

@ -149,7 +149,7 @@ func (am AppModule) ExportGenesis(ctx sdk.Context, cdc codec.JSONCodec) json.Raw
} }
// ConsensusVersion is a sequence number for state-breaking change of the module. It should be incremented on each consensus-breaking change introduced by the module. To avoid wrong/empty versions, the initial version should be set to 1 // ConsensusVersion is a sequence number for state-breaking change of the module. It should be incremented on each consensus-breaking change introduced by the module. To avoid wrong/empty versions, the initial version should be set to 1
func (AppModule) ConsensusVersion() uint64 { return 2 } func (AppModule) ConsensusVersion() uint64 { return 4 }
// BeginBlock contains the logic that is automatically triggered at the beginning of each block // BeginBlock contains the logic that is automatically triggered at the beginning of each block
func (am AppModule) BeginBlock(_ sdk.Context, _ abci.RequestBeginBlock) { func (am AppModule) BeginBlock(_ sdk.Context, _ abci.RequestBeginBlock) {