This repository was archived by the owner on Feb 2, 2024. It is now read-only.
Merged
Conversation
Context: In the beginning, there was no `executedSellAmountBeforeFees` field, and to figure out how much was sold without the fees, we had to subtract `executedFeeAmount` from `executedSellAmount`. Backend added `executedSellAmountBeforeFees` not long after, but it was never updated. Now that the fee can come from more sources, it's causing confusion. Let's then use the field that's intended for that.
|
alfetopito
commented
Dec 28, 2022
Comment on lines
-66
to
-69
| executedBuyAmount?: BigNumber | ||
| sellAmount: BigNumber | ||
| executedSellAmount?: BigNumber | ||
| executedFeeAmount?: BigNumber |
Collaborator
Author
There was a problem hiding this comment.
This was never necessary as they don't exist in the original Trade coming from the API and have equivalent non executed counterparts.
Comment on lines
-173
to
+177
| * Mostly because `executedSellAmount` is derived from 2 fields (at time or writing) | ||
| * Mostly because `executedSellAmount` (with fees deducted) is named `executedSellAmountBeforeFees` | ||
| * | ||
| * @param order The order | ||
| */ | ||
| export function getOrderExecutedAmounts( | ||
| order: Pick<RawOrder, 'executedBuyAmount' | 'executedSellAmount' | 'executedFeeAmount' | 'executedSurplusFee'>, | ||
| ): { | ||
| export function getOrderExecutedAmounts(order: Pick<RawOrder, 'executedBuyAmount' | 'executedSellAmountBeforeFees'>): { |
Collaborator
Author
There was a problem hiding this comment.
Updated fn signature only with needed params and also updated the docstring
elena-zh
approved these changes
Dec 28, 2022
anxolin
approved these changes
Jan 3, 2023
This file contains hidden or 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
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
3 participants
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.
Summary
Fix for RELEASE!! But it's a single PR so it can be squashed
Fixing unit tests and a bit of logic that was causing confusion
To Test
Should behave the same as #269