fix(#242): Fixed address prefixes in chain

Author: lxgr-linux

scripts/migrate_with_data.py

@@ -163,6 +163,7 @@
     new_dict["app_state"]["cardchain"]["users"].append(
         old_dict["app_state"]["cardchain"]["users"][idx]
     )
+
     for i in old_dict["app_state"]["auth"]["accounts"]:
         if i.get("address") == addr:
             new_dict["app_state"]["auth"]["accounts"].append(i)

types/generic_type_keeper/address_gtk.go

@@ -1,7 +1,10 @@
 package generic_type_keeper
 
 import (
+	"bytes"
+
 	"cosmossdk.io/core/store"
+	"github.com/DecentralCardGame/cardchain/x/cardchain/types"
 	"github.com/cosmos/cosmos-sdk/codec"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/gogoproto/proto"
@@ -11,6 +14,10 @@ type GenericAddressTypeKeeper[T proto.Message] struct {
 	GenericTypeKeeper[T, sdk.AccAddress]
 }
 
+func (gtk GenericAddressTypeKeeper[T]) NormalizeAddress(address []byte) sdk.AccAddress {
+	return bytes.TrimPrefix(address, append(types.KeyPrefix(gtk.valueKey()), []byte("/")...))
+}
+
 func NewAddressGTK[T proto.Message](key string, storeService store.KVStoreService, cdc codec.BinaryCodec, getEmpty func() T) GenericAddressTypeKeeper[T] {
 	gtk := GenericAddressTypeKeeper[T]{
 		GenericTypeKeeper[T, sdk.AccAddress]{

types/generic_type_keeper/generic_type_keeper.go

@@ -66,7 +66,7 @@ func (gtk GenericTypeKeeper[T, K]) Set(ctx sdk.Context, id K, new T) {
 // GetIterator Returns an iterator for all objects
 func (gtk GenericTypeKeeper[T, K]) GetIterator(ctx sdk.Context) db.Iterator {
 	store := gtk.getValueStore(ctx)
-	return storetypes.KVStorePrefixIterator(store, []byte{})
+	return storetypes.KVStorePrefixIterator(store, types.KeyPrefix(gtk.valueKey()))
 }
 
 // GetAll Gets all objs from store -- use GetItemIterator instead

x/cardchain/keeper/user.go

@@ -67,7 +67,7 @@ func (k Keeper) GetAllUsers(ctx sdk.Context) (allUsers []*types.User, allAddress
 		k.cdc.MustUnmarshal(iterator.Value(), &gottenUser)
 
 		allUsers = append(allUsers, &gottenUser)
-		allAddresses = append(allAddresses, iterator.Key())
+		allAddresses = append(allAddresses, k.Users.NormalizeAddress(iterator.Key()))
 	}
 	return
 }

x/cardchain/module/genesis.go

@@ -123,6 +123,7 @@ func ExportGenesis(ctx sdk.Context, k keeper.Keeper) *types.GenesisState {
 		addresses = append(addresses, addr.String())
 	}
 	genesis.Users = users
+	genesis.Addresses = addresses
 	// this line is used by starport scaffolding # genesis/module/export
 
 	return genesis