small config rework and renaming ecosystem upgrade#1978
Conversation
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: e71a16ddee
ℹ️ About Codex in GitHub
Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".
| /// @notice Script used for default ecosystem upgrade flow should be run as a first for the upgrade. | ||
| /// @dev For more complex upgrades, this script can be inherited and its functionality overridden if needed. | ||
| contract DefaultEcosystemUpgrade is Script, DeployL1CoreUtils { | ||
| contract DefaultCoreUpgrade is Script, DeployL1CoreUtils { |
There was a problem hiding this comment.
Update upgrade scripts to use DefaultCoreUpgrade
The class rename in this commit changes the contract to DefaultCoreUpgrade, but multiple upgrade scripts still import/extend DefaultEcosystemUpgrade (e.g., deploy-scripts/upgrade/v31/EcosystemUpgrade_v31.s.sol, CombinedUpgrade_v31.s.sol, GatewayUpgrade_v31.s.sol, CTMUpgrade_v31.s.sol, and EcosystemUpgrade_v30_zksync_os_blobs.s.sol). With the old file removed, these scripts will fail to compile with “Source not found”/“Identifier not found” as soon as they’re built. Please update those imports and inheritance to the new name (or provide a compatibility shim).
Useful? React with 👍 / 👎.
l1-contracts/deploy-scripts/upgrade/default_upgrade/DefaultCTMUpgrade.s.sol
Outdated
Show resolved
Hide resolved
l1-contracts/deploy-scripts/upgrade/default_upgrade/DefaultCoreUpgrade.s.sol
Outdated
Show resolved
Hide resolved
| string memory newConfigPath, | ||
| string memory _outputPath | ||
| ) public virtual { | ||
| string memory _ecosystemOutputPath |
There was a problem hiding this comment.
let's not use outputs. it's not safe.
…s into kl/v31-upgrade-2
…s into kl/v31-upgrade-2
l1-contracts/deploy-scripts/upgrade/default_upgrade/DefaultCTMUpgrade.s.sol
Outdated
Show resolved
Hide resolved
l1-contracts/deploy-scripts/upgrade/default_upgrade/DefaultCoreUpgrade.s.sol
Outdated
Show resolved
Hide resolved
l1-contracts/deploy-scripts/upgrade/default_upgrade/DefaultCoreUpgrade.s.sol
Outdated
Show resolved
Hide resolved
l1-contracts/deploy-scripts/upgrade/default_upgrade/DefaultCoreUpgrade.s.sol
Outdated
Show resolved
Hide resolved
l1-contracts/deploy-scripts/upgrade/default-upgrade/DefaultCTMUpgrade.s.sol
Show resolved
Hide resolved
l1-contracts/deploy-scripts/upgrade/default-upgrade/DefaultCTMUpgrade.s.sol
Show resolved
Hide resolved
l1-contracts/deploy-scripts/upgrade/default-upgrade/DefaultChainUpgrade.s.sol
Show resolved
Hide resolved
l1-contracts/deploy-scripts/upgrade/default_upgrade/DefaultCoreUpgrade.s.sol
Outdated
Show resolved
Hide resolved
| // Initialize CTM upgrade with its own output path | ||
| ctmUpgrade = createCTMUpgrade(); | ||
| ctmUpgrade.initialize(permanentValuesInputPath, upgradeInputPath, _ctmOutputPath); | ||
| _ctmInitialized = true; |
There was a problem hiding this comment.
almost all of this function is boilerplate, can we inherit it somehow from the default impl?
StanislavBreadless
left a comment
There was a problem hiding this comment.
additional issues
l1-contracts/contracts/state-transition/chain-deps/facets/IDiamondCut.sol
Show resolved
Hide resolved
l1-contracts/deploy-scripts/upgrade/default_upgrade/DefaultCoreUpgrade.s.sol
Outdated
Show resolved
Hide resolved
…s into kl/v31-upgrade-2
l1-contracts/contracts/state-transition/chain-deps/gateway-ctm-deployer/GatewayCTMDeployer.sol
Outdated
Show resolved
Hide resolved
|
Coverage after merging kl/v31-upgrade-2 into draft-v31 will be
Coverage Report
|
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
What ❔
Why ❔
Checklist