fix(x/escrow): properly send fees to pool

app/app_configure.go

@@ -104,6 +104,7 @@ func (app *AkashApp) setAkashKeepers() {
 		app.keys[escrow.StoreKey],
 		app.Keepers.Cosmos.Bank,
 		app.Keepers.Akash.Take,
+		app.Keepers.Cosmos.Distr,
 	)
 
 	app.Keepers.Akash.Deployment = deployment.NewKeeper(

testutil/state/suite.go

@@ -4,6 +4,7 @@ import (
 	"testing"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
+	distrtypes "github.com/cosmos/cosmos-sdk/x/distribution/types"
 	"github.com/stretchr/testify/mock"
 	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
 
@@ -46,6 +47,7 @@ type Keepers struct {
 	Deployment dkeeper.IKeeper
 	Provider   pkeeper.IKeeper
 	Bank       *emocks.BankKeeper
+	Distr      *emocks.DistrKeeper
 }
 
 // SetupTestSuite provides toolkit for accessing stores and keepers
@@ -66,6 +68,15 @@ func SetupTestSuiteWithKeepers(t testing.TB, keepers Keepers) *TestSuite {
 		keepers.Bank = bkeeper
 	}
 
+	if keepers.Distr == nil {
+		dkeeper := &emocks.DistrKeeper{}
+		dkeeper.
+			On("GetFeePool", mock.Anything).
+			Return(distrtypes.FeePool{})
+		dkeeper.On("SetFeePool", mock.Anything, mock.Anything).
+			Return()
+	}
+
 	app := app.Setup(false)
 
 	if keepers.Audit == nil {
@@ -77,7 +88,7 @@ func SetupTestSuiteWithKeepers(t testing.TB, keepers Keepers) *TestSuite {
 	}
 
 	if keepers.Escrow == nil {
-		keepers.Escrow = ekeeper.NewKeeper(etypes.ModuleCdc, app.GetKey(etypes.StoreKey), keepers.Bank, keepers.Take)
+		keepers.Escrow = ekeeper.NewKeeper(etypes.ModuleCdc, app.GetKey(etypes.StoreKey), keepers.Bank, keepers.Take, keepers.Distr)
 	}
 	if keepers.Market == nil {
 		keepers.Market = mkeeper.NewKeeper(mtypes.ModuleCdc, app.GetKey(mtypes.StoreKey), app.GetSubspace(mtypes.ModuleName), keepers.Escrow)

x/escrow/keeper/external.go

@@ -2,6 +2,7 @@ package keeper
 
 import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
+	distrtypes "github.com/cosmos/cosmos-sdk/x/distribution/types"
 )
 
 //go:generate mockery --name BankKeeper --output ./mocks
@@ -15,3 +16,9 @@ type BankKeeper interface {
 type TakeKeeper interface {
 	SubtractFees(ctx sdk.Context, amt sdk.Coin) (sdk.Coin, sdk.Coin, error)
 }
+
+//go:generate mockery --name DistrKeeper --output ./mocks
+type DistrKeeper interface {
+	GetFeePool(ctx sdk.Context) distrtypes.FeePool
+	SetFeePool(ctx sdk.Context, pool distrtypes.FeePool)
+}

x/escrow/keeper/keeper.go

@@ -7,6 +7,7 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
 	types "github.com/akash-network/akash-api/go/node/escrow/v1beta3"
+	distrtypes "github.com/cosmos/cosmos-sdk/x/distribution/types"
 )
 
 type AccountHook func(sdk.Context, types.Account)
@@ -34,12 +35,13 @@ type Keeper interface {
 	SavePayment(sdk.Context, types.FractionalPayment)
 }
 
-func NewKeeper(cdc codec.BinaryCodec, skey sdk.StoreKey, bkeeper BankKeeper, tkeeper TakeKeeper) Keeper {
+func NewKeeper(cdc codec.BinaryCodec, skey sdk.StoreKey, bkeeper BankKeeper, tkeeper TakeKeeper, dkeeper DistrKeeper) Keeper {
 	return &keeper{
 		cdc:     cdc,
 		skey:    skey,
 		bkeeper: bkeeper,
 		tkeeper: tkeeper,
+		dkeeper: dkeeper,
 	}
 }
 
@@ -48,6 +50,7 @@ type keeper struct {
 	skey    sdk.StoreKey
 	bkeeper BankKeeper
 	tkeeper TakeKeeper
+	dkeeper DistrKeeper
 
 	hooks struct {
 		onAccountClosed []AccountHook
@@ -545,11 +548,9 @@ func (k *keeper) paymentWithdraw(ctx sdk.Context, obj *types.FractionalPayment)
 		return err
 	}
 
-	if !fee.IsZero() {
-		if err := k.bkeeper.SendCoinsFromModuleToModule(ctx, types.ModuleName, "community", sdk.NewCoins(fee)); err != nil {
-			ctx.Logger().Error("payment withdraw - fees", "err", err, "account", obj.AccountID, "payment", obj.PaymentID)
-			return err
-		}
+	if err := k.sendFeeToCommunityPool(ctx, fee); err != nil {
+		ctx.Logger().Error("payment withdraw - fees", "err", err, "account", obj.AccountID, "payment", obj.PaymentID)
+		return err
 	}
 
 	if !earnings.IsZero() {
@@ -568,6 +569,26 @@ func (k *keeper) paymentWithdraw(ctx sdk.Context, obj *types.FractionalPayment)
 	return nil
 }
 
+func (k keeper) sendFeeToCommunityPool(ctx sdk.Context, fee sdk.Coin) error {
+
+	if fee.IsZero() {
+		return nil
+	}
+
+	// see https://github.com/cosmos/cosmos-sdk/blob/c2a07cea272a7878b5bc2ec160eb58ca83794214/x/distribution/keeper/keeper.go#L251-L263
+
+	if err := k.bkeeper.SendCoinsFromModuleToModule(ctx, types.ModuleName, distrtypes.ModuleName, sdk.NewCoins(fee)); err != nil {
+		return err
+	}
+
+	pool := k.dkeeper.GetFeePool(ctx)
+
+	pool.CommunityPool = pool.CommunityPool.Add(sdk.NewDecCoinFromCoin(fee))
+	k.dkeeper.SetFeePool(ctx, pool)
+
+	return nil
+}
+
 func accountSettleFullblocks(
 	account types.Account,
 	payments []types.FractionalPayment,