chore: running forge update and fixing OZ related methods #98
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
2 tasks
fedgiac
pushed a commit
that referenced
this pull request
Jul 9, 2024
This PR aims to make the `GetTradeableOrder` library easily inherited by other repos. Also it removes the unused `tradedAmountToken0` from the library. Pending issues addressed in [draft] #98: - [ ] installed OpenZeppelin is 4.9.0, Math Rounding enum are different than 5.0.2 ([latest](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/05f218fb6617932e56bf5388c3b389c3028a7b73/contracts/utils/math/Math.sol#L13)) - [ ] OZ 5.0.2 deprecated `safeApprove` (which brings tests errors on the "when approve returns false" expectations)
wei3erHase
commented
Jul 10, 2024
| abi.encodeCall(IERC20.approve, (spenderBadApproval, type(uint256).max)), | ||
| abi.encodeWithSelector(IERC20.approve.selector, spenderBadApproval), |
There was a problem hiding this comment.
notice: making the approve call generically revert when called with spenderBadApproval (reverts for every amount, instead of for type(uint256).max)
There was a problem hiding this comment.
Suggested change
| abi.encodeCall(IERC20.approve, (spenderBadApproval, type(uint256).max)), | |
| abi.encodeWithSelector(IERC20.approve.selector, spenderBadApproval), | |
| // Notice: we intentionally don't match the approved amount. | |
| abi.encodeWithSelector(IERC20.approve.selector, spenderBadApproval), |
2 tasks
fedgiac
approved these changes
Jul 10, 2024
| abi.encodeCall(IERC20.approve, (spenderBadApproval, type(uint256).max)), | ||
| abi.encodeWithSelector(IERC20.approve.selector, spenderBadApproval), |
There was a problem hiding this comment.
Suggested change
| abi.encodeCall(IERC20.approve, (spenderBadApproval, type(uint256).max)), | |
| abi.encodeWithSelector(IERC20.approve.selector, spenderBadApproval), | |
| // Notice: we intentionally don't match the approved amount. | |
| abi.encodeWithSelector(IERC20.approve.selector, spenderBadApproval), |
mfw78
approved these changes
Jul 11, 2024
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.
As a second step from #97 in order to improve contracts inheritability from an external repo, this PR aims to update OZ to the latest version (5.0.2), which brought incompatibilities with repos using this version (as Math rounding enum was modified, for example).
Proposed changes:
forge updateto fetch latest packages (OZ and UniV2)safeApprovewithforceApprove(note: different behaviour)Math.Rounding.Up/DownforCeil/FloorPending:
testDeploymentRevertsIfApprovalRevertstest is failing with a different expectation than written on the test, this must come from the different behaviour thatforceApprovehas oversafeApprove, this test expectation should be fixed before merging