fix(upgrade): use preupgrade store prefixes from migrate package

Signed-off-by: Artur Troian <[email protected]>

Author: troian

upgrades/software/v1.0.0/deployment.go

@@ -32,6 +32,7 @@ func (m deploymentsMigrations) GetHandler() sdkmodule.MigrationHandler {
 func (m deploymentsMigrations) handler(ctx sdk.Context) error {
 	store := ctx.KVStore(m.StoreKey())
 
+	// deployment prefix does not change in this upgrade
 	oStore := prefix.NewStore(store, dkeeper.DeploymentPrefix)
 
 	iter := oStore.Iterator(nil, nil)
@@ -66,6 +67,7 @@ func (m deploymentsMigrations) handler(ctx sdk.Context) error {
 		store.Set(key, bz)
 	}
 
+	// group prefix does not change in this upgrade
 	oStore = prefix.NewStore(store, dkeeper.GroupPrefix)
 
 	iter = oStore.Iterator(nil, nil)

upgrades/software/v1.0.0/market.go

@@ -35,6 +35,7 @@ func (m marketMigrations) handler(ctx sdk.Context) error {
 
 	cdc := m.Codec()
 
+	// order prefix does not change in this upgrade
 	oiter := storetypes.KVStorePrefixIterator(store, mkeys.OrderPrefix)
 	defer func() {
 		_ = oiter.Close()
@@ -69,8 +70,8 @@ func (m marketMigrations) handler(ctx sdk.Context) error {
 		store.Set(key, bz)
 	}
 
+	// bid prefixes do not change in this upgrade
 	store.Delete(mkeys.BidPrefixReverse)
-
 	biter := storetypes.KVStorePrefixIterator(store, mkeys.BidPrefix)
 	defer func() {
 		_ = biter.Close()
@@ -124,6 +125,7 @@ func (m marketMigrations) handler(ctx sdk.Context) error {
 		}
 	}
 
+	// lease prefixes do not change in this upgrade
 	store.Delete(mkeys.LeasePrefixReverse)
 	liter := storetypes.KVStorePrefixIterator(store, mkeys.LeasePrefix)
 	defer func() {

upgrades/software/v1.0.0/provider.go

@@ -3,11 +3,12 @@
 package v1_0_0
 
 import (
+	"fmt"
+
 	"cosmossdk.io/store/prefix"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	sdkmodule "github.com/cosmos/cosmos-sdk/types/module"
 	"pkg.akt.dev/go/node/migrate"
-	types "pkg.akt.dev/go/node/provider/v1beta4"
 	"pkg.akt.dev/go/sdkutil"
 
 	utypes "pkg.akt.dev/node/upgrades/types"
@@ -29,24 +30,33 @@ func (m providerMigrations) GetHandler() sdkmodule.MigrationHandler {
 // handler migrates provider store from version 2 to 3.
 func (m providerMigrations) handler(ctx sdk.Context) (err error) {
 	store := ctx.KVStore(m.StoreKey())
-	pstore := prefix.NewStore(store, types.ProviderPrefix())
+	oStore := prefix.NewStore(store, migrate.PaymentV1beta3Prefix())
 
-	iter := store.Iterator(nil, nil)
+	iter := oStore.Iterator(nil, nil)
 	defer func() {
 		err = iter.Close()
 	}()
 
 	cdc := m.Codec()
 
+	var providersTotal uint64
+
 	for ; iter.Valid(); iter.Next() {
 		to := migrate.ProviderFromV1beta3(cdc, iter.Value())
 
 		id := sdkutil.MustAccAddressFromBech32(to.Owner)
 		bz := cdc.MustMarshal(&to)
 
-		store.Delete(iter.Key())
-		pstore.Set(pkeeper.ProviderKey(id), bz)
+		providersTotal++
+
+		oStore.Delete(iter.Key())
+		store.Set(pkeeper.ProviderKey(id), bz)
 	}
 
+	ctx.Logger().Info(fmt.Sprintf("[upgrade %s]: updated x/deployment store keys:"+
+		"\n\tproviders total:              %d",
+		UpgradeName,
+		providersTotal))
+
 	return nil
 }