[Bug]: move taker fees to begin block (#1245)

* move taker fees to begin block

* comment

* remove

* update test

Author: amityadav0

x/masterchef/keeper/abci.go

@@ -15,6 +15,13 @@ import (
 	stabletypes "github.com/elys-network/elys/x/stablestake/types"
 )
 
+// BeginBlocker of amm module
+func (k Keeper) BeginBlocker(ctx sdk.Context) error {
+	// convert balances in taker address to elys and burn them
+	k.ProcessTakerFee(ctx)
+	return nil
+}
+
 // EndBlocker of amm module
 func (k Keeper) EndBlocker(ctx sdk.Context) error {
 
@@ -28,8 +35,6 @@ func (k Keeper) EndBlocker(ctx sdk.Context) error {
 	// distribute external rewards
 	k.ProcessExternalRewardsDistribution(ctx)
 
-	// convert balances in taker address to elys and burn them
-	k.ProcessTakerFee(ctx)
 	return nil
 }
 
@@ -737,7 +742,8 @@ func (k Keeper) ProcessTakerFee(ctx sdk.Context) {
 
 	balances := k.bankKeeper.GetAllBalances(ctx, collectionAddress)
 	for _, balance := range balances {
-		if balance.Denom == ptypes.Elys {
+		// need atleast certain amount to swap
+		if balance.Denom == ptypes.Elys || balance.Amount.LT(sdkmath.NewInt(1000000)) {
 			continue
 		}
 		_, err := k.amm.SwapByDenom(ctx, &ammtypes.MsgSwapByDenom{

x/masterchef/keeper/abci_test.go

@@ -390,22 +390,22 @@ func (suite *MasterchefKeeperTestSuite) TestProcessTakerFees() {
 	suite.ResetSuite(true)
 
 	// Generate 1 random account with 1000stake balanced
-	addr := simapp.AddTestAddrs(suite.app, suite.ctx, 1, sdkmath.NewInt(1000000))
+	addr := simapp.AddTestAddrs(suite.app, suite.ctx, 1, sdkmath.NewInt(100000000000))
 
 	// mint some tokens in taker address
 	takerAddress := suite.app.ParameterKeeper.GetParams(suite.ctx).TakerFeeCollectionAddress
-	suite.MintTokenToAddress(sdk.MustAccAddressFromBech32(takerAddress), sdkmath.NewInt(1000), ptypes.BaseCurrency)
-	suite.MintTokenToAddress(addr[0], sdkmath.NewInt(100000), ptypes.BaseCurrency)
+	suite.MintTokenToAddress(sdk.MustAccAddressFromBech32(takerAddress), sdkmath.NewInt(1000000), ptypes.BaseCurrency)
+	suite.MintTokenToAddress(addr[0], sdkmath.NewInt(100000000), ptypes.BaseCurrency)
 
 	// Pool with 1000 ELYS and 1000 USDC
 	poolAssets := []ammtypes.PoolAsset{
 		{
 			Weight: sdkmath.NewInt(50),
-			Token:  sdk.NewCoin(ptypes.Elys, sdkmath.NewInt(100000)),
+			Token:  sdk.NewCoin(ptypes.Elys, sdkmath.NewInt(1000000000)),
 		},
 		{
 			Weight: sdkmath.NewInt(50),
-			Token:  sdk.NewCoin(ptypes.BaseCurrency, sdkmath.NewInt(10000)),
+			Token:  sdk.NewCoin(ptypes.BaseCurrency, sdkmath.NewInt(100000000)),
 		},
 	}
 
@@ -423,7 +423,7 @@ func (suite *MasterchefKeeperTestSuite) TestProcessTakerFees() {
 	suite.Require().Equal(len(pools), 1)
 
 	elysSupplyBefore := suite.app.BankKeeper.GetSupply(suite.ctx, ptypes.Elys)
-	suite.Require().Equal(elysSupplyBefore.Amount.String(), "100000002000000")
+	suite.Require().Equal(elysSupplyBefore.Amount.String(), "100100001000000")
 
 	// Process taker fees
 	suite.app.MasterchefKeeper.ProcessTakerFee(suite.ctx)
@@ -436,5 +436,5 @@ func (suite *MasterchefKeeperTestSuite) TestProcessTakerFees() {
 
 	// Check elys supply is reduced
 	elysSupplyAfter := suite.app.BankKeeper.GetSupply(suite.ctx, ptypes.Elys)
-	suite.Require().Equal(elysSupplyAfter.Amount.String(), "100000001990992")
+	suite.Require().Equal(elysSupplyAfter.Amount.String(), "100099991197050")
 }

x/masterchef/module.go

@@ -158,8 +158,9 @@ func (am AppModule) ExportGenesis(ctx sdk.Context, cdc codec.JSONCodec) json.Raw
 func (AppModule) ConsensusVersion() uint64 { return 6 }
 
 // BeginBlock contains the logic that is automatically triggered at the beginning of each block
-func (am AppModule) BeginBlock(_ context.Context) error {
-	return nil
+func (am AppModule) BeginBlock(goCtx context.Context) error {
+	ctx := sdk.UnwrapSDKContext(goCtx)
+	return am.keeper.BeginBlocker(ctx)
 }
 
 // EndBlock contains the logic that is automatically triggered at the end of each block