Fix: FI swap correclty with asymmetric ratios #1746
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
lemunozm
added
I2-bug
wischli
reviewed
Feb 28, 2024
Comment on lines
+1115
to
+1122
| util::fulfill_last_swap(Action::Investment, foreign_to_pool(3 * AMOUNT / 4)); | ||
|
|
||
| assert_eq!( | ||
| ForeignInvestmentInfo::<Runtime>::get(&USER, INVESTMENT_ID), | ||
| None, | ||
| ); | ||
| assert_eq!(ForeignInvestment::investment(&USER, INVESTMENT_ID), Ok(0)); | ||
| assert_eq!(MockInvestment::investment(&USER, INVESTMENT_ID), Ok(0)); |
There was a problem hiding this comment.
Why does the foreign investment vanish when we fulfill only 3/4 of the order? Shouldn't there be 1/4 left?
There was a problem hiding this comment.
Note that we only fulfill the swap with the amount that was previously swapped in the opposite direction, which is 3/4. The 1/4 left has never been swapped, so when we decrease, such 1/4 is canceled.
There was a problem hiding this comment.
Ah yes of course, thanks for the explanation!
Comment on lines
+1170
to
+1180
| util::fulfill_last_swap( | ||
| Action::Investment, | ||
| foreign_to_pool(3 * AMOUNT / 4) * MULTIPLIER, | ||
| ); | ||
|
|
||
| assert_eq!( | ||
| ForeignInvestmentInfo::<Runtime>::get(&USER, INVESTMENT_ID), | ||
| None, | ||
| ); | ||
| assert_eq!(ForeignInvestment::investment(&USER, INVESTMENT_ID), Ok(0)); | ||
| assert_eq!(MockInvestment::investment(&USER, INVESTMENT_ID), Ok(0)); |
There was a problem hiding this comment.
The same applies here
wischli
approved these changes
Feb 28, 2024
wischli
pushed a commit
that referenced
this pull request
Feb 29, 2024
* fix by cancellation * noop if currencies are different * fix typos
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Description
The issue is described in this thread
How it works
Now
pallet-swapsoffer a new methodcancel_swap()which allows to cancel partially a pending amount. This way, we can cancel an inverse swap (in its currency out denomination) before applying the new swap (in the other currency denomination). Saving us from usingconvert_by_market()in the opposite direction.