-
Notifications
You must be signed in to change notification settings - Fork 80
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
Add more conflict types to ConflictFinder
#238
Conversation
For anyone reviewing, please take a look at TODO comments I left and let me know what you think! |
The original code had some copy/paste (our bad!) but you may avoid it.
And just call it 6 times. |
About the TODO ideas: |
…facilitate conflict finding by address, not just SlotKey
@ZanCorDX thank you for all your suggestions. I implemented them and just pushed updated code! Went with a 2-layer |
Hi @ZanCorDX . Any more changes you would want to this? |
crates/rbuilder/src/building/builders/parallel_builder/groups.rs
Outdated
Show resolved
Hide resolved
Benchmark results for
|
Date (UTC) | 2024-12-12T21:12:28+00:00 |
Commit | c01fc235ec873583bdde1d5d1a58d5ff34ad4300 |
Base SHA | 17776ccfde349baed05b523883493c890918aac1 |
Significant changes
Benchmark | Mean | Status |
---|---|---|
MEV-Boost SubmitBlock serialization/JSON encoding | 61.93% | Performance has degraded. |
0daa63a
to
7def2e9
Compare
It is hard to review code that is force-pushed. Every force-push, the entire changeset must be reviewed again. |
Hi @wjmelements sorry about the force-push. I was rebasing this branch to the latest changes from In the force-push, it shows that the force-push was to 7def2e9 this commit, which was the one you last reviewed. Does this help? |
I've not worked with cross-repo PRs like this before. Any advice on how I can rebase onto the |
|
||
GroupData { | ||
orders, | ||
reads, | ||
writes, | ||
balance_reads, | ||
balance_writes, | ||
created_contracts, | ||
destructed_contracts, | ||
code_writes, |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
nice
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can you fix the lint errors so we can merge?
@ZanCorDX I've looked at those and not sure how to proceed. They're lint errors from other pieces of code, not touched by my changes. Is it a common thing to happen? I can fix them in this PR, but seems like a weird issue. LMK if I should just proceed to fixing them |
@ZanCorDX Actually the linting errors were produced only by the newer rust toolchain and after updating it and merging new commits from upstream, the lint warnings seem to have disappeared. Could you rerun the workflows again to see if all is good now? |
📝 Summary
Add more conflict types to
ConflictFinder
as per #226A brief overview of the changes:
ConflictFinder
, namelycombine_groups
- a utility fn to reuse codeConflictFinder.add_group_to_index
andConflictFinder.remove_group_from_index
to reuse code and improve readability;index
here means search index, or different member mappings ofConflictFinder
✅ I have completed the following steps:
make lint
make test