This repository has been archived by the owner on Apr 25, 2024. It is now read-only.
Receive an option to decide if we calculate FOT tax or not #146
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
tinaszheng
reviewed
Sep 29, 2023
| invariant(this.involvesToken(inputAmount.currency), 'TOKEN') | ||
| if (JSBI.equal(this.reserve0.quotient, ZERO) || JSBI.equal(this.reserve1.quotient, ZERO)) { | ||
| throw new InsufficientReservesError() | ||
| } | ||
| const inputReserve = this.reserveOf(inputAmount.currency) | ||
| const outputReserve = this.reserveOf(inputAmount.currency.equals(this.token0) ? this.token1 : this.token0) | ||
|
|
||
| const percentAfterSellFees = this.derivePercentAfterSellFees(inputAmount) | ||
| const percentAfterSellFees = calculateFotFees ? this.derivePercentAfterSellFees(inputAmount) : ZERO_PERCENT |
There was a problem hiding this comment.
hmm shouldnt this be 100% instead of 0? this refers to the % of inputAmount that goes into the v2 calculation right?
There was a problem hiding this comment.
The function we use to derive returns ZERO_PERCENT when there's no fee:
private derivePercentAfterSellFees(inputAmount: CurrencyAmount<Token>): Percent {
const sellFeeBips = inputAmount.currency.sellFeeBps
if (sellFeeBips?.gt(BigNumber.from(0))) {
return ONE_HUNDRED_PERCENT.subtract(new Percent(JSBI.BigInt(sellFeeBips)).divide(BASIS_POINTS))
} else {
return ZERO_PERCENT
}
}
private derivePercentAfterBuyFees(outputAmount: CurrencyAmount<Token>): Percent {
const buyFeeBps = outputAmount.currency.buyFeeBps
if (buyFeeBps?.gt(BigNumber.from(0))) {
return ONE_HUNDRED_PERCENT.subtract(new Percent(JSBI.BigInt(buyFeeBps)).divide(BASIS_POINTS))
} else {
return ZERO_PERCENT
}
}
so I think that's okay?
There was a problem hiding this comment.
It needs to be 0%. Although I think we can make it simpler by passing the calculateFotFees to derivePercentAfterBuyFees
jsy1218
reviewed
Sep 29, 2023
| calculateFotFees = true | ||
| }) | ||
|
|
||
| describe('getOutputAmount', () => { |
There was a problem hiding this comment.
I think we need two tests for getOutputAmount and two tests for getInputAmount, making it a total of 4.
There was a problem hiding this comment.
I think I have the 4 tests
jsy1218
approved these changes
Sep 29, 2023
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Option to decide if we should calculate FOT tax
We are calculating FOT tax by default, but it's possible that we don't want to do that all the time.
This branch adds a flag (defaulting to false) to indicate if we should run this calculation