Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Set of fixes for boojum integration #73

Merged
merged 21 commits into from
Nov 1, 2023
Merged

Set of fixes for boojum integration #73

merged 21 commits into from
Nov 1, 2023

Conversation

StanislavBreadless
Copy link
Collaborator

What ❔

  • Comment improvement/dead code removement.
  • Correct charging for the bootloader tx encoding space.
  • Correct check to ensure that the user provided enough gas for the L1->L2 transaction
  • Enforce that only one batch is proven at a time
  • Correct event for pending admin
  • Max fee per gas validation for upgrade transactions
  • Make governance execute/executeInstant payable.
  • Limit protocol version delta
  • Disallow security council from canceling upgrades (now it can only accelerate, but not cancel)

Why ❔

Checklist

  • PR title corresponds to the body of PR (we generate changelog entries from PRs).
  • Tests for the changes have been added / updated.
  • Documentation comments have been added / updated.
  • Code has been formatted via zk fmt and zk lint.

@StanislavBreadless StanislavBreadless changed the base branch from dev to release-v18-boojum October 31, 2023 10:46
koloz193
koloz193 requested changes Oct 31, 2023
View reviewed changes
Copy link
Contributor

@koloz193 koloz193 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Need to fix failing tests but looks good besides that

vladbochok
vladbochok approved these changes Oct 31, 2023
View reviewed changes
ethereum/contracts/zksync/libraries/Diamond.sol Show resolved Hide resolved
ethereum/contracts/upgrades/BaseZkSyncUpgrade.sol Show resolved Hide resolved
ethereum/contracts/governance/Governance.sol
@@ -164,7 +164,7 @@ contract Governance is IGovernance, Ownable2Step {
/// @notice Executes the scheduled operation after the delay passed.
/// @dev Both the owner and security council may execute delayed operations.
/// @param _operation The operation parameters will be executed with the upgrade.
function execute(Operation calldata _operation) external onlyOwnerOrSecurityCouncil {
function execute(Operation calldata _operation) external payable onlyOwnerOrSecurityCouncil {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we add test?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think for this function we may skip it, since it would be basically testing that payable works

@StanislavBreadless StanislavBreadless merged commit 414377f into release-v18-boojum Nov 1, 2023
11 checks passed
@StanislavBreadless StanislavBreadless deleted the sb-boojum-integration-patch branch November 1, 2023 09:40
StanislavBreadless added a commit that referenced this pull request Dec 20, 2024
@StanislavBreadless
Audittens Comments fixes (#73)
a575417
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@vladbochok vladbochok vladbochok approved these changes

@koloz193 koloz193 koloz193 approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@StanislavBreadless @koloz193 @vladbochok