Add ProxyAdmin owner verification to deploy/genesis scripts#345
Merged
m-chrzan merged 4 commits intopahor/genesisGenerationfrom Mar 7, 2025
Merged
Add ProxyAdmin owner verification to deploy/genesis scripts#345m-chrzan merged 4 commits intopahor/genesisGenerationfrom
m-chrzan merged 4 commits intopahor/genesisGenerationfrom
Conversation
soloseng
approved these changes
Mar 4, 2025
martinvol
reviewed
Mar 6, 2025
| "daBondSize": 1000, | ||
| "daResolverRefundPercentage": 50 | ||
| "daResolverRefundPercentage": 50, | ||
| "l2ProxyAdminOwnerVerification": "equal" |
There was a problem hiding this comment.
What do you think about changing this to something it's easier to understand, like "productionAddresses: true/false". I don't see a case where no-check would be needed.
|
Do we want to perform any testing before merging? |
pahor167
added a commit
that referenced
this pull request
May 19, 2025
* L2 allocation generation by itself * Readme added * update of readme * AbstractFeeCurrency * Celo smart contracts * added deploy of celo contracts to devnet * working without preInitializeOptimismPortalBalance * CustomGasToken L1 working * REVERT LATER - just for testing * fix of solidity version * Update interface solidity version * Pahor/genesis generation working deploy from celo2 (#307) * working deploy2.s.sol from celo10 * Deployment refactor * Compilation fix * removal of deploy_orig * [Contract Deployment] Split fault proof deployment (#308) * working deploy2.s.sol from celo10 * Deployment refactor * Contract Deployment: Split FP initialization * Minnor format fixes --------- Co-authored-by: pahor167 <hornak.pavel@gmail.com> * Celo token permit * Dual Guardian mechanism (#302) * working deploy2.s.sol from celo10 * Deployment refactor * Compilation fix * removal of deploy_orig * Setup new contract for Celo-specific guardian role * Test the actual new contract * Add getter for global SuperchainConfig * Make sure global guardian can't directly pause Celo config * Rename test contracts * Return combined Superchain and Celo paused status * Allow pausing of Celo config when Superchain is paused * Ensure Celo stays paused if Superchain still paused * Add CeloSuperchainConfig to Specs test * Exclude CeloSuperchainConfig from Initializable test for now * Make test view * Use CeloSuperchainConfig interface * Check and propagate superchain paused status in one function * Setup CeloSuperchainConfig in deploy script * Point OptimismPortal to CeloSuperchainConfig * Formatting * Use CeloSuperchainConfig in contracts that used SuperchainConfig * Fix CrossDomanMessenger test * Add NatSpecs * Add unit test NatSpecs * Add reference comment to deploy script * Add comments * Emit event on config update * Initialize as paused if Superchain paused at init time * Test Celo and Superchain pauses on OptimismPortal2 * Test Celo and Superchain pauses on OptimismPortal * Test Celo and Superchain pauses on L1CrossDomainMessenger * Test Celo and Superchain pauses on L1ERC721Bridge * Use checkAndPause in L1ERC721Bridge * Add enum and event to interface * Use CeloSuperChainConfig in ChainAssertions * Remove unused script * Add CeloSuperchainConfig chain assertion --------- Co-authored-by: pahor167 <hornak.pavel@gmail.com> * ICeloSuperchainConfig ignored * Remove debugging function (#313) * Fix Initializable test (#312) * Check CeloSuperchainConfig in Initializable test * Ignore Celo contracts from Initializable test * Always deal eth to precompiles (#314) * removal of ethereum-optimism/latitude-1 * lint * unused import removal * Snapshots update * semver lock * gas tests fixes * move of semver diff to celo-contracts/v1.8.0 * removal of debug prints * Test cimg base image for fuzz-golang * Install parallel * Update kona-fpp image * revert of deal EthToPrecompiles * unit test fix * CeloSuperchainConfig adjustements (#323) * Use new namespace in inheriting contract * Allow unset superchainConfig * Minor audit fixes (#325) * interfaces check fix * lint fixes * Implement CeloSuperchainConfig standalone, without inheritance (#326) * Implement CeloSuperchainConfig standalone, without inheritance * Use CeloSuperchainConfig in DelayedWETH (#329) * build fix * Remove usage of stateful pause check (#332) * Celo readme * readme fix * removed virtual tag from paused function (#335) * Move constants inside contracts (#336) * Add ProxyAdmin owner verification to deploy/genesis scripts (#345) * Provide external SuperchainConfig in deploy config (#352) * Provide an external superchain config and deploy Celo with it * Add externalSuperchainConfig in go and config template * Update CeloTokenL1.sol * Rolled back change by accident * Fix Celo token (#358) * Add chain_op_config field to rollup.json (required for testnets) --------- Co-authored-by: Javier Cortejoso <javier.cortejoso@gmail.com> Co-authored-by: Martin <marcin.j.chrzanowski@gmail.com> Co-authored-by: Martin <martin@clabs.co> Co-authored-by: soloseng <102702451+soloseng@users.noreply.github.com> Co-authored-by: Martín Volpe <martin.volpe@gmail.com>
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
This PR adds a config validation step to ensure that the L1/L2 ProxyAdmin owner addresses are set correctly in the deployment config.
There is a new config variable,
l2ProxyAdminOwnerVerification, that needs to be explicitly set to one of three values:no-check,aliased, orequal. After the JSON config is read, thefinalSystemOwner(which defines the L1 ProxyAdmin owner) andproxyAdminOwner(which defines the L2 ProxyAdmin owner) will be validated according to the verification method specified:no-check: no check is performedaliased: verifies thatproxyAdminOwneris the aliased version offinalSystemOwner. This is the method expected to be used for the production deployment, where both systems are owned by the same L1 multisig.equal: verifies thatproxyAdminOwnerandfinalSystemOwnerare equal. This can be used for testing environments where both systems are just owned by the same EOA.This check happens in both the L1 deployment script and the L2 genesis script.