Safe Math #37
Merged
Safe Math #37
+87
−60
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
Joeysantoro
commented
Feb 6, 2021
| @@ -49,13 +51,13 @@ contract UniswapOracle is IUniswapOracle, CoreRef { | |||
| (uint price0Cumulative, uint price1Cumulative, uint32 currentTimestamp) = | |||
| UniswapV2OracleLibrary.currentCumulativePrices(address(pair)); | |||
|
|
|||
| uint32 deltaTimestamp = currentTimestamp - priorTimestamp; | |||
| if(currentTimestamp <= priorTimestamp || deltaTimestamp < duration) { | |||
| uint32 deltaTimestamp = currentTimestamp - priorTimestamp; // allowing underflow per Uniswap Oracle spec | |||
| @@ -69,15 +69,15 @@ interface IPool { | |||
|
|
|||
| /// @notice the total amount of rewards previously claimed | |||
| /// @return the total | |||
| function claimedRewards() external view returns(uint128); | |||
|
|
||
| /// @notice the ERC20 staked token | ||
| /// @return the IERC20 implementation address | ||
| function stakedToken() external view returns(IERC20); | ||
|
|
||
| /// @notice the total amount of staked tokens in the contract | ||
| /// @return the total | ||
| function totalStaked() external view returns(uint128); |
| @@ -183,7 +187,7 @@ abstract contract UniRef is IUniRef, OracleRef { | |||
| if (price.lessThanOrEqualTo(peg)) { | |||
| return Decimal.zero(); | |||
| } | |||
| Decimal.D256 memory delta = price.sub(peg, "UniRef: price exceeds peg"); // Should never error | |||
| Decimal.D256 memory delta = price.sub(peg, "Impossible underflow"); | |||
| @@ -14,7 +13,7 @@ import "../oracle/IOracle.sol"; | |||
| contract UniswapIncentive is IUniswapIncentive, UniRef { | |||
| using Decimal for Decimal.D256; | |||
| using SafeMath32 for uint32; | |||
| using SafeMath for uint; | |||
| using SafeMathCopy for uint; | |||
There was a problem hiding this comment.
prevent collisions from UniRef
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.
Resolves OpenZeppelin audit issues L06, L10, N23 (partially, only for Pool.sol), and N27