Conversation
Joeysantoro
commented
Mar 2, 2021
Comment on lines
130
to
145
| function _getReserves() | ||
| internal | ||
| view | ||
| returns ( | ||
| uint256 reservesETH, | ||
| uint256 reservesOther, | ||
| bool isETH0 | ||
| ) | ||
| { | ||
| (uint256 reserves0, uint256 reserves1, ) = PAIR.getReserves(); | ||
| isETH0 = PAIR.token0() == address(WETH); | ||
| return | ||
| isETH0 | ||
| ? (reserves0, reserves1, isETH0) | ||
| : (reserves1, reserves0, isETH0); | ||
| } |
Contributor
Author
There was a problem hiding this comment.
copied from UniswapSingleEthRouter
Joeysantoro
commented
Mar 2, 2021
Comment on lines
-70
to
-71
| function incentiveContract() public view override returns(IUniswapIncentive) { | ||
| return IUniswapIncentive(CORE.fei().incentiveContract(address(PAIR))); |
Contributor
Author
There was a problem hiding this comment.
no longer needed because call is removed
Joeysantoro
commented
Mar 2, 2021
Comment on lines
109
to
127
| amountOut = UniswapV2Library.getAmountOut( | ||
| effectiveAmountIn, | ||
| reservesOther, | ||
| reservesETH | ||
| ); | ||
| require( | ||
| amountOut >= amountOutMin, | ||
| "FeiRouter: Insufficient output amount" | ||
| ); | ||
|
|
||
| (uint256 amount0Out, uint256 amount1Out) = | ||
| isETH0 ? (amountOut, uint256(0)) : (uint256(0), amountOut); | ||
|
|
||
| PAIR.swap(amount0Out, amount1Out, address(this), new bytes(0)); | ||
|
|
||
| IWETH(WETH).withdraw(amountOut); | ||
|
|
||
| TransferHelper.safeTransferETH(to, amountOut); | ||
| return amountOut; |
Contributor
Author
There was a problem hiding this comment.
copied from UniswapSingleEthRouter
Comment on lines
+104
to
107
| if (effectiveAmountIn < amountIn) { | ||
| uint256 penalty = amountIn - effectiveAmountIn; | ||
| require(penalty <= maxPenalty, "FeiRouter: Penalty too high"); | ||
| } |
Contributor
Author
There was a problem hiding this comment.
new penalty calculation
contracts/router/FeiRouter.sol
Outdated
Comment on lines
95
to
102
| (uint256 reservesETH, uint256 reservesOther, bool isETH0) = | ||
| _getReserves(); | ||
|
|
||
| address fei = isETH0 ? PAIR.token1() : PAIR.token0(); | ||
|
|
||
| IERC20(fei).transferFrom(msg.sender, address(PAIR), amountIn); | ||
|
|
||
| uint256 effectiveAmountIn = IERC20(fei).balanceOf(address(PAIR)).sub(reservesOther); |
Contributor
Author
There was a problem hiding this comment.
copied from UniswapSingleEthRouter with a variable rename
contracts/router/FeiRouter.sol
Outdated
Comment on lines
52
to
68
| (uint256 reservesETH, uint256 reservesOther, bool isETH0) = _getReserves(); | ||
|
|
||
| uint256 amountIn = msg.value; | ||
| amountOut = UniswapV2Library.getAmountOut( | ||
| amountIn, | ||
| reservesETH, | ||
| reservesOther | ||
| ); | ||
|
|
||
| require( | ||
| amountOut >= amountOutMin, | ||
| "FeiRouter: Insufficient output amount" | ||
| ); | ||
| IWETH(WETH).deposit{value: amountIn}(); | ||
| assert(IWETH(WETH).transfer(address(PAIR), amountIn)); | ||
|
|
||
| address fei = isETH0 ? PAIR.token1() : PAIR.token0(); |
Contributor
Author
There was a problem hiding this comment.
copied from UniswapSingleEthRouter
| assert(IWETH(WETH).transfer(address(PAIR), amountIn)); | ||
|
|
||
| address fei = isETH0 ? PAIR.token1() : PAIR.token0(); | ||
| uint256 feiBalanceBefore = IERC20(fei).balanceOf(to); |
Contributor
Author
There was a problem hiding this comment.
check before balance for implied bonus comparison
Comment on lines
+75
to
+76
| uint256 feiBalanceAfter = IERC20(fei).balanceOf(to); | ||
| uint256 reward = feiBalanceAfter.sub(feiBalanceBefore).sub(amountOut); |
Contributor
Author
There was a problem hiding this comment.
Difference should be the reward
Comment on lines
+30
to
38
| modifier ensure(uint256 deadline) { | ||
| // solhint-disable-next-line not-rely-on-time | ||
| require(deadline >= block.timestamp, "FeiRouter: Expired"); | ||
| _; | ||
| } | ||
|
|
||
| receive() external payable { | ||
| assert(msg.sender == address(WETH)); // only accept ETH via fallback from the WETH contract | ||
| } |
Contributor
Author
There was a problem hiding this comment.
copied from UniswapSingleEthRouter
sebastiandelgado
approved these changes
Mar 2, 2021
contracts/router/FeiRouter.sol
Outdated
| IWETH(WETH).deposit{value: amountIn}(); | ||
| assert(IWETH(WETH).transfer(address(PAIR), amountIn)); | ||
|
|
||
| address fei = isETH0 ? PAIR.token1() : PAIR.token0(); |
There was a problem hiding this comment.
Great place to add comments about what is going on here. Code is clear enough given context, but we'll be glad to have them later
added 2 commits
March 1, 2021 20:44
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 join this conversation on GitHub.
Already have an account?
Sign in to comment
2 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.
Instead of double calculating the oracle update and incentives, infer the burn and mint via the token balances