chore: migrate x/randonmess to collections

x/randomness/genesis.go

@@ -14,7 +14,12 @@ func InitGenesis(ctx sdk.Context, k keeper.Keeper, data types.GenesisState) {
 
 // ExportGenesis extracts data from store to genesis state.
 func ExportGenesis(ctx sdk.Context, k keeper.Keeper) types.GenesisState {
+	seed, err := k.GetSeed(ctx)
+	if err != nil {
+		return types.GenesisState{}
+	}
+
 	return types.GenesisState{
-		Seed: k.GetSeed(ctx),
+		Seed: seed,
 	}
 }

x/randomness/keeper/abci.go

@@ -56,7 +56,10 @@ func (h *ProposalHandler) PrepareProposalHandler(
 
 		// Seed transaction
 		// alpha = (seed_{i-1} || timestamp)
-		prevSeed := keeper.GetSeed(ctx)
+		prevSeed, err := keeper.GetSeed(ctx)
+		if err != nil {
+			return nil, err
+		}
 		if prevSeed == "" {
 			return nil, fmt.Errorf("previous seed is empty - this should never happen")
 		}
@@ -161,7 +164,10 @@ func (h *ProposalHandler) ProcessProposalHandler(
 			return nil, err
 		}
 
-		prevSeed := keeper.GetSeed(ctx)
+		prevSeed, err := keeper.GetSeed(ctx)
+		if err != nil {
+			return nil, err
+		}
 		if prevSeed == "" {
 			panic("seed should never be empty")
 		}

x/randomness/keeper/keeper.go

@@ -4,8 +4,9 @@ import (
 	"context"
 	"fmt"
 
+	"cosmossdk.io/collections"
+	storetypes "cosmossdk.io/core/store"
 	"cosmossdk.io/log"
-	storetypes "cosmossdk.io/store/types"
 
 	"github.com/cosmos/cosmos-sdk/codec"
 	cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types"
@@ -15,65 +16,48 @@ import (
 )
 
 type Keeper struct {
-	cdc      codec.BinaryCodec
-	storeKey storetypes.StoreKey
+	Schema              collections.Schema
+	Seeds               collections.Item[string]
+	ValidatorVRFPubKeys collections.Map[string, cryptotypes.PubKey]
 }
 
-func NewKeeper(cdc codec.BinaryCodec, storeKey storetypes.StoreKey) *Keeper {
+func NewKeeper(cdc codec.BinaryCodec, storeService storetypes.KVStoreService) *Keeper {
+	sb := collections.NewSchemaBuilder(storeService)
+
 	return &Keeper{
-		cdc:      cdc,
-		storeKey: storeKey,
+		Seeds:               collections.NewItem(sb, types.SeedPrefix, "seeds", collections.StringValue),
+		ValidatorVRFPubKeys: collections.NewMap(sb, types.ValidatorVRFPrefix, "validator-vrf-pubkeys", collections.StringKey, codec.CollInterfaceValue[cryptotypes.PubKey](cdc)),
 	}
 }
 
 // GetSeed returns the seed.
-func (k Keeper) GetSeed(ctx sdk.Context) string {
-	store := ctx.KVStore(k.storeKey)
-	bz := store.Get(types.KeyPrefixSeed)
-	return string(bz)
+func (k Keeper) GetSeed(ctx sdk.Context) (string, error) {
+	seed, err := k.Seeds.Get(ctx)
+	if err != nil {
+		return "", err
+	}
+
+	return seed, nil
 }
 
 // SetSeed stores the seed.
-func (k Keeper) SetSeed(ctx sdk.Context, seed string) {
-	store := ctx.KVStore(k.storeKey)
-	store.Set(types.KeyPrefixSeed, []byte(seed))
+func (k Keeper) SetSeed(ctx sdk.Context, seed string) error {
+	return k.Seeds.Set(ctx, seed)
 }
 
 // GetValidatorVRFPubKey retrieves from the store the VRF public key
 // corresponding to the given validator consensus address.
 func (k Keeper) GetValidatorVRFPubKey(ctx sdk.Context, consensusAddr string) (cryptotypes.PubKey, error) {
-	addr, err := sdk.ConsAddressFromBech32(consensusAddr)
+	vrfPubKey, err := k.ValidatorVRFPubKeys.Get(ctx, consensusAddr)
 	if err != nil {
 		return nil, err
 	}
 
-	store := ctx.KVStore(k.storeKey)
-	bz := store.Get(types.GetValidatorVRFKey(addr))
-	if bz == nil {
-		return nil, fmt.Errorf("vrf pubkey not found for %s", consensusAddr)
-	}
-
-	var vrfPubKey cryptotypes.PubKey
-	err = k.cdc.UnmarshalInterface(bz, &vrfPubKey)
-	if err != nil {
-		return nil, err
-	}
 	return vrfPubKey, nil
 }
 
 func (k Keeper) SetValidatorVRFPubKey(goCtx context.Context, consensusAddr string, vrfPubKey cryptotypes.PubKey) error {
-	addr, err := sdk.ConsAddressFromBech32(consensusAddr)
-	if err != nil {
-		return err
-	}
-
-	store := sdk.UnwrapSDKContext(goCtx).KVStore(k.storeKey)
-	bz, err := k.cdc.MarshalInterface(vrfPubKey)
-	if err != nil {
-		return err
-	}
-	store.Set(types.GetValidatorVRFKey(addr), bz)
-	return nil
+	return k.ValidatorVRFPubKeys.Set(goCtx, consensusAddr, vrfPubKey)
 }
 
 func (k Keeper) Logger(ctx sdk.Context) log.Logger {

x/randomness/keeper/querier.go

@@ -20,8 +20,13 @@ func NewQuerierImpl(keeper Keeper) *Querier {
 
 func (q Querier) Seed(c context.Context, _ *types.QuerySeedRequest) (*types.QuerySeedResponse, error) {
 	ctx := sdk.UnwrapSDKContext(c)
+	seed, err := q.GetSeed(ctx)
+	if err != nil {
+		return nil, err
+	}
+
 	return &types.QuerySeedResponse{
-		Seed:        q.GetSeed(ctx),
+		Seed:        seed,
 		BlockHeight: ctx.BlockHeight(),
 	}, nil
 }

x/randomness/types/keys.go

@@ -1,9 +1,6 @@
 package types
 
-import (
-	sdk "github.com/cosmos/cosmos-sdk/types"
-	"github.com/cosmos/cosmos-sdk/types/address"
-)
+import "cosmossdk.io/collections"
 
 const (
 	// ModuleName defines the module name
@@ -16,13 +13,5 @@ const (
 	RouterKey = ModuleName
 )
 
-// KeyPrefixSeed defines prefix to store the current block's seed.
-var KeyPrefixSeed = []byte{0x00}
-
-// KeyPrefixValidatorVRF defines prefix to store the validator VRF object.
-var KeyPrefixValidatorVRF = []byte{0x01}
-
-// GetValidatorVRFKey gets the key for the validator VRF object.
-func GetValidatorVRFKey(consensusAddr sdk.ConsAddress) []byte {
-	return append(KeyPrefixValidatorVRF, address.MustLengthPrefix(consensusAddr)...)
-}
+var SeedPrefix = collections.NewPrefix(0)
+var ValidatorVRFPrefix = collections.NewPrefix(1)