feat: add support for user-provided fee collector module account

terra-money · Jun 27, 2023 · 27de5a5 · 27de5a5
1 parent d08cd0c
commit 27de5a5
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 5 deletions.
diff --git a/app/app.go b/app/app.go
@@ -441,6 +441,7 @@ func New(
 		app.BankKeeper,
 		app.StakingKeeper,
 		app.DistrKeeper,
+		authtypes.FeeCollectorName,
 	)
 
 	app.BankKeeper.RegisterKeepers(app.AllianceKeeper, app.StakingKeeper)

diff --git a/x/alliance/keeper/asset.go b/x/alliance/keeper/asset.go
@@ -7,7 +7,6 @@ import (
 
 	"github.com/cosmos/cosmos-sdk/store"
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
 	stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
 
 	"github.com/terra-money/alliance/x/alliance/types"
@@ -321,7 +320,7 @@ func (k Keeper) DeductAssetsWithTakeRate(ctx sdk.Context, lastClaim time.Time, a
 	}
 
 	if !coins.Empty() && !coins.IsZero() {
-		err := k.bankKeeper.SendCoinsFromModuleToModule(ctx, types.ModuleName, authtypes.FeeCollectorName, coins)
+		err := k.bankKeeper.SendCoinsFromModuleToModule(ctx, types.ModuleName, k.feeCollectorName, coins)
 		if err != nil {
 			return nil, err
 		}

diff --git a/x/alliance/keeper/keeper.go b/x/alliance/keeper/keeper.go
@@ -21,6 +21,7 @@ type Keeper struct {
 	bankKeeper         types.BankKeeper
 	stakingKeeper      types.StakingKeeper
 	distributionKeeper types.DistributionKeeper
+	feeCollectorName   string // name of the FeeCollector ModuleAccount
 }
 
 func NewKeeper(
@@ -31,13 +32,19 @@ func NewKeeper(
 	bankKeeper types.BankKeeper,
 	stakingKeeper types.StakingKeeper,
 	distributionKeeper types.DistributionKeeper,
+	feeCollectorName string,
 ) Keeper {
 	// set KeyTable if it has not already been set
 	if !ps.HasKeyTable() {
 		kt := paramtypes.NewKeyTable().RegisterParamSet(&types.Params{})
 		ps = ps.WithKeyTable(kt)
 	}
 
+	// make sure the fee collector module account exists
+	if accountKeeper.GetModuleAddress(feeCollectorName) == nil {
+		panic(fmt.Sprintf("%s module account has not been set", feeCollectorName))
+	}
+
 	return Keeper{
 		storeKey:           storeKey,
 		paramstore:         ps,
@@ -46,6 +53,7 @@ func NewKeeper(
 		bankKeeper:         bankKeeper,
 		stakingKeeper:      stakingKeeper,
 		distributionKeeper: distributionKeeper,
+		feeCollectorName:   feeCollectorName,
 	}
 }
 

diff --git a/x/alliance/keeper/slash.go b/x/alliance/keeper/slash.go
@@ -4,8 +4,6 @@ import (
 	"fmt"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
-
 	"github.com/terra-money/alliance/x/alliance/types"
 )
 
@@ -133,7 +131,7 @@ func (k Keeper) slashUndelegations(ctx sdk.Context, valAddr sdk.ValAddress, frac
 			tokensToSlash := fraction.MulInt(entry.Balance.Amount).TruncateInt()
 			entry.Balance = sdk.NewCoin(entry.Balance.Denom, entry.Balance.Amount.Sub(tokensToSlash))
 			coinToSlash := sdk.NewCoin(entry.Balance.Denom, tokensToSlash)
-			err = k.bankKeeper.SendCoinsFromModuleToModule(ctx, types.ModuleName, authtypes.FeeCollectorName, sdk.NewCoins(coinToSlash))
+			err = k.bankKeeper.SendCoinsFromModuleToModule(ctx, types.ModuleName, k.feeCollectorName, sdk.NewCoins(coinToSlash))
 			if err != nil {
 				return err
 			}