Skip to content

devnet: Fix devnet#2684

Merged
mergify[bot] merged 2 commits intoethereum-optimism:developfrom
mslipper:feat/devnet-fixed
Jun 6, 2022
Merged

devnet: Fix devnet#2684
mergify[bot] merged 2 commits intoethereum-optimism:developfrom
mslipper:feat/devnet-fixed

Conversation

@mslipper
Copy link
Collaborator

@mslipper mslipper commented Jun 5, 2022

No description provided.

@changeset-bot
Copy link

changeset-bot bot commented Jun 5, 2022

⚠️ No Changeset found

Latest commit: 417c95b

Merging this PR will not cause a version bump for any packages. If these changes should not result in a new version, you're good to go. If these changes should result in a version bump, you need to add a changeset.

This PR includes no changesets

When changesets are added to this PR, you'll see the packages that this PR includes changesets for and the associated semver types

Click here to learn what changesets are, and how to add one.

Click here if you're a maintainer who wants to add a changeset to this PR

@mergify mergify bot requested review from Inphi and tuxcanfly June 5, 2022 00:27
@mslipper mslipper force-pushed the feat/devnet-fixed branch 2 times, most recently from 2231524 to bdd2e97 Compare June 5, 2022 02:21
@mslipper mslipper force-pushed the feat/devnet-fixed branch from bdd2e97 to 709d769 Compare June 5, 2022 02:22
Copy link
Contributor

@Inphi Inphi left a comment

Choose a reason for hiding this comment

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

looks good. Though removing images that match a glob can be surprising to users that build custom images (myself included) with a matching glob. It would be better if we removed specific image names. But this is acceptable too.

@mergify mergify bot requested a review from Inphi June 5, 2022 17:51
@mergify
Copy link
Contributor

mergify bot commented Jun 6, 2022

This PR has been added to the merge queue, and will be merged soon.

@mergify
Copy link
Contributor

mergify bot commented Jun 6, 2022

This PR is next in line to be merged, and will be merged as soon as checks pass.

@mergify mergify bot merged commit 0f794f9 into ethereum-optimism:develop Jun 6, 2022
@mslipper mslipper mentioned this pull request Jun 6, 2022
theochap pushed a commit that referenced this pull request Jan 15, 2026
## Summary

This PR replicates the changes from
alloy-rs/alloy#2684 for the OpExecutionPayload
types, adding `into_block_raw()` methods to centralize block
construction logic and eliminate code duplication.

## Changes

- Added `into_block_raw()` method to `OpExecutionPayloadV4` that
converts the payload to a block with raw transactions
- Added `into_block_raw()` method to `OpExecutionPayload` enum that
delegates to the appropriate variant
- Added `into_block_with_sidecar_raw()` method to `OpExecutionPayload`
for creating blocks with sidecar data
- Refactored `try_into_block_with` and
`try_into_block_with_sidecar_with` methods to use the new raw methods
combined with `Block::try_map_transactions`

## Motivation

The alloy PR #2684 introduced these methods to provide a cleaner API and
reduce code duplication. By using `into_block_raw()` methods that return
blocks with raw transaction bytes, we can then use
`Block::try_map_transactions` to convert them to any transaction type,
making the code more maintainable and flexible.

## Notes

- The implementation properly handles the fact that upstream alloy types
return `Result<Block<Bytes>, PayloadError>` from their `into_block_raw`
methods
- All existing validation logic for Optimism-specific requirements
(empty L1 withdrawals, no blob transactions) is preserved
- Tests pass and formatting has been applied
theochap pushed a commit that referenced this pull request Jan 21, 2026
…s/op-alloy#570)

## Summary

This PR replicates the changes from
alloy-rs/alloy#2684 for the OpExecutionPayload
types, adding `into_block_raw()` methods to centralize block
construction logic and eliminate code duplication.

## Changes

- Added `into_block_raw()` method to `OpExecutionPayloadV4` that
converts the payload to a block with raw transactions
- Added `into_block_raw()` method to `OpExecutionPayload` enum that
delegates to the appropriate variant
- Added `into_block_with_sidecar_raw()` method to `OpExecutionPayload`
for creating blocks with sidecar data
- Refactored `try_into_block_with` and
`try_into_block_with_sidecar_with` methods to use the new raw methods
combined with `Block::try_map_transactions`

## Motivation

The alloy PR #2684 introduced these methods to provide a cleaner API and
reduce code duplication. By using `into_block_raw()` methods that return
blocks with raw transaction bytes, we can then use
`Block::try_map_transactions` to convert them to any transaction type,
making the code more maintainable and flexible.

## Notes

- The implementation properly handles the fact that upstream alloy types
return `Result<Block<Bytes>, PayloadError>` from their `into_block_raw`
methods
- All existing validation logic for Optimism-specific requirements
(empty L1 withdrawals, no blob transactions) is preserved
- Tests pass and formatting has been applied
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