fix(group): migrate group policy account to base accounts with credentials

proto/cosmos/auth/v1beta1/auth.proto

@@ -36,13 +36,14 @@ message ModuleAccount {
   repeated string permissions  = 3;
 }
 
-// ModuleCredential represents a unclaimable pubkey for base accounts
+// ModuleCredential represents a unclaimable pubkey for base accounts controlled by modules.
 //
 // Since: cosmos-sdk 0.47
 message ModuleCredential {
+  // module_name is the name of the module used for address derivation (passed into address.Module).
   string module_name = 1;
-  // derivation_keys is for deriving a module account (passed into address.Module)
-  // adding more keys creates sub-accounts (passed into address.Derive)
+  // derivation_keys is for deriving a module account address (passed into address.Module)
+  // adding more keys creates sub-account addresses (passed into address.Derive)
   repeated bytes derivation_keys = 2;
 }
 

x/auth/types/credentials.go

@@ -8,8 +8,8 @@ import (
 	"github.com/cosmos/cosmos-sdk/types/address"
 )
 
-// NewAccountWithModuleCredential creates an account with an unclaimable module credential.
-func NewAccountWithModuleCredential(pubkey cryptotypes.PubKey) (*BaseAccount, error) {
+// NewBaseAccountWithPubKey creates an account with an a pubkey.
+func NewBaseAccountWithPubKey(pubkey cryptotypes.PubKey) (*BaseAccount, error) {
 	if pubkey == nil {
 		return nil, fmt.Errorf("pubkey cannot be nil")
 	}
@@ -39,17 +39,17 @@ func NewModuleCredential(moduleName string, derivationKeys [][]byte) *ModuleCred
 }
 
 func (m *ModuleCredential) Address() cryptotypes.Address {
-	var module []byte
+	var addr []byte
 	for i, dk := range m.DerivationKeys {
 		if i == 0 {
-			module = address.Module(m.ModuleName, dk)
+			addr = address.Module(m.ModuleName, dk)
 			continue
 		}
 
-		module = address.Derive(module, dk)
+		addr = address.Derive(addr, dk)
 	}
 
-	return module
+	return addr
 }
 
 func (m *ModuleCredential) Bytes() []byte {
@@ -62,7 +62,7 @@ func (m *ModuleCredential) VerifySignature(_ []byte, _ []byte) bool {
 }
 
 func (m *ModuleCredential) Equals(other cryptotypes.PubKey) bool {
-	return false
+	return m.String() == other.String()
 }
 
 func (m *ModuleCredential) Type() string {

x/auth/types/credentials_test.go

@@ -17,19 +17,22 @@ func TestNewModuleCrendentials(t *testing.T) {
 	addr, err := sdk.AccAddressFromHexUnsafe(credential.Address().String())
 	require.NoError(t, err)
 	require.Equal(t, expected.String(), addr.String())
+
+	require.Equal(t, credential, authtypes.NewModuleCredential("group", [][]byte{{0x20}, {0x0}}))
+	require.NotEqual(t, credential, authtypes.NewModuleCredential("group", [][]byte{{0x20}, {0x1}}))
 }
 
-func TestNewAccountWithModuleCredential(t *testing.T) {
+func TestNewBaseAccountWithPubKey(t *testing.T) {
 	expected := sdk.MustAccAddressFromBech32("cosmos1fpn0w0yf4x300llf5r66jnfhgj4ul6cfahrvqsskwkhsw6sv84wsmz359y")
 
 	credential := authtypes.NewModuleCredential("group", [][]byte{{0x20}, {0x0}})
-	account, err := authtypes.NewAccountWithModuleCredential(credential)
+	account, err := authtypes.NewBaseAccountWithPubKey(credential)
 	require.NoError(t, err)
 	require.Equal(t, expected, account.GetAddress())
 	require.Equal(t, credential, account.GetPubKey())
 }
 
-func TestNewAccountWithModuleCredential_WrongCredentials(t *testing.T) {
-	_, err := authtypes.NewAccountWithModuleCredential(cryptotypes.PubKey(nil))
+func TestNewBaseAccountWithPubKey_WrongCredentials(t *testing.T) {
+	_, err := authtypes.NewBaseAccountWithPubKey(cryptotypes.PubKey(nil))
 	require.Error(t, err)
 }

x/group/keeper/keeper_test.go

@@ -126,10 +126,10 @@ func (s TestSuite) setNextAccount() {
 
 	accountCredentials := authtypes.NewModuleCredential(group.ModuleName, [][]byte{{keeper.GroupPolicyTablePrefix}, derivationKey})
 
-	groupPolicyAcc, err := authtypes.NewAccountWithModuleCredential(accountCredentials)
+	groupPolicyAcc, err := authtypes.NewBaseAccountWithPubKey(accountCredentials)
 	s.Require().NoError(err)
 
-	groupPolicyAccBumpAccountNumber, err := authtypes.NewAccountWithModuleCredential(accountCredentials)
+	groupPolicyAccBumpAccountNumber, err := authtypes.NewBaseAccountWithPubKey(accountCredentials)
 	s.Require().NoError(err)
 	groupPolicyAccBumpAccountNumber.SetAccountNumber(nextAccVal)
 

x/group/keeper/msg_server.go

@@ -345,7 +345,7 @@ func (k Keeper) CreateGroupPolicy(goCtx context.Context, req *group.MsgCreateGro
 		}
 
 		// group policy accounts are unclaimable base accounts
-		account, err := authtypes.NewAccountWithModuleCredential(accountCredentials)
+		account, err := authtypes.NewBaseAccountWithPubKey(accountCredentials)
 		if err != nil {
 			return nil, sdkerrors.Wrap(err, "could not create group policy account")
 		}

x/group/migrations/v2/migrate.go

@@ -60,7 +60,7 @@ func Migrate(
 		}
 
 		accountCredentials := authtypes.NewModuleCredential(group.ModuleName, [][]byte{{GroupPolicyTablePrefix}, derivationKey})
-		baseAccount, err := authtypes.NewAccountWithModuleCredential(accountCredentials)
+		baseAccount, err := authtypes.NewBaseAccountWithPubKey(accountCredentials)
 		if err != nil {
 			return fmt.Errorf("failed to create new group policy account: %w", err)
 		}