address comments

x/accounts/keeper.go

@@ -118,9 +118,9 @@ func (k Keeper) NextAccountNumber(
 	return accNum, nil
 }
 
-// InitAccountNumberSeq use to set accounts account number tracking.
+// InitAccountNumberSeqUnsafe use to set accounts account number tracking.
 // Only use for account number migration.
-func (k Keeper) InitAccountNumberSeq(ctx context.Context, accNum uint64) error {
+func (k Keeper) InitAccountNumberSeqUnsafe(ctx context.Context, accNum uint64) error {
 	currentNum, err := k.AccountNumber.Peek(ctx)
 	if err != nil {
 		return err

x/auth/keeper/keeper.go

@@ -45,6 +45,9 @@ type AccountKeeperI interface {
 	// Fetch the sequence of an account at a specified address.
 	GetSequence(context.Context, sdk.AccAddress) (uint64, error)
 
+	// Fetch the next account number, and increment the internal counter.
+	NextAccountNumber(context.Context) uint64
+
 	// GetModulePermissions fetches per-module account permissions
 	GetModulePermissions() map[string]types.PermissionsForAddress
 
@@ -175,6 +178,18 @@ func (ak AccountKeeper) GetSequence(ctx context.Context, addr sdk.AccAddress) (u
 	return acc.GetSequence(), nil
 }
 
+// NextAccountNumber returns and increments the global account number counter.
+// If the global account number is not set, it initializes it with value 0.
+//
+// Depricated: keep this to avoid break api
+func (ak AccountKeeper) NextAccountNumber(ctx context.Context) uint64 {
+	n, err := ak.AccountsModKeeper.NextAccountNumber(ctx)
+	if err != nil {
+		panic(err)
+	}
+	return n
+}
+
 // GetModulePermissions fetches per-module account permissions.
 func (ak AccountKeeper) GetModulePermissions() map[string]types.PermissionsForAddress {
 	return ak.permAddrs

x/auth/keeper/migrations.go

@@ -59,7 +59,7 @@ func (m Migrator) Migrate5To6(ctx context.Context) error {
 		return err
 	}
 
-	return m.keeper.AccountsModKeeper.InitAccountNumberSeq(ctx, currentAccNum)
+	return m.keeper.AccountsModKeeper.InitAccountNumberSeqUnsafe(ctx, currentAccNum)
 }
 
 // V45SetAccount implements V45_SetAccount

x/auth/types/expected_keepers.go

@@ -21,7 +21,7 @@ type AccountsModKeeper interface {
 	IsAccountsModuleAccount(ctx context.Context, accountAddr []byte) bool
 	NextAccountNumber(ctx context.Context) (accNum uint64, err error)
 
-	// InitAccountNumberSeq is use to set accounts module account number with value
+	// InitAccountNumberSeqUnsafe is use to set accounts module account number with value
 	// of auth module current account number
-	InitAccountNumberSeq(ctx context.Context, currentAccNum uint64) error
+	InitAccountNumberSeqUnsafe(ctx context.Context, currentAccNum uint64) error
 }