Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix addLiquidity panic error #314

Merged
merged 2 commits into from
Sep 23, 2022
Merged

fix addLiquidity panic error #314

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
25735bc
fix addLiquidity panic error
Sep 23, 2022
5017d65
add changelog
Sep 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,16 +38,20 @@ Ref: https://keepachangelog.com/en/1.0.0/
## [Unreleased]

### Bug Fixes

* [\#304](https://github.com/irisnet/irismod/pull/304) Fix nft module import error.
* [\#314](https://github.com/irisnet/irismod/pull/314) Fix `addLiquidity` panic error.

### Improvements

* [\#305](https://github.com/irisnet/irismod/pull/305) Remove ibc-go from project.
* [\#306](https://github.com/irisnet/irismod/pull/306) Bump up cosmos-sdk to v0.46.1.
* [\#307](https://github.com/irisnet/irismod/pull/307) Refactor proto-gen with docker.
* [\#308](https://github.com/irisnet/irismod/pull/308) Coinswap module adds unilateral injection liquidity function.
* [\#309](https://github.com/irisnet/irismod/pull/309) Refactor nft with cosmos-sdk nft module.

### API Breaking Changes

* [\#309](https://github.com/irisnet/irismod/pull/309) GRPC method `Owner` rename to `NFTsOfOwner`, Remove deprecated `Queries` api

## [v1.6.0] - 2022-08-08
Expand Down
101 changes: 62 additions & 39 deletions modules/coinswap/keeper/keeper.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,17 +110,20 @@ func (k Keeper) AddLiquidity(ctx sdk.Context, msg *types.MsgAddLiquidity) (sdk.C
return sdk.Coin{}, sdkerrors.Wrapf(types.ErrInvalidDenom,
"MaxToken: %s should not be StandardDenom", msg.MaxToken.String())
}
var mintLiquidityAmt sdkmath.Int
var depositToken sdk.Coin
var standardCoin = sdk.NewCoin(standardDenom, msg.ExactStandardAmt)

var (
mintLiquidityAmt sdkmath.Int
depositToken sdk.Coin
standardCoin = sdk.NewCoin(standardDenom, msg.ExactStandardAmt)
)

sender, err := sdk.AccAddressFromBech32(msg.Sender)
if err != nil {
return sdk.Coin{}, err
}

poolId := types.GetPoolId(msg.MaxToken.Denom)
pool, exists := k.GetPool(ctx, poolId)
poolID := types.GetPoolId(msg.MaxToken.Denom)
pool, exists := k.GetPool(ctx, poolID)

// calculate amount of UNI to be minted for sender
// and coin amount to be deposited
Expand All @@ -136,50 +139,59 @@ func (k Keeper) AddLiquidity(ctx sdk.Context, msg *types.MsgAddLiquidity) (sdk.C
}
depositToken = sdk.NewCoin(msg.MaxToken.Denom, msg.MaxToken.Amount)
pool = k.CreatePool(ctx, msg.MaxToken.Denom)
} else {
balances, err := k.GetPoolBalances(ctx, pool.EscrowAddress)
if err != nil {
return sdk.Coin{}, err
}
return k.addLiquidity(ctx, sender, pool.EscrowAddress, standardCoin, depositToken, pool.LptDenom, mintLiquidityAmt)
}

standardReserveAmt := balances.AmountOf(standardDenom)
tokenReserveAmt := balances.AmountOf(msg.MaxToken.Denom)
liquidity := k.bk.GetSupply(ctx, pool.LptDenom).Amount
balances, err := k.GetPoolBalances(ctx, pool.EscrowAddress)
if err != nil {
return sdk.Coin{}, err
}

mintLiquidityAmt = (liquidity.Mul(msg.ExactStandardAmt)).Quo(standardReserveAmt)
//pool exist but has no balances,so do same operations as firist addLiquidity(but without creating pool)
if balances == nil || balances.IsZero() {
mintLiquidityAmt = msg.ExactStandardAmt
if mintLiquidityAmt.LT(msg.MinLiquidity) {
return sdk.Coin{}, sdkerrors.Wrapf(types.ErrConstraintNotMet, "liquidity amount not met, user expected: no less than %s, actual: %s", msg.MinLiquidity.String(), mintLiquidityAmt.String())
}
depositAmt := (tokenReserveAmt.Mul(msg.ExactStandardAmt)).Quo(standardReserveAmt).AddRaw(1)
depositToken = sdk.NewCoin(msg.MaxToken.Denom, depositAmt)
depositToken = sdk.NewCoin(msg.MaxToken.Denom, msg.MaxToken.Amount)
return k.addLiquidity(ctx, sender, pool.EscrowAddress, standardCoin, depositToken, pool.LptDenom, mintLiquidityAmt)
}

if depositAmt.GT(msg.MaxToken.Amount) {
return sdk.Coin{}, sdkerrors.Wrapf(types.ErrConstraintNotMet, "token amount not met, user expected: no more than %s, actual: %s", msg.MaxToken.String(), depositToken.String())
}
// add liquidity
standardReserveAmt := balances.AmountOf(standardDenom)
tokenReserveAmt := balances.AmountOf(msg.MaxToken.Denom)
liquidity := k.bk.GetSupply(ctx, pool.LptDenom).Amount
if standardReserveAmt.IsZero() || tokenReserveAmt.IsZero() || liquidity.IsZero() {
return sdk.Coin{},
sdkerrors.Wrapf(types.ErrConstraintNotMet, "liquidity pool invalid")
}

reservePoolAddress, err := sdk.AccAddressFromBech32(pool.EscrowAddress)
if err != nil {
return sdk.Coin{}, err
mintLiquidityAmt = (liquidity.Mul(msg.ExactStandardAmt)).Quo(standardReserveAmt)
if mintLiquidityAmt.LT(msg.MinLiquidity) {
return sdk.Coin{}, sdkerrors.Wrapf(types.ErrConstraintNotMet, "liquidity amount not met, user expected: no less than %s, actual: %s", msg.MinLiquidity.String(), mintLiquidityAmt.String())
}
depositAmt := (tokenReserveAmt.Mul(msg.ExactStandardAmt)).Quo(standardReserveAmt).AddRaw(1)
depositToken = sdk.NewCoin(msg.MaxToken.Denom, depositAmt)

ctx.EventManager().EmitEvent(
sdk.NewEvent(
types.EventTypeAddLiquidity,
sdk.NewAttribute(types.AttributeValueSender, msg.Sender),
sdk.NewAttribute(types.AttributeValueTokenPair, types.GetTokenPairByDenom(msg.MaxToken.Denom, standardDenom)),
),
)
return k.addLiquidity(ctx, sender, reservePoolAddress, standardCoin, depositToken, pool.LptDenom, mintLiquidityAmt)
if depositAmt.GT(msg.MaxToken.Amount) {
return sdk.Coin{},
sdkerrors.Wrapf(types.ErrConstraintNotMet, "token amount not met, user expected: no more than %s, actual: %s", msg.MaxToken.String(), depositToken.String())
}
return k.addLiquidity(ctx, sender, pool.EscrowAddress, standardCoin, depositToken, pool.LptDenom, mintLiquidityAmt)
}

func (k Keeper) addLiquidity(ctx sdk.Context,
sender sdk.AccAddress,
reservePoolAddress sdk.AccAddress,
poolAddress string,
standardCoin, token sdk.Coin,
lptDenom string,
mintLiquidityAmt sdkmath.Int,
) (sdk.Coin, error) {
reservePoolAddress, err := sdk.AccAddressFromBech32(poolAddress)
if err != nil {
return sdk.Coin{}, err
}

depositedTokens := sdk.NewCoins(standardCoin, token)
// transfer deposited token into coinswaps Account
if err := k.bk.SendCoins(ctx, sender, reservePoolAddress, depositedTokens); err != nil {
Expand All @@ -195,6 +207,13 @@ func (k Keeper) addLiquidity(ctx sdk.Context,
return sdk.Coin{}, err
}

ctx.EventManager().EmitEvent(
sdk.NewEvent(
types.EventTypeAddLiquidity,
sdk.NewAttribute(types.AttributeValueSender, sender.String()),
sdk.NewAttribute(types.AttributeValueTokenPair, types.GetTokenPairByDenom(token.Denom, standardCoin.Denom)),
),
)
return mintToken, nil
}

Expand All @@ -205,10 +224,10 @@ func (k Keeper) AddUnilateralLiquidity(ctx sdk.Context, msg *types.MsgAddUnilate
return sdk.Coin{}, err
}

poolId := types.GetPoolId(msg.CounterpartyDenom)
pool, exist := k.GetPool(ctx, poolId)
poolID := types.GetPoolId(msg.CounterpartyDenom)
pool, exist := k.GetPool(ctx, poolID)
if !exist {
return sdk.Coin{}, sdkerrors.Wrapf(types.ErrReservePoolNotExists, "liquidity pool: %s ", poolId)
return sdk.Coin{}, sdkerrors.Wrapf(types.ErrReservePoolNotExists, "liquidity pool: %s ", poolID)
}

poolAddr, err := sdk.AccAddressFromBech32(pool.EscrowAddress)
Expand All @@ -222,7 +241,11 @@ func (k Keeper) AddUnilateralLiquidity(ctx sdk.Context, msg *types.MsgAddUnilate
}

if msg.ExactToken.Denom != msg.CounterpartyDenom && msg.ExactToken.Denom != k.GetStandardDenom(ctx) {
return sdk.Coin{}, sdkerrors.Wrapf(types.ErrInvalidDenom, "liquidity pool %s has no %s", poolId, msg.ExactToken.Denom)
return sdk.Coin{}, sdkerrors.Wrapf(types.ErrInvalidDenom, "liquidity pool %s has no %s", poolID, msg.ExactToken.Denom)
}

if balances == nil || balances.IsZero() {
return sdk.Coin{}, sdkerrors.Wrapf(sdkerrors.ErrInvalidRequest, "When the liquidity is empty, can not add unilateral liquidity")
}

// square = ( token_balance + ( 1- fee_unilateral ) * exact_token ) / token_balance * lpt_balance^2
Expand Down Expand Up @@ -379,10 +402,10 @@ func (k Keeper) RemoveUnilateralLiquidity(ctx sdk.Context, msg *types.MsgRemoveU
return sdk.Coins{}, err
}

poolId := types.GetPoolId(msg.CounterpartyDenom)
pool, exist := k.GetPool(ctx, poolId)
poolID := types.GetPoolId(msg.CounterpartyDenom)
pool, exist := k.GetPool(ctx, poolID)
if !exist {
return sdk.Coins{}, sdkerrors.Wrapf(types.ErrReservePoolNotExists, "liquidity pool: %s ", poolId)
return sdk.Coins{}, sdkerrors.Wrapf(types.ErrReservePoolNotExists, "liquidity pool: %s ", poolID)
}

poolAddr, err := sdk.AccAddressFromBech32(pool.EscrowAddress)
Expand All @@ -397,7 +420,7 @@ func (k Keeper) RemoveUnilateralLiquidity(ctx sdk.Context, msg *types.MsgRemoveU

if msg.MinToken.Denom != msg.CounterpartyDenom && msg.MinToken.Denom != k.GetStandardDenom(ctx) {
return sdk.Coins{}, sdkerrors.Wrapf(types.ErrInvalidDenom,
"liquidity pool %s has no %s", poolId, msg.MinToken.Denom)
"liquidity pool %s has no %s", poolID, msg.MinToken.Denom)
}

lptDenom := pool.LptDenom
Expand Down