Feature/rd 1193 add openzeppelin foundry upgrades to the repo #51
Conversation
| @@ -382,12 +383,12 @@ contract GaugesDaoFactoryTest is Test { | |||
|
|
|||
| TokenParameters[] memory tokenParameters = new TokenParameters[](2); | |||
| tokenParameters[0] = TokenParameters({ | |||
| token: address(deployMockERC20("T1", "T1", 18)), | |||
There was a problem hiding this comment.
deployMockERC20 was deprecated on the new version of forge-std
| @@ -29,6 +29,7 @@ contract Clock is IClock, DaoAuthorizable, UUPSUpgradeable { | |||
| Initialization | |||
| //////////////////////////////////////////////////////////////*/ | |||
|
|
|||
| /// @custom:oz-upgrades-unsafe-allow constructor | |||
There was a problem hiding this comment.
This annotation is needed in all the contracts with a constructor (also in the old ones)
xavikh
force-pushed
the
feature/rd-1193-add-openzeppelin-foundry-upgrades-to-the-repo
branch
from
dd64db6 to
de71bbc
Compare
xavikh
force-pushed
the
feature/rd-1193-add-openzeppelin-foundry-upgrades-to-the-repo
branch
from
7cf5a12 to
dc6fbf8
Compare
xavikh
force-pushed
the
feature/rd-1193-add-openzeppelin-foundry-upgrades-to-the-repo
branch
from
e707746 to
70c3555
Compare
| "test-unit": "forge test --no-match-path \"{test/fork/*.sol,test/upgrades/*.sol}\" -vvv", | ||
| "test-fork": "forge test --match-path \"test/fork/**/*.sol\" --rpc-url https://sepolia.drpc.org -vvv", | ||
| "test-upgrades": "forge test --build-info --match-path \"test/upgrades/**/*.sol\" -vvv", | ||
| "test": "forge test -vvv" |
There was a problem hiding this comment.
these should be added to the makefile or we replace the makefile
There was a problem hiding this comment.
100%, better all together. And make is easier to use in CI
| @@ -2,6 +2,7 @@ | |||
| pragma solidity ^0.8.17; | |||
|
|
|||
| import "forge-std/Test.sol"; | |||
| import {MockERC20} from "@solmate/test/utils/mocks/MockERC20.sol"; | |||
There was a problem hiding this comment.
why are we using the solmate erc20?:
There was a problem hiding this comment.
Forge-std deprecated the ERC20Mock
| import {Upgrades} from "openzeppelin-foundry-upgrades/LegacyUpgrades.sol"; | ||
| import {Options} from "openzeppelin-foundry-upgrades/Options.sol"; | ||
|
|
||
| contract TestUpgrades is AragonTest { |
There was a problem hiding this comment.
I see this relies on the git submodules approach. Are we sure we want to go down this route?
There was a problem hiding this comment.
This test can be changed to not use submodules pretty easily. But without them we lose the ability to test the full deployment and upgrade (using the factory)
No description provided.