Migrate name module from KV store to collections.

.changelog/unreleased/features/2411-collections-name-module.md

@@ -0,0 +1 @@
+* Migrated name module from kv-store to collections [#2411](https://github.com/provenance-io/provenance/issues/2411).

app/app.go

@@ -581,7 +581,7 @@ func New(
 	hooksTransferModule := ibchooks.NewIBCMiddleware(app.RateLimitMiddleware, &app.HooksICS4Wrapper)
 	app.TransferStack = &hooksTransferModule
 
-	app.NameKeeper = namekeeper.NewKeeper(appCodec, keys[nametypes.StoreKey])
+	app.NameKeeper = namekeeper.NewKeeper(appCodec, runtime.NewKVStoreService(keys[nametypes.StoreKey]))
 
 	app.AttributeKeeper = attributekeeper.NewKeeper(
 		appCodec, keys[attributetypes.StoreKey], app.AccountKeeper, &app.NameKeeper,

internal/provwasm/simulation.go

@@ -452,7 +452,7 @@ func getRandomBondFee(r *rand.Rand, simState module.SimulationState, spendable s
 // An error is only returned if there was a problem iterating records.
 func getRandomRootNameRecord(r *rand.Rand, ctx sdk.Context, nk namekeeper.Keeper, accs []simtypes.Account) (nametypes.NameRecord, simtypes.Account, bool, error) {
 	var records []nametypes.NameRecord
-	err := nk.IterateRecords(ctx, nametypes.NameKeyPrefix, func(record nametypes.NameRecord) error {
+	err := nk.IterateRecords(ctx, func(record nametypes.NameRecord) error {
 		if len(record.Address) > 0 && !strings.Contains(record.Name, ".") {
 			records = append(records, record)
 		}

x/attribute/keeper/keeper_test.go

@@ -852,10 +852,10 @@ func (s *KeeperTestSuite) TestGetAttributesByName() {
 	}
 	s.Assert().NoError(s.app.AttributeKeeper.SetAttribute(s.ctx, attr, s.user1Addr), "should save successfully")
 	_, err := s.app.AttributeKeeper.GetAttributes(s.ctx, s.user1, "blah")
-	s.Assert().Error(err)
-	s.Assert().Equal("no address bound to name", err.Error())
+	s.Assert().Error(err, "GetAttributes")
+	s.Assert().Contains(err.Error(), "no address bound to name")
 	attributes, err := s.app.AttributeKeeper.GetAttributes(s.ctx, s.user1, "example.attribute")
-	s.Assert().NoError(err)
+	s.Assert().NoError(err, "GetAttributes should succeed")
 	s.Assert().Equal(1, len(attributes))
 	s.Assert().Equal(attr.Name, attributes[0].Name)
 	s.Assert().Equal(attr.Address, attributes[0].Address)

x/attribute/keeper/mocks_test.go

@@ -88,6 +88,6 @@ func (k *mockNameKeeper) UpdateNameRecord(ctx sdk.Context, name string, addr sdk
 }
 
 // IterateRecords calls the parent's IterateRecords function.
-func (k *mockNameKeeper) IterateRecords(ctx sdk.Context, prefix []byte, handle func(nametypes.NameRecord) error) error {
-	return k.Parent.IterateRecords(ctx, prefix, handle)
+func (k *mockNameKeeper) IterateRecords(ctx sdk.Context, handle func(nametypes.NameRecord) error) error {
+	return k.Parent.IterateRecords(ctx, handle)
 }

x/attribute/keeper/query_server_test.go

@@ -20,6 +20,7 @@ import (
 	"github.com/provenance-io/provenance/x/attribute/types"
 	markertypes "github.com/provenance-io/provenance/x/marker/types"
 	metadatatypes "github.com/provenance-io/provenance/x/metadata/types"
+	nametypes "github.com/provenance-io/provenance/x/name/types"
 )
 
 type QueryServerTestSuite struct {
@@ -44,6 +45,7 @@ func (s *QueryServerTestSuite) SetupTest() {
 	s.ctx = s.app.BaseApp.NewContext(true)
 	s.app.AccountKeeper.Params.Set(s.ctx, authtypes.DefaultParams())
 	s.app.BankKeeper.SetParams(s.ctx, banktypes.DefaultParams())
+	s.app.NameKeeper.SetParams(s.ctx, nametypes.DefaultParams())
 	s.cfg = testutil.DefaultTestNetworkConfig()
 	queryHelper := baseapp.NewQueryServerTestHelper(s.ctx, s.app.InterfaceRegistry())
 	types.RegisterQueryServer(queryHelper, s.app.AttributeKeeper)

x/attribute/simulation/operations.go

@@ -263,7 +263,7 @@ func Dispatch(
 // An error is only returned if there was a problem iterating records.
 func getRandomNameRecord(r *rand.Rand, ctx sdk.Context, nk types.NameKeeper, accs []simtypes.Account) (nametypes.NameRecord, simtypes.Account, bool, error) {
 	var records []nametypes.NameRecord
-	err := nk.IterateRecords(ctx, nametypes.NameKeyPrefix, func(record nametypes.NameRecord) error {
+	err := nk.IterateRecords(ctx, func(record nametypes.NameRecord) error {
 		records = append(records, record)
 		return nil
 	})

x/attribute/types/expected_keepers.go

@@ -23,5 +23,5 @@ type NameKeeper interface {
 	SetAttributeKeeper(attrKeeper nametypes.AttributeKeeper)
 	SetNameRecord(ctx sdk.Context, name string, addr sdk.AccAddress, restrict bool) error
 	UpdateNameRecord(ctx sdk.Context, name string, addr sdk.AccAddress, restrict bool) error
-	IterateRecords(ctx sdk.Context, prefix []byte, handle func(nametypes.NameRecord) error) error
+	IterateRecords(ctx sdk.Context, handle func(nametypes.NameRecord) error) error
 }

x/name/client/cli/cli_test.go

@@ -270,12 +270,12 @@ func (s *IntegrationTestSuite) TestReverseLookupCommand() {
 		{
 			"query name, json output",
 			[]string{s.accountAddr.String(), fmt.Sprintf("--%s=json", cmtcli.OutputFlag)},
-			"{\"name\":[\"example.attribute\",\"attribute\"],\"pagination\":{\"next_key\":null,\"total\":\"0\"}}",
+			"{\"name\":[\"attribute\",\"example.attribute\"],\"pagination\":{\"next_key\":null,\"total\":\"0\"}}",
 		},
 		{
 			"query name, text output",
 			[]string{s.accountAddr.String(), fmt.Sprintf("--%s=text", cmtcli.OutputFlag)},
-			"name:\n- example.attribute\n- attribute\npagination:\n  next_key: null\n  total: \"0\"",
+			"name:\n- attribute\n- example.attribute\npagination:\n  next_key: null\n  total: \"0\"",
 		},
 		{
 			"query name that does not exist, text output",

x/name/keeper/export_test.go

@@ -7,5 +7,8 @@ import sdk "github.com/cosmos/cosmos-sdk/types"
 
 // AddRecord is a TEST ONLY exposure of addRecord.
 func (k Keeper) AddRecord(ctx sdk.Context, name string, addr sdk.AccAddress, restrict, isModifiable bool) error {
-	return k.addRecord(ctx, name, addr, restrict, isModifiable)
+	if isModifiable {
+		return k.UpdateNameRecord(ctx, name, addr, restrict)
+	}
+	return k.SetNameRecord(ctx, name, addr, restrict)
 }

x/name/keeper/genesis.go

@@ -10,28 +10,31 @@ import (
 func (k Keeper) InitGenesis(ctx sdk.Context, data types.GenesisState) {
 	k.SetParams(ctx, data.Params)
 	for _, record := range data.Bindings {
-		addr, err := sdk.AccAddressFromBech32(record.Address)
-		if err != nil {
-			panic(err)
-		}
-		if err := k.SetNameRecord(ctx, record.Name, addr, record.Restricted); err != nil {
+		// Create record directly without normalization checks
+		if err := k.nameRecords.Set(ctx, record.Name, types.NameRecord{
+			Name:       record.Name,
+			Address:    record.Address,
+			Restricted: record.Restricted,
+		}); err != nil {
 			panic(err)
 		}
 	}
 }
 
 // ExportGenesis exports the current keeper state of the name module.
 func (k Keeper) ExportGenesis(ctx sdk.Context) *types.GenesisState {
+	// Get module parameters
 	params := k.GetParams(ctx)
-	// Genesis state data structure.
-	records := types.NameRecords{}
-	// Callback func that adds records to genesis state.
-	appendToRecords := func(record types.NameRecord) error {
+	// Collect all name records
+	records := make(types.NameRecords, 0)
+
+	// Iterate through all name records
+	err := k.nameRecords.Walk(ctx, nil, func(_ string, record types.NameRecord) (bool, error) {
 		records = append(records, record)
-		return nil
-	}
-	// Collect and return genesis state.
-	if err := k.IterateRecords(ctx, types.NameKeyPrefix, appendToRecords); err != nil {
+		return false, nil
+	})
+
+	if err != nil {
 		panic(err)
 	}
 	return types.NewGenesisState(params, records)