Fix custody context initialization race condition that caused panic #8391
Conversation
This file contains hidden or 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
jimmygchen
force-pushed
the
fix-custody-context-race
branch
from
8d310a5 to
770e1e5
Compare
michaelsproul
changed the title
jimmygchen
force-pushed
the
fix-custody-context-race
branch
2 times, most recently
from
60e06f8 to
0e80706
Compare
jimmygchen
added
bug
jimmygchen
force-pushed
the
fix-custody-context-race
branch
from
28c2073 to
935db19
Compare
jimmygchen
commented
Nov 12, 2025
michaelsproul
approved these changes
Nov 16, 2025
Member
michaelsproul
left a comment
michaelsproul
left a comment
There was a problem hiding this comment.
Looks a lot nicer without the expects, and the extra plumbing for initialisation doesn't seem too bad. Looks good!
michaelsproul
added
under-review
jimmygchen
added
ready-for-review
michaelsproul
approved these changes
Nov 17, 2025
6 tasks
mergify bot
pushed a commit
that referenced
this pull request
Nov 20, 2025
This hot fix release includes the following fixes: * #8388 * #8406 * #8391 * #8413 Co-Authored-By: Jimmy Chen <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Issue Addressed
Take 2 of #8390.
Fixes the race condition properly instead of propagating the error. I think this is a better alternative, and doesn't seem to look that bad.
Proposed Changes
NetworkServicestartup to theClientBuilder, so that it can be used to compute custody columns for the beacon chain without waiting for Network bootstrap.I've considered and implemented a few alternatives:
node_idto beacon chain builder and compute columns when creatingCustodyContext. This approach isn't good for separation of concerns and isn't great for testabilityordered_custody_groupsto beacon chain.CustodyContextonly uses this to compute ordered custody columns, so we might as well lift this logic out, so we don't have to do error handling inCustodyContextconstruction. Less tests to update;.