Proposer compare withdrawal roots #11977
Merged
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
terencechain
requested review from
kasey,
rkapka and
james-prysm
and removed request for
a team
|
build is failing |
potuz
reviewed
Feb 9, 2023
Comment on lines
75
to
76
| matchWithdrawalRoot := bytes.Equal(r1, r2) | ||
| if !matchWithdrawalRoot { |
There was a problem hiding this comment.
Suggested change
| matchWithdrawalRoot := bytes.Equal(r1, r2) | |
| if !matchWithdrawalRoot { | |
| matchWithdrawalsRoot := bytes.Equal(r1, r2) | |
| if !matchWithdrawalsRoot { |
| log.WithFields(logrus.Fields{ | ||
| "local": r1, | ||
| "remote": r2, | ||
| }).Warn("Proposer: withdrawal roots don't match, using local") |
There was a problem hiding this comment.
Suggested change
| }).Warn("Proposer: withdrawal roots don't match, using local") | |
| }).Warn("Proposer: withdrawals roots don't match, using local") |
| // Compare payload values between local and builder. Default to the local value if it is higher. | ||
| builderValue, err := builderPayload.Value() | ||
| if err != nil { | ||
| log.WithError(err).Warn("Proposer: failed to get builder payload value") // Default to local if can't get builder value. | ||
| } else if builderValue.Cmp(localValue) > 0 { | ||
| } else if builderValue.Cmp(localValue) > 0 && matchWithdrawalRoot { |
There was a problem hiding this comment.
Suggested change
| } else if builderValue.Cmp(localValue) > 0 && matchWithdrawalRoot { | |
| } else if builderValue.Cmp(localValue) > 0 && matchWithdrawalsRoot { |
| "local": r1, | ||
| "remote": r2, | ||
| }).Warn("Proposer: withdrawal roots don't match, using local") | ||
| } |
There was a problem hiding this comment.
An alternative is to add here an } else and prevent continuing if we already know that we are not going to use the builder cause the withdrawals root doesn't match
terencechain
changed the base branch from
proposer-compare-values
to
develop
rauljordan
previously approved these changes
Feb 13, 2023
rauljordan
previously approved these changes
Feb 14, 2023
potuz
approved these changes
Feb 17, 2023
saolyn
approved these changes
Feb 17, 2023
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.
Proposer should compare local vs builder withdrawal roots, if they don't match then default to local block building. This prevents builder and relayer bugs result in block proposal failures