feat(accounts): use account number as state prefix for account state (#…

…18664)

Co-authored-by: unknown unknown <unknown@unknown>

proto/cosmos/accounts/v1/genesis.proto

@@ -18,8 +18,10 @@ message GenesisAccount {
   string address = 1;
   // account_type is the account type of the account.
   string account_type = 2;
+  // account_number is the account number of the account.
+  uint64 account_number = 3;
   // state is the account state represented as a slice of raw key value byte pairs.
-  repeated KVPair state = 3;
+  repeated KVPair state = 4;
 }
 
 // KVPair defines a key value pair.

store/root/store_test.go

@@ -12,8 +12,8 @@ import (
 	"cosmossdk.io/store/v2"
 	"cosmossdk.io/store/v2/commitment"
 	"cosmossdk.io/store/v2/commitment/iavl"
-	"cosmossdk.io/store/v2/storage"
 	"cosmossdk.io/store/v2/pruning"
+	"cosmossdk.io/store/v2/storage"
 	"cosmossdk.io/store/v2/storage/sqlite"
 )
 

x/accounts/genesis.go

@@ -19,8 +19,12 @@ func (k Keeper) ExportState(ctx context.Context) (*v1.GenesisState, error) {
 
 	genState.AccountNumber = accountNumber
 
-	err = k.AccountsByType.Walk(ctx, nil, func(key []byte, value string) (stop bool, err error) {
-		accState, err := k.exportAccount(ctx, key, value)
+	err = k.AccountsByType.Walk(ctx, nil, func(accAddr []byte, accType string) (stop bool, err error) {
+		accNum, err := k.AccountByNumber.Get(ctx, accAddr)
+		if err != nil {
+			return true, err
+		}
+		accState, err := k.exportAccount(ctx, accAddr, accType, accNum)
 		if err != nil {
 			return true, err
 		}
@@ -34,20 +38,21 @@ func (k Keeper) ExportState(ctx context.Context) (*v1.GenesisState, error) {
 	return genState, nil
 }
 
-func (k Keeper) exportAccount(ctx context.Context, addr []byte, accType string) (*v1.GenesisAccount, error) {
+func (k Keeper) exportAccount(ctx context.Context, addr []byte, accType string, accNum uint64) (*v1.GenesisAccount, error) {
 	addrString, err := k.addressCodec.BytesToString(addr)
 	if err != nil {
 		return nil, err
 	}
 	account := &v1.GenesisAccount{
-		Address:     addrString,
-		AccountType: accType,
+		Address:       addrString,
+		AccountType:   accType,
+		AccountNumber: accNum,
+		State:         nil,
 	}
-	rng := new(collections.Range[[]byte]).
-		Prefix(addr)
-	err = k.AccountsState.Walk(ctx, rng, func(key, value []byte) (stop bool, err error) {
+	rng := collections.NewPrefixedPairRange[uint64, []byte](accNum)
+	err = k.AccountsState.Walk(ctx, rng, func(key collections.Pair[uint64, []byte], value []byte) (stop bool, err error) {
 		account.State = append(account.State, &v1.KVPair{
-			Key:   key,
+			Key:   key.K2(),
 			Value: value,
 		})
 		return false, nil
@@ -84,8 +89,12 @@ func (k Keeper) importAccount(ctx context.Context, acc *v1.GenesisAccount) error
 	if err != nil {
 		return err
 	}
+	err = k.AccountByNumber.Set(ctx, addrBytes, acc.AccountNumber)
+	if err != nil {
+		return err
+	}
 	for _, kv := range acc.State {
-		err = k.AccountsState.Set(ctx, kv.Key, kv.Value)
+		err = k.AccountsState.Set(ctx, collections.Join(acc.AccountNumber, kv.Key), kv.Value)
 		if err != nil {
 			return err
 		}