chore: Integrate flashbots/op-rbuilder changes, resolve diverging head changes #21
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
* Add flashtestation builder tx and registration in block * copilot comments * Add flashtestations integration tests * logging improvements * Update crates/op-rbuilder/src/tests/flashtestations.rs Co-authored-by: Copilot <[email protected]> --------- Co-authored-by: Copilot <[email protected]>
* chore: push all the tags * release: 0.2.7
* chore: push all the tags * release: 0.2.7 * chore: update gh-runners * fix: remove incomplete step * fix: remove incomplete step
* Add permit flashtestations tx calls from builder * move simumlation calls to builder tx * refactor contract simulation * refactor flashtestations builder tx * fix test comments * comments
* Add permit flashtestations tx calls from builder * move simumlation calls to builder tx * Add permit functions for flashblocks number contract * refactor to simulate call * fix tests
This merge integrates Base's latest changes with Flashbots' main branch: **From Base (release_upstream):** - Bump to reth 1.9.1 and latest alloy/op-alloy dependencies - Jovian hardfork support: DA footprint gas scalar validation - miner_setGasLimit feature: OpGasLimitConfig for gas limit override - Rust version 1.88 **From Flashbots (main):** - P2P layer for flashblocks broadcasting and syncing - Flashtestations with permit functions - WebSocket publishing for synced flashblocks - All existing features and refactoring **Key Changes:** - Updated all reth dependencies to version 1.9.1 - Updated alloy dependencies to 1.0.41 - Updated alloy-evm to 0.23.0, alloy-op-evm to 0.23.1 - Updated op-alloy dependencies to 0.22.0 - Added alloy-op-hardforks 0.4.4 - Integrated OpGasLimitConfig for miner gas limit control - Preserved P2P crate and flashtestations functionality - Maintained rollup-boost integration
- Added gas_limit_config initialization in flashblocks context - Changed block_gas_limit() visibility from pub(super) to pub for flashtestations access - Removed unused Events import Note: Tests currently fail due to rollup-boost dependency version mismatch (op-alloy 0.20.0 vs 0.22.0)
- Updated rollup-boost dependency from rev dd12e8e to tag v0.7.8 - Resolves op-alloy version mismatch (0.20.0 -> 0.22.0) - All tests now pass (94/94 passing)
Applied formatting fixes from cargo +nightly fmt to ensure code passes lint checks. Changes include proper brace placement and line formatting in flashblocks builder_tx and payload_handler.
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.
📝 Summary
💡 Motivation and Context
✅ I have completed the following steps:
make lintmake test