From e2b713ce2ae6af8c9ad75a17426d7363e8ab37b4 Mon Sep 17 00:00:00 2001 From: Roman Date: Tue, 31 Oct 2023 12:31:56 -0400 Subject: [PATCH 1/3] fix: improve error message for slippage bound when LPing (#6788) * fix: improve error message for slippage bound when LPing * updates * changelog (cherry picked from commit e7517c2ce4da2eb1f1932beed52d4c6e5be4043d) # Conflicts: # CHANGELOG.md --- CHANGELOG.md | 13 +++++++++++++ x/concentrated-liquidity/types/errors.go | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 185abecaf7c..aa0bb7abc86 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -42,6 +42,19 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## Unreleased +<<<<<<< HEAD +======= +### State Breaks + +* [#6758](https://github.com/osmosis-labs/osmosis/pull/6758) Add codec for MsgUndelegateFromRebalancedValidatorSet + +### Misc Improvements + +* [#6788](https://github.com/osmosis-labs/osmosis/pull/6788) Improve error message when CL LP fails due to slippage bound hit. + +## v20.0.0 + +>>>>>>> e7517c2c (fix: improve error message for slippage bound when LPing (#6788)) ### Features * [#6468](https://github.com/osmosis-labs/osmosis/pull/6468) feat: remove osmo multihop discount diff --git a/x/concentrated-liquidity/types/errors.go b/x/concentrated-liquidity/types/errors.go index 440c73beff4..4828d40ccd0 100644 --- a/x/concentrated-liquidity/types/errors.go +++ b/x/concentrated-liquidity/types/errors.go @@ -136,7 +136,7 @@ func (e InsufficientLiquidityCreatedError) Error() string { if !e.IsTokenZero { tokenNum = 1 } - return fmt.Sprintf("insufficient amount of token %d created. Actual: (%s). Minimum (%s)", tokenNum, e.Actual, e.Minimum) + return fmt.Sprintf("slippage bound: insufficient amount of token %d created. Actual: (%s). Minimum estimated: (%s)", tokenNum, e.Actual, e.Minimum) } type NegativeLiquidityError struct { From ba3c4cd0f7c44644730a920361ddf20b2f49c8b2 Mon Sep 17 00:00:00 2001 From: Roman Date: Tue, 31 Oct 2023 12:35:42 -0400 Subject: [PATCH 2/3] Update CHANGELOG.md --- CHANGELOG.md | 6 ------ 1 file changed, 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index aa0bb7abc86..85a07b539b3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -42,12 +42,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## Unreleased -<<<<<<< HEAD -======= -### State Breaks - -* [#6758](https://github.com/osmosis-labs/osmosis/pull/6758) Add codec for MsgUndelegateFromRebalancedValidatorSet - ### Misc Improvements * [#6788](https://github.com/osmosis-labs/osmosis/pull/6788) Improve error message when CL LP fails due to slippage bound hit. From 5816dcf2b6683e97b02ce23cff424e172f9c56e1 Mon Sep 17 00:00:00 2001 From: Roman Date: Tue, 31 Oct 2023 12:35:54 -0400 Subject: [PATCH 3/3] Update CHANGELOG.md --- CHANGELOG.md | 1 - 1 file changed, 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 85a07b539b3..0611255c383 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -48,7 +48,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## v20.0.0 ->>>>>>> e7517c2c (fix: improve error message for slippage bound when LPing (#6788)) ### Features * [#6468](https://github.com/osmosis-labs/osmosis/pull/6468) feat: remove osmo multihop discount