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

core/validatorapi: workaround for Gnosis proposals #3238

Merged
merged 1 commit into from
Aug 26, 2024

Conversation

gsora
Copy link
Collaborator

@gsora gsora commented Aug 22, 2024

If the "gnosis_block_hotfix" feature flag is enabled, use the Gnosis-compatible representation of the proposal when calculating its hash tree root. This should fix Gnosis proposals failing due to bad signature.

category: feature
ticket: #3181
feature_flag: gnosis_block_hotfix

@gsora gsora force-pushed the gsora/gnosis-block-hotfix branch 2 times, most recently from 3b17178 to 0b37784 Compare August 22, 2024 15:18
Copy link

codecov bot commented Aug 22, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 57.70%. Comparing base (85bd4b1) to head (320438b).
Report is 2 commits behind head on main.

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #3238      +/-   ##
==========================================
+ Coverage   57.63%   57.70%   +0.07%     
==========================================
  Files         211      211              
  Lines       30370    30375       +5     
==========================================
+ Hits        17503    17528      +25     
+ Misses      10982    10962      -20     
  Partials     1885     1885              

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Copy link
Contributor

@pinebit pinebit left a comment

Choose a reason for hiding this comment

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

Approved with comments.
Plus consider adding that "real block" unit test.

core/signeddata.go Outdated Show resolved Hide resolved
If the "gnosis_block_hotfix" feature flag is enabled, use the Gnosis-compatible representation of the proposal when calculating its hash tree root.  This should fix Gnosis proposals failing due to bad signature.
Copy link

sonarcloud bot commented Aug 23, 2024


// We're replacing go-eth2-client with a branch off our fork, at version v0.21.10.
// This is needed to ensure Gnosis compatibility.
replace github.com/attestantio/go-eth2-client => github.com/ObolNetwork/go-eth2-client v0.21.11-0.20240822135044-f0a5b21e02c6
Copy link
Contributor

Choose a reason for hiding this comment

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

Wouldn't that mean we will have to manage this repo constantly and rebase it every time there is a new version of go-eth2-client?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Hopefully go-eth2-client will fix this upstream soon

@gsora gsora added the merge when ready Indicates bulldozer bot may merge when all checks pass label Aug 26, 2024
@obol-bulldozer obol-bulldozer bot merged commit 616d302 into main Aug 26, 2024
11 of 12 checks passed
@obol-bulldozer obol-bulldozer bot deleted the gsora/gnosis-block-hotfix branch August 26, 2024 13:28
pinebit pushed a commit that referenced this pull request Sep 16, 2024
If the "gnosis_block_hotfix" feature flag is enabled, use the Gnosis-compatible representation of the proposal when calculating its hash tree root.  This should fix Gnosis proposals failing due to bad signature.

category: feature
ticket: #3181
feature_flag: gnosis_block_hotfix
@pinebit pinebit mentioned this pull request Sep 16, 2024
obol-bulldozer bot pushed a commit that referenced this pull request Sep 17, 2024
For release v1.1.1 cherry picked:

* [core/validatorapi: workaround for Gnosis proposals](#3238)
* [*: enable gnosis hotfix automatically](#3257)
*: [fix flaky testpeers test #3267](#3267)
* [cmd: increase testpeers tests timeouts #3268](#3268)
* [cmd: fix test peers out of range #3280](#3280)
* [testutil: update docker-compose command to docker compose](#3249)

category: misc
ticket: none
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merge when ready Indicates bulldozer bot may merge when all checks pass
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants