feat: Use @openzeppelin/[email protected] contracts in contracts we can upgrade #598
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
…pgrade Imports an [aliased npm package](https://forum.openzeppelin.com/t/coexist-of-v5-and-v4-contracts/38030/5) so we can use multiple oz libraries in the same solidity contracts. This way we get access to new and improved contracts. I make changes to all contracts that we can upgrade, such as SpokePools and NOT the HubPool. For example, I can use the new SafeERC20 method `forceApprove` instead of `safeIncreaseAllowance` which ensures [compatibility with tokens like USDT](OpenZeppelin/openzeppelin-contracts#4231) that make sure all approvals are set to 0 before granting a new approval. This hasn't been an issue so far because we always safeIncreaseAllowance to some number and use the complete allowance, but its worth safety checking. Other changes: - Moved `MerkleDistributor` out of uma/core into this repo to reduce dependency on this external repo - Replaced isCode() call with now [recommended](OpenZeppelin/openzeppelin-contracts#3945) explicit .code.length check - Explicitly set SpokePoolVerifier pragma to 0.8.19 and removed the overrides in hardhat.config.ts - Removed unused import in PolygonERC20Test
bmzig
reviewed
Sep 12, 2024
| pragma solidity ^0.8.0; | ||
| // NOTE: Linea and Arbitrum only support 0.8.19, so keep this contract at 19 so create2 addressses for all chains are | ||
| // the same. | ||
| pragma solidity ^0.8.19; |
There was a problem hiding this comment.
i think that's right
|
I need to revise this PR and remove all the contracts5 imports into SpokePool because Arbitrum/Linea_SpokePool can't use those new contracts because they must be compiled with 8.19 while contracts5 uses 8.20 |
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.
Imports an aliased npm package so we can use multiple oz libraries in the same solidity contracts.
This way we get access to new and improved contracts. I make changes to all contracts that we can upgrade, such as SpokePools and NOT the HubPool.
For example, I can use the new SafeERC20 method
forceApproveinstead ofsafeIncreaseAllowancewhich ensures compatibility with tokens like USDT that make sure all approvals are set to 0 before granting a new approval. This hasn't been an issue so far because we always safeIncreaseAllowance to some number and use the complete allowance, but its worth safety checking.Other changes:
MerkleDistributorout of uma/core into this repo to reduce dependency on this external repo