fixed taker fee to be chraged from the user

Author: mtsitrin

ibctesting/genesis_transfer_test.go

@@ -108,7 +108,7 @@ func (s *transferGenesisSuite) TestIRO() {
 	apptesting.FundAccount(s.rollappApp(), s.rollappCtx(), s.rollappChain().SenderAccount.GetAddress(), sdk.NewCoins(coin))
 
 	// create IRO plan
-	_, err := s.hubApp().IROKeeper.CreatePlan(s.hubCtx(), amt, time.Time{}, time.Time{}, rollapp, irotypes.DefaultBondingCurve(), irotypes.DefaultIncentivePlanParams())
+	_, err := s.hubApp().IROKeeper.CreatePlan(s.hubCtx(), amt, time.Now(), time.Now().Add(time.Hour), rollapp, irotypes.DefaultBondingCurve(), irotypes.DefaultIncentivePlanParams())
 	s.Require().NoError(err)
 
 	// non-genesis transfer should fail, as the bridge is not open

x/iro/keeper/iro.go

@@ -53,6 +53,16 @@ func (k Keeper) MustGetPlan(ctx sdk.Context, planId string) types.Plan {
 	return plan
 }
 
+// MustGetPlanByRollapp returns a plan from its rollapp ID
+// It will panic if the plan is not found
+func (k Keeper) MustGetPlanByRollapp(ctx sdk.Context, rollappId string) types.Plan {
+	plan, found := k.GetPlanByRollapp(ctx, rollappId)
+	if !found {
+		panic(fmt.Sprintf("plan not found for rollapp ID: %s", rollappId))
+	}
+	return plan
+}
+
 // GetAllPlans returns all plans
 func (k Keeper) GetAllPlans(ctx sdk.Context) (list []types.Plan) {
 	store := prefix.NewStore(ctx.KVStore(k.storeKey), types.PlanKeyPrefix)

x/iro/keeper/keeper_test.go

@@ -45,14 +45,10 @@ func (suite *KeeperTestSuite) SetupTest() {
 	suite.FundAcc(sdk.MustAccAddressFromBech32(rollapp.Owner), sdk.NewCoins(sdk.NewCoin(appparams.BaseDenom, funds)))
 }
 
-//	buyer := sample.Acc()
-//
-// buyersFunds := sdk.NewCoins(sdk.NewCoin("adym", sdk.NewInt(100_000)))
-// s.FundAcc(buyer, buyersFunds)
 // BuySomeTokens buys some tokens from the plan
 func (suite *KeeperTestSuite) BuySomeTokens(planId string, buyer sdk.AccAddress, amt math.Int) {
 	maxAmt := sdk.NewInt(1_000_000_000)
-	suite.FundAcc(buyer, sdk.NewCoins(sdk.NewCoin("adym", amt)))
+	suite.FundAcc(buyer, sdk.NewCoins(sdk.NewCoin("adym", amt.MulRaw(10)))) // 10 times the amount to buy, for buffer and fees
 	err := suite.App.IROKeeper.Buy(suite.Ctx, planId, buyer, amt, maxAmt)
 	suite.Require().NoError(err)
 }

x/iro/keeper/settle_test.go

@@ -34,7 +34,7 @@ func (s *KeeperTestSuite) TestSettle() {
 
 	// buy some tokens
 	s.Ctx = s.Ctx.WithBlockTime(startTime.Add(time.Minute))
-	soldAmt := sdk.NewInt(100)
+	soldAmt := sdk.NewInt(1_000)
 	s.BuySomeTokens(planId, sample.Acc(), soldAmt)
 
 	// settle should fail as no rollappDenom balance available
@@ -79,7 +79,7 @@ func (s *KeeperTestSuite) TestClaim() {
 	claimer := sample.Acc()
 	// buy some tokens
 	s.Ctx = s.Ctx.WithBlockTime(startTime.Add(time.Minute))
-	soldAmt := sdk.NewInt(100)
+	soldAmt := sdk.NewInt(1_000)
 	s.BuySomeTokens(planId, claimer, soldAmt)
 
 	// claim should fail as not settled

x/iro/keeper/trade.go

@@ -68,8 +68,9 @@ func (k Keeper) Buy(ctx sdk.Context, planId string, buyer sdk.AccAddress, amount
 	if !cost.IsPositive() {
 		return errorsmod.Wrapf(types.ErrInvalidCost, "cost: %s", cost.String())
 	}
+	costCoin := sdk.NewCoin(appparams.BaseDenom, cost)
 
-	totalCost, takerFeeCoin := k.AddTakerFee(sdk.NewCoin(appparams.BaseDenom, cost), k.GetParams(ctx).TakerFee)
+	totalCost, takerFeeCoin := k.AddTakerFee(costCoin, k.GetParams(ctx).TakerFee)
 	if !totalCost.IsPositive() || !takerFeeCoin.IsPositive() {
 		return errorsmod.Wrapf(types.ErrInvalidCost, "totalCost: %s, takerFeeCoin: %s", totalCost.String(), takerFeeCoin.String())
 	}
@@ -86,7 +87,7 @@ func (k Keeper) Buy(ctx sdk.Context, planId string, buyer sdk.AccAddress, amount
 	}
 
 	// send DYM from buyer to the plan. DYM sent directly to the plan's module account
-	err = k.BK.SendCoins(ctx, buyer, plan.GetAddress(), sdk.NewCoins(totalCost))
+	err = k.BK.SendCoins(ctx, buyer, plan.GetAddress(), sdk.NewCoins(costCoin))
 	if err != nil {
 		return err
 	}
@@ -129,8 +130,12 @@ func (k Keeper) Sell(ctx sdk.Context, planId string, seller sdk.AccAddress, amou
 
 	// Calculate cost over fixed price curve
 	cost := plan.BondingCurve.Cost(plan.SoldAmt.Sub(amountTokensToSell), plan.SoldAmt)
+	if !cost.IsPositive() {
+		return errorsmod.Wrapf(types.ErrInvalidCost, "cost: %s", cost.String())
+	}
+	costCoin := sdk.NewCoin(appparams.BaseDenom, cost)
 
-	totalCost, takerFeeCoin := k.SubtractTakerFee(sdk.NewCoin(appparams.BaseDenom, cost), k.GetParams(ctx).TakerFee)
+	totalCost, takerFeeCoin := k.SubtractTakerFee(costCoin, k.GetParams(ctx).TakerFee)
 	if !totalCost.IsPositive() || !takerFeeCoin.IsPositive() {
 		return errorsmod.Wrapf(types.ErrInvalidCost, "totalCost: %s, takerFeeCoin: %s", totalCost.String(), takerFeeCoin.String())
 	}
@@ -153,7 +158,7 @@ func (k Keeper) Sell(ctx sdk.Context, planId string, seller sdk.AccAddress, amou
 	}
 
 	// send DYM from the plan to the seller. DYM managed by the plan's module account
-	err = k.BK.SendCoins(ctx, plan.GetAddress(), seller, sdk.NewCoins(totalCost))
+	err = k.BK.SendCoins(ctx, plan.GetAddress(), seller, sdk.NewCoins(costCoin))
 	if err != nil {
 		return err
 	}

x/iro/keeper/trade_test.go

@@ -6,14 +6,16 @@ import (
 
 	"cosmossdk.io/math"
 	sdk "github.com/cosmos/cosmos-sdk/types"
+	authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
 	"github.com/dymensionxyz/dymension/v3/testutil/sample"
 	"github.com/dymensionxyz/dymension/v3/x/iro/keeper"
 	"github.com/dymensionxyz/dymension/v3/x/iro/types"
+	"github.com/osmosis-labs/osmosis/v15/x/txfees"
 )
 
 // FIXME: test trade after settled
 
-// FIXME: test taker fee
+// FIXME: test taker fee (+low values should fail)
 
 // FIXME: add sell test
 
@@ -30,19 +32,16 @@ func (s *KeeperTestSuite) TestBuy() {
 	rollapp, _ := s.App.RollappKeeper.GetRollapp(s.Ctx, rollappId)
 	planId, err := k.CreatePlan(s.Ctx, totalAllocation, startTime, startTime.Add(time.Hour), rollapp, curve, incentives)
 	s.Require().NoError(err)
+	s.Ctx = s.Ctx.WithBlockTime(startTime.Add(time.Minute))
 
 	buyer := sample.Acc()
 	buyersFunds := sdk.NewCoins(sdk.NewCoin("adym", sdk.NewInt(100_000)))
 	s.FundAcc(buyer, buyersFunds)
 
 	// buy before plan start - should fail
-	s.Ctx = s.Ctx.WithBlockTime(startTime.Add(-time.Minute))
-	err = k.Buy(s.Ctx, planId, buyer, sdk.NewInt(1_000), maxAmt)
+	err = k.Buy(s.Ctx.WithBlockTime(startTime.Add(-time.Minute)), planId, buyer, sdk.NewInt(1_000), maxAmt)
 	s.Require().Error(err)
 
-	// plan start
-	s.Ctx = s.Ctx.WithBlockTime(startTime.Add(time.Minute))
-
 	// cost is higher than maxCost specified - should fail
 	err = k.Buy(s.Ctx, planId, buyer, sdk.NewInt(1_000), sdk.NewInt(10))
 	s.Require().Error(err)
@@ -51,11 +50,14 @@ func (s *KeeperTestSuite) TestBuy() {
 	err = k.Buy(s.Ctx, planId, buyer, sdk.NewInt(900_000), maxAmt)
 	s.Require().Error(err)
 
-	// successful buy
+	// assert nothing sold
 	plan, _ := k.GetPlan(s.Ctx, planId)
 	s.Assert().Equal(sdk.NewInt(0), plan.SoldAmt)
+	buyerBalance := s.App.BankKeeper.GetAllBalances(s.Ctx, buyer).AmountOf("adym")
+	s.Assert().Equal(buyersFunds.AmountOf("adym"), buyerBalance)
 
-	amountTokensToBuy := sdk.NewInt(100)
+	// successful buy
+	amountTokensToBuy := sdk.NewInt(1_000)
 	expectedCost := curve.Cost(plan.SoldAmt, plan.SoldAmt.Add(amountTokensToBuy))
 	err = k.Buy(s.Ctx, planId, buyer, amountTokensToBuy, maxAmt)
 	s.Require().NoError(err)
@@ -74,7 +76,9 @@ func (s *KeeperTestSuite) TestBuy() {
 
 	// assert balance
 	balances := s.App.BankKeeper.GetAllBalances(s.Ctx, buyer)
-	s.Require().Equal(buyersFunds.AmountOf("adym").Sub(expectedCost).Sub(expectedCost2), balances.AmountOf("adym"))
+	takerFee := s.App.BankKeeper.GetAllBalances(s.Ctx, authtypes.NewModuleAddress(txfees.ModuleName))
+	expectedBalance := buyersFunds.AmountOf("adym").Sub(expectedCost).Sub(expectedCost2).Sub(takerFee.AmountOf("adym"))
+	s.Require().Equal(expectedBalance, balances.AmountOf("adym"))
 
 	expectedBaseDenom := fmt.Sprintf("%s_%s", types.IROTokenPrefix, rollappId)
 	s.Require().Equal(amountTokensToBuy.MulRaw(2), balances.AmountOf(expectedBaseDenom))

x/rollapp/transfergenesis/ibc_module.go

@@ -48,6 +48,7 @@ type TransferKeeper interface {
 }
 
 type IROKeeper interface {
+	MustGetPlanByRollapp(ctx sdk.Context, rollappID string) irotypes.Plan
 	GetPlanByRollapp(ctx sdk.Context, rollappID string) (irotypes.Plan, bool)
 	GetModuleAccountAddress() string
 }
@@ -164,7 +165,8 @@ func (w IBCModule) OnRecvPacket(
 	}
 
 	// handle genesis transfer by the IRO keeper
-	plan, _ := w.iroKeeper.GetPlanByRollapp(ctx, ra.RollappId)
+	plan := w.iroKeeper.MustGetPlanByRollapp(ctx, ra.RollappId)
+
 	// validate the transfer against the IRO plan
 	err = w.validateGenesisTransfer(plan, transfer, memo.Denom)
 	if err != nil {
@@ -182,11 +184,14 @@ func (w IBCModule) OnRecvPacket(
 	ack = w.IBCModule.OnRecvPacket(commontypes.SkipRollappMiddlewareContext(ctx), packet, relayer)
 	// if the ack is nil, we return an error as we expect immediate ack
 	if ack == nil {
+		l.Error("Expected immediate ack for genesis transfer.")
 		return channeltypes.NewErrorAcknowledgement(errorsmod.Wrap(gerrc.ErrInternal, "transfer genesis: OnRecvPacket"))
 	}
-	l.Info("Received valid genesis transfer. Registered denom data.")
-
-	w.EnableTransfers(ctx, ra.RollappId, transfer.Denom)
+	err = w.EnableTransfers(ctx, ra.RollappId, transfer.Denom)
+	if err != nil {
+		l.Error("Enable transfers.", "err", err)
+		return channeltypes.NewErrorAcknowledgement(errorsmod.Wrap(err, "transfer genesis: enable transfers"))
+	}
 	return ack
 }