update token destribution inside accumulator

Author: MarkCherepovskyi

x/accumulator/genesis.go

@@ -18,6 +18,5 @@ func ExportGenesis(ctx sdk.Context, k keeper.Keeper) *types.GenesisState {
 	genesis.Params = k.GetParams(ctx)
 
 	// this line is used by starport scaffolding # genesis/module/export
-
 	return genesis
 }

x/accumulator/keeper/keeper.go

@@ -21,7 +21,7 @@ type (
 		GetParams(c sdk.Context) types.Params
 		SetParams(c sdk.Context, params types.Params)
 		Params(c context.Context, req *types.QueryParamsRequest) (*types.QueryParamsResponse, error)
-		DistributeValidatorsPool(ctx sdk.Context, amount sdk.Coins) error
+		DistributeTokens(ctx sdk.Context, fromPool string, isSentToModule bool, amount sdk.Coins, receiverModule string, receiverAddress *sdk.AccAddress) error
 	}
 
 	BaseKeeper struct {

x/accumulator/keeper/token_distribution.go

@@ -4,20 +4,23 @@ import (
 	"cosmossdk.io/errors"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/x/accumulator/types"
-	minttypes "github.com/cosmos/cosmos-sdk/x/mint/types"
 )
 
-func (k BaseKeeper) DistributeValidatorsPool(ctx sdk.Context, amount sdk.Coins) error {
-	return k.distributeTokens(ctx, types.ValidatorPoolName, minttypes.ModuleName, amount)
-}
-
-func (k BaseKeeper) distributeTokens(ctx sdk.Context, fromPool string, receiverModule string, amount sdk.Coins) error {
+func (k BaseKeeper) DistributeTokens(ctx sdk.Context, fromPool string, isSentToModule bool, amount sdk.Coins, receiverModule string, receiverAddress *sdk.AccAddress) error {
 	poolAddress := GetPoolAddress(fromPool)
 	if poolAddress == nil {
 		return types.ErrInvalidPool
 	}
 
-	return k.sendFromAddressToModule(ctx, poolAddress, receiverModule, amount)
+	if isSentToModule {
+		return k.sendFromAddressToModule(ctx, poolAddress, receiverModule, amount)
+	}
+
+	if receiverAddress == nil {
+		return types.ErrInvalidReceiver
+	}
+	return k.sendFromAddressToAddress(ctx, poolAddress, *receiverAddress, amount)
+
 }
 
 func (k BaseKeeper) sendFromAddressToModule(ctx sdk.Context, poolAddress sdk.AccAddress, receiverAddress string, amount sdk.Coins) error {
@@ -36,3 +39,33 @@ func (k BaseKeeper) sendFromAddressToModule(ctx sdk.Context, poolAddress sdk.Acc
 
 	return nil
 }
+
+func (k BaseKeeper) sendFromAddressToAddress(ctx sdk.Context, poolAddress sdk.AccAddress, receiverAddress sdk.AccAddress, amount sdk.Coins) error {
+	err := k.bankKeeper.SendCoinsFromAccountToModule(
+		ctx,
+		poolAddress,
+		types.ModuleName,
+		amount,
+	)
+
+	if err != nil {
+		err = errors.Wrap(err, "sending native coins to module")
+		k.Logger(ctx).Error(err.Error())
+		return err
+	}
+
+	err = k.bankKeeper.SendCoinsFromModuleToAccount(
+		ctx,
+		types.ModuleName,
+		receiverAddress,
+		amount,
+	)
+
+	if err != nil {
+		err = errors.Wrap(err, "sending native coins to module")
+		k.Logger(ctx).Error(err.Error())
+		return err
+	}
+
+	return nil
+}

x/accumulator/types/errors.go

@@ -8,5 +8,6 @@ import (
 
 // x/accumulator module sentinel errors
 var (
-	ErrInvalidPool = sdkerrors.Register(ModuleName, 1100, "invalid pool address")
+	ErrInvalidPool     = sdkerrors.Register(ModuleName, 1100, "invalid pool address")
+	ErrInvalidReceiver = sdkerrors.Register(ModuleName, 1101, "invalid receiver address")
 )

x/mint/keeper/keeper.go

@@ -3,6 +3,7 @@ package keeper
 import (
 	"cosmossdk.io/math"
 	"github.com/cosmos/cosmos-sdk/types/errors"
+	accumulatortypes "github.com/cosmos/cosmos-sdk/x/accumulator/types"
 	"github.com/tendermint/tendermint/libs/log"
 
 	"github.com/cosmos/cosmos-sdk/codec"
@@ -79,7 +80,8 @@ func (k Keeper) BondedRatio(ctx sdk.Context) sdk.Dec {
 }
 
 func (k Keeper) SendFromAccumulator(ctx sdk.Context, amount sdk.Coins) error {
-	if err := k.accumulatorKeeper.DistributeValidatorsPool(ctx, amount); err != nil {
+	err := k.accumulatorKeeper.DistributeTokens(ctx, accumulatortypes.ValidatorPoolName, true, amount, types.ModuleName, nil)
+	if err != nil {
 		err = errors.Wrap(err, "failed to call accumulator module")
 		k.Logger(sdk.UnwrapSDKContext(ctx)).Error(err.Error())
 		return err

x/mint/types/expected_keepers.go

@@ -30,5 +30,5 @@ type BankKeeper interface {
 }
 
 type AccumulatorKeeper interface {
-	DistributeValidatorsPool(ctx sdk.Context, amount sdk.Coins) error
+	DistributeTokens(ctx sdk.Context, fromPool string, isSentToModule bool, amount sdk.Coins, receiverModule string, receiverAddress *sdk.AccAddress) error
 }