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.

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

FaultDisputeGame.sol: make code and comment consistent #13999

Open
wants to merge 3 commits into
base: develop
Choose a base branch
from

Conversation

zhiqiangxu
Copy link
Contributor

@zhiqiangxu zhiqiangxu commented Jan 27, 2025

This PR makes the code more consistent with the comment:

// If the move is a defense, the disputed output could have been made by either party. In this case, we
// need to search for the parent output to determine what the expected status byte should be.

The disputed part is only necessary when the move is a defense.

The bytecode increases 4 bytes from:

image

to:

image

but I think the clarity is worth it.

@zhiqiangxu zhiqiangxu requested a review from a team as a code owner January 27, 2025 16:50
Copy link
Member

@clabby clabby left a comment

Choose a reason for hiding this comment

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

This change looks fine to me. Will defer to @ControlCplusControlV / @smartcontracts on whether we want to merge.

@clabby
Copy link
Member

clabby commented Jan 27, 2025

/ci authorize 5167067

@smartcontracts
Copy link
Contributor

Going to block this for now, we can consider merging as part of the next release, I don't want to make any logical changes (even changes that shouldn't impact logic at all) outside of the standard contract release process

Copy link
Contributor

@smartcontracts smartcontracts left a comment

Choose a reason for hiding this comment

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

Just dropping a review here to temporarily block this

@smartcontracts
Copy link
Contributor

But I'm in favor of including this for Upgrade 14

@zhiqiangxu zhiqiangxu force-pushed the opt_verifyExecBisectionRoot branch from 9e7a1aa to da5d411 Compare January 27, 2025 17:18
@clabby
Copy link
Member

clabby commented Jan 27, 2025

/ci authorize da5d411

@zhiqiangxu
Copy link
Contributor Author

/ci authorize da5d411

Looks like the authorization didn't work somehow, the failed test passes on my local end:

image

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants