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

[R4R] fix: missing contract upgrades and incorrect behavior when miners enable pipecommit #1007

Merged
merged 1 commit into from
Jul 20, 2022
Merged

[R4R] fix: missing contract upgrades and incorrect behavior when miners enable pipecommit #1007

merged 1 commit into from
Jul 20, 2022

Conversation

j75689
Copy link
Contributor

@j75689 j75689 commented Jul 20, 2022 •
edited
Loading

Description

  1. The code for the mining block upgrade system contract is missing.

    bsc/miner/worker.go

    Line 966 in de4abf9

    systemcontracts.UpgradeBuildInSystemContract(w.chainConfig, header.Number, env.state)
  2. Incorrect update of stateb when miner enables pipecommit.

Rationale

  1. Missed when merging ethereum versions.
  2. When a miner does a commit, a new *environment is copied to work, but when pipecommit is enabled, CorrectAccountsRoot should be called to correct the root hash of the accounts in the snapshot, which results in only the copied ones be updated, and the continuously running statedb is not properly updated.

Example

N/A

Changes

Notable changes:

  • miner/worker.go

forcodedancing
forcodedancing reviewed Jul 20, 2022
View reviewed changes
miner/worker.go Outdated Show resolved Hide resolved
forcodedancing
forcodedancing previously approved these changes Jul 20, 2022
View reviewed changes
unclezoro
unclezoro previously approved these changes Jul 20, 2022
View reviewed changes
brilliant-lx
brilliant-lx previously approved these changes Jul 20, 2022
View reviewed changes
Copy link
Collaborator

@brilliant-lx brilliant-lx left a comment

Choose a reason for hiding this comment

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

LGTM

brilliant-lx
brilliant-lx approved these changes Jul 20, 2022
View reviewed changes
Copy link
Collaborator

@brilliant-lx brilliant-lx left a comment

Choose a reason for hiding this comment

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

LGTM

@unclezoro unclezoro merged commit 21c4ece into bnb-chain:develop Jul 20, 2022
This was referenced Jul 28, 2022
Merged
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@unclezoro unclezoro unclezoro approved these changes

@forcodedancing forcodedancing forcodedancing approved these changes

@brilliant-lx brilliant-lx brilliant-lx 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.
4 participants
@j75689 @unclezoro @forcodedancing @brilliant-lx