[WIP] Feat/add safe scripts #21
Open
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
…ail-recovery into feat/add-safe-scripts
There was a problem hiding this comment.
Thanks for raising this, a few additional comments:
- We have two scripts that are similar:
DeploySafeAccount.s.solandDeployAccount.s.sol. We should consolidate this logic. Which one is the one that works? If only one works, we keep that and remove the other one. If both work, we should choose one - not currently opinionated on which. WithDeployAccount.s.sol, that was one I wrote and the module installation is done separately inInstallModuleSafe7579Account.s.sol - Can we add a comment to each deployment script outlining what the script does? Some of them are quite unwieldy and are difficult to understand
| @@ -1,3 +1,5 @@ | |||
| BASE_SEPOLIA_RPC_URL= | |||
| PRIVATE_KEY= | |||
| BASE_SCAN_API_KEY= | |||
| SAFE_ACCOUNT_SALT=0x0000000000000000000000000000000000000000000000000000000000000004 # You need to update some of random salt to make it different | |||
| SAFE_7579_ADOPTER= # You can get this via running the script/DeploySafeRecovery.s.sol | |||
There was a problem hiding this comment.
Suggested change
| SAFE_7579_ADOPTER= # You can get this via running the script/DeploySafeRecovery.s.sol | |
| SAFE_7579_ADAPTER= # You can get this via running the script/DeploySafeRecovery.s.sol |
| @@ -28,6 +28,7 @@ | |||
| "@matterlabs": "github:matter-labs/era-contracts", | |||
| "@openzeppelin/contracts-upgradeable": "v5.0.1", | |||
| "@rhinestone/modulekit": "github:rhinestonewtf/modulekit#test/safe-latest", | |||
| "@safe-global/safe-contracts": "1.4.1-build.0", | |||
There was a problem hiding this comment.
Why did the safe contracts get added here? We can actually pull them in without doing this
See remappings
See example
| @@ -68,7 +68,7 @@ library GuardianUtils { | |||
| revert IncorrectNumberOfWeights(); | |||
| } | |||
|
|
|||
| if (threshold == 0) { | |||
| if (threshold == 0 && guardianCount > 0) { | |||
There was a problem hiding this comment.
Why did this get added? Can this be removed?
| validators[0] = ModuleInit({ module: validatorAddr, initData: abi.encode(accountOwner) }); | ||
|
|
||
| ModuleInit[] memory executors = new ModuleInit[](0); | ||
| // managerAddr = vm.envOr("RECOVERY_MANAGER", address(0)); |
There was a problem hiding this comment.
Can we remove all the commented out code in all of the deployment scripts?
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.
No description provided.