update: tf

app/keepers/keepers.go

@@ -306,6 +306,7 @@ func NewTerraAppKeepers(
 	)
 	keepers.TokenFactoryKeeper = tokenfactorykeeper.NewKeeper(
 		keys[tokenfactorytypes.StoreKey],
+		maccPerms,
 		keepers.AccountKeeper,
 		&keepers.BankKeeper,
 		keepers.DistrKeeper,

x/tokenfactory/keeper/bankactions.go

@@ -2,6 +2,9 @@ package keeper
 
 import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
+	"google.golang.org/grpc/codes"
+	"google.golang.org/grpc/status"
+	"sort"
 
 	errorsmod "cosmossdk.io/errors"
 	customterratypes "github.com/terra-money/core/v2/x/bank/types"
@@ -71,6 +74,28 @@ func (k Keeper) forceTransfer(ctx sdk.Context, amount sdk.Coin, fromAddr string,
 		return err
 	}
 
+	fromAcc, err := sdk.AccAddressFromBech32(fromAddr)
+	if err != nil {
+		return err
+	}
+
+	sortedPermAddrs := make([]string, 0, len(k.permAddrs))
+	for moduleName := range k.permAddrs {
+		sortedPermAddrs = append(sortedPermAddrs, moduleName)
+	}
+	sort.Strings(sortedPermAddrs)
+
+	for _, moduleName := range sortedPermAddrs {
+		account := k.accountKeeper.GetModuleAccount(ctx, moduleName)
+		if account == nil {
+			return status.Errorf(codes.NotFound, "account %s not found", moduleName)
+		}
+
+		if account.GetAddress().Equals(fromAcc) {
+			return status.Errorf(codes.Internal, "send from module acc not available")
+		}
+	}
+
 	fromSdkAddr, err := sdk.AccAddressFromBech32(fromAddr)
 	if err != nil {
 		return err

x/tokenfactory/keeper/keeper.go

@@ -2,7 +2,6 @@ package keeper
 
 import (
 	"fmt"
-
 	"github.com/cosmos/cosmos-sdk/codec"
 
 	"github.com/cometbft/cometbft/libs/log"
@@ -17,7 +16,8 @@ import (
 
 type (
 	Keeper struct {
-		storeKey storetypes.StoreKey
+		storeKey  storetypes.StoreKey
+		permAddrs map[string][]string
 
 		accountKeeper  types.AccountKeeper
 		bankKeeper     *customtypes.Keeper
@@ -33,6 +33,7 @@ type (
 // NewKeeper returns a new instance of the x/tokenfactory keeper
 func NewKeeper(
 	storeKey storetypes.StoreKey,
+	permAddrs map[string][]string,
 	accountKeeper types.AccountKeeper,
 	bankKeeper *customtypes.Keeper,
 	communityPoolKeeper types.CommunityPoolKeeper,
@@ -41,7 +42,8 @@ func NewKeeper(
 ) Keeper {
 
 	return Keeper{
-		storeKey: storeKey,
+		storeKey:  storeKey,
+		permAddrs: permAddrs,
 
 		accountKeeper:       accountKeeper,
 		bankKeeper:          bankKeeper,