stableswap: Add check for correct input asset denoms to implementatio…

…n of JoinPool (#2301) * ensure that assets in pool not change after joining * check joining assets already exist in pool * format * refactor panic
osmosis-labs · Aug 4, 2022 · fd23552 · fd23552
1 parent 4c990f5
commit fd23552
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/x/gamm/pool-models/stableswap/amm.go b/x/gamm/pool-models/stableswap/amm.go
@@ -379,7 +379,7 @@ func (p *Pool) joinPoolSharesInternal(ctx sdk.Context, tokensIn sdk.Coins, swapF
 		numShares, err = p.calcSingleAssetJoinShares(tokensIn[0], swapFee)
 		newLiquidity = tokensIn
 		return numShares, newLiquidity, err
-	} else if len(tokensIn) != p.NumAssets() {
+	} else if len(tokensIn) != p.NumAssets() || !tokensIn.DenomsSubsetOf(p.GetTotalPoolLiquidity(ctx)) {
 		return sdk.ZeroInt(), sdk.NewCoins(), errors.New(
 			"stableswap pool only supports LP'ing with one asset, or all assets in pool")
 	}

diff --git a/x/gamm/pool-models/stableswap/pool.go b/x/gamm/pool-models/stableswap/pool.go
@@ -161,7 +161,11 @@ func (p *Pool) updatePoolLiquidityForExit(tokensOut sdk.Coins) {
 }
 
 func (p *Pool) updatePoolForJoin(tokensIn sdk.Coins, newShares sdk.Int) {
+	numTokens := p.NumAssets()
 	p.PoolLiquidity = p.PoolLiquidity.Add(tokensIn...)
+	if len(p.PoolLiquidity) != numTokens {
+		panic(fmt.Sprintf("updatePoolForJoin changed number of tokens in pool from %d to %d", numTokens, len(p.PoolLiquidity)))
+	}
 	p.TotalShares.Amount = p.TotalShares.Amount.Add(newShares)
 }