diff --git a/x/liquidity/keeper/liquidity_pool.go b/x/liquidity/keeper/liquidity_pool.go index 205b843aa..4e9b09874 100644 --- a/x/liquidity/keeper/liquidity_pool.go +++ b/x/liquidity/keeper/liquidity_pool.go @@ -147,7 +147,7 @@ func (k Keeper) CreatePool(ctx sdk.Context, msg *types.MsgCreatePool) (types.Poo k.SetPoolBatch(ctx, batch) reserveCoins := k.GetReserveCoins(ctx, pool) - lastReserveRatio := sdk.NewDecFromInt(reserveCoins[0].Amount).QuoTruncate(sdk.NewDecFromInt(reserveCoins[1].Amount)) + lastReserveRatio := sdk.NewDecFromInt(reserveCoins[0].Amount).Quo(sdk.NewDecFromInt(reserveCoins[1].Amount)) logger := k.Logger(ctx) logger.Debug( "create liquidity pool", @@ -196,7 +196,6 @@ func (k Keeper) DepositLiquidityPool(ctx sdk.Context, msg types.DepositMsgState, return types.ErrLessThanMinInitDeposit } } - poolCoin, err := k.MintAndSendPoolCoin(ctx, pool, batchEscrowAcc, depositor, msg.Msg.DepositCoins) if err != nil { return err @@ -210,7 +209,7 @@ func (k Keeper) DepositLiquidityPool(ctx sdk.Context, msg types.DepositMsgState, reserveCoins = k.GetReserveCoins(ctx, pool) lastReserveCoinA := sdk.NewDecFromInt(reserveCoins[0].Amount) lastReserveCoinB := sdk.NewDecFromInt(reserveCoins[1].Amount) - lastReserveRatio := lastReserveCoinA.QuoTruncate(lastReserveCoinB) + lastReserveRatio := lastReserveCoinA.Quo(lastReserveCoinB) ctx.EventManager().EmitEvent( sdk.NewEvent( types.EventTypeDepositToPool, @@ -247,13 +246,13 @@ func (k Keeper) DepositLiquidityPool(ctx sdk.Context, msg types.DepositMsgState, // Decimal Error, divide the Int coin amount by the Decimal Rate and erase the decimal point to deposit a lower value lastReserveCoinA := reserveCoins[0].Amount lastReserveCoinB := reserveCoins[1].Amount - lastReserveRatio := lastReserveCoinA.ToDec().QuoTruncate(lastReserveCoinB.ToDec()) + lastReserveRatio := lastReserveCoinA.ToDec().Quo(lastReserveCoinB.ToDec()) depositCoinA := depositCoins[0] depositCoinB := depositCoins[1] depositCoinAmountA := depositCoinA.Amount depositCoinAmountB := depositCoinB.Amount - depositableCoinAmountA := depositCoinB.Amount.ToDec().MulTruncate(lastReserveRatio).TruncateInt() + depositableCoinAmountA := depositCoinB.Amount.ToDec().Mul(lastReserveRatio).TruncateInt() refundedCoins := sdk.NewCoins() refundedCoinA := sdk.ZeroInt() @@ -262,7 +261,7 @@ func (k Keeper) DepositLiquidityPool(ctx sdk.Context, msg types.DepositMsgState, var acceptedCoins sdk.Coins // handle when depositing coin A amount is less than, greater than or equal to depositable amount if depositCoinA.Amount.LT(depositableCoinAmountA) { - depositCoinAmountB = depositCoinA.Amount.ToDec().QuoTruncate(lastReserveRatio).TruncateInt() + depositCoinAmountB = depositCoinA.Amount.ToDec().Quo(lastReserveRatio).TruncateInt() acceptedCoins = sdk.NewCoins(depositCoinA, sdk.NewCoin(depositCoinB.Denom, depositCoinAmountB)) inputs = append(inputs, banktypes.NewInput(batchEscrowAcc, acceptedCoins)) @@ -276,7 +275,7 @@ func (k Keeper) DepositLiquidityPool(ctx sdk.Context, msg types.DepositMsgState, outputs = append(outputs, banktypes.NewOutput(depositor, refundedCoins)) } } else if depositCoinA.Amount.GT(depositableCoinAmountA) { - depositCoinAmountA = depositCoinB.Amount.ToDec().MulTruncate(lastReserveRatio).TruncateInt() + depositCoinAmountA = depositCoinB.Amount.ToDec().Mul(lastReserveRatio).TruncateInt() acceptedCoins = sdk.NewCoins(depositCoinB, sdk.NewCoin(depositCoinA.Denom, depositCoinAmountA)) inputs = append(inputs, banktypes.NewInput(batchEscrowAcc, acceptedCoins)) @@ -298,8 +297,8 @@ func (k Keeper) DepositLiquidityPool(ctx sdk.Context, msg types.DepositMsgState, // calculate pool token mint amount poolCoinTotalSupply := k.GetPoolCoinTotalSupply(ctx, pool) poolCoinAmt := sdk.MinInt( - poolCoinTotalSupply.ToDec().Mul(depositCoinAmountA.ToDec()).Quo(reserveCoins[0].Amount.ToDec()).TruncateInt(), - poolCoinTotalSupply.ToDec().Mul(depositCoinAmountB.ToDec()).Quo(reserveCoins[1].Amount.ToDec()).TruncateInt()) + poolCoinTotalSupply.ToDec().MulTruncate(depositCoinAmountA.ToDec()).QuoTruncate(reserveCoins[0].Amount.ToDec()).TruncateInt(), + poolCoinTotalSupply.ToDec().MulTruncate(depositCoinAmountB.ToDec()).QuoTruncate(reserveCoins[1].Amount.ToDec()).TruncateInt()) mintPoolCoin := sdk.NewCoin(pool.PoolCoinDenom, poolCoinAmt) mintPoolCoins := sdk.NewCoins(mintPoolCoin) @@ -347,7 +346,7 @@ func (k Keeper) DepositLiquidityPool(ctx sdk.Context, msg types.DepositMsgState, ) reserveCoins = k.GetReserveCoins(ctx, pool) - lastReserveRatio = sdk.NewDecFromInt(reserveCoins[0].Amount).QuoTruncate(sdk.NewDecFromInt(reserveCoins[1].Amount)) + lastReserveRatio = sdk.NewDecFromInt(reserveCoins[0].Amount).Quo(sdk.NewDecFromInt(reserveCoins[1].Amount)) logger := k.Logger(ctx) logger.Debug( @@ -475,7 +474,7 @@ func (k Keeper) WithdrawLiquidityPool(ctx sdk.Context, msg types.WithdrawMsgStat if reserveCoins.IsZero() { lastReserveRatio = sdk.ZeroDec() } else { - lastReserveRatio = sdk.NewDecFromInt(reserveCoins[0].Amount).QuoTruncate(sdk.NewDecFromInt(reserveCoins[1].Amount)) + lastReserveRatio = sdk.NewDecFromInt(reserveCoins[0].Amount).Quo(sdk.NewDecFromInt(reserveCoins[1].Amount)) } logger := k.Logger(ctx)