Skip to content

chore: bump alloy to 2.0.0#23407

Merged
mattsse merged 10 commits into
paradigmxyz:mainfrom
stevencartavia:alloy-2.0
Apr 13, 2026
Merged

chore: bump alloy to 2.0.0#23407
mattsse merged 10 commits into
paradigmxyz:mainfrom
stevencartavia:alloy-2.0

Conversation

@stevencartavia
Copy link
Copy Markdown
Contributor

@stevencartavia stevencartavia commented Apr 8, 2026

Removes the temporary crate patches from this branch and switches the bump to the released crates: Alloy 2.0.0, alloy-evm 0.31.0, revm-inspectors 0.37.0, and the reth-core split crates at 0.2.0.

This also adapts reth-evm to the final alloy-evm 0.31.0 commit callback signature. Verified with cargo +nightly fmt --all --check, cargo check --workspace --all-features --locked, and cargo nextest run -p reth-evm -p reth-rpc-eth-types --locked.

Comment thread crates/chainspec/src/spec.rs Outdated
Comment thread crates/chainspec/src/spec.rs Outdated
Comment thread crates/evm/evm/src/lib.rs
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

this looks wrong, we shouldnt need this

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

I'm pretty sure this is still wrong :)

Comment thread crates/chainspec/src/spec.rs Outdated
stevencartavia and others added 5 commits April 8, 2026 23:00
- Bump 27 alloy crate versions from 1.8.2 to 2.0.0-rc.1
- Bump alloy-hardforks from 0.4.5 to 0.4.7
- Add [patch.crates-io] for alloy, alloy-evm, revm-inspectors, reth-core
- Add local TransactionEnvMut trait (removed from alloy-evm)
- Handle ChainConfig non-exhaustive field (mutable default pattern)
- Add Header fields: block_access_list_hash, slot_number
- Add PayloadAttributes field: slot_number
- Handle ExecutionPayload::V4 variant
- Handle BlobTransactionSidecarVariant generic build

Amp-Thread-ID: https://ampcode.com/threads/T-019d6e8f-76f3-74b9-83cb-a195677d4412
Co-authored-by: Amp <amp@ampcode.com>
- Remove unfulfilled #[expect(clippy::needless_update)] (8 instances)
- Make deprioritize_background_threads const fn
- Use pre-Osaka PooledTransaction type for old fixture data tests

Amp-Thread-ID: https://ampcode.com/threads/T-019d6e8f-76f3-74b9-83cb-a195677d4412
Co-authored-by: Amp <amp@ampcode.com>
The inner _deprioritize_background_threads() does I/O on Linux and
cannot be called in const context. Compiled on macOS only because
the #[cfg(target_os = "linux")] body was excluded.

Co-authored-by: Amp <amp@ampcode.com>
Amp-Thread-ID: https://ampcode.com/threads/T-019d6ffa-13e1-75b0-a1f4-b2fab3eb9653
Comment thread crates/evm/evm/src/lib.rs
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

I'm pretty sure this is still wrong :)

Comment thread crates/rpc/rpc/src/admin.rs Outdated
Comment on lines +105 to +111
let mut config = self.chain_spec.genesis().config.clone();
config.chain_id = self.chain_spec.chain().id();
config.terminal_total_difficulty_passed =
self.chain_spec.final_paris_total_difficulty().is_some();
config.terminal_total_difficulty =
self.chain_spec.ethereum_fork_activation(EthereumHardfork::Paris).ttd();
config.deposit_contract_address = self.chain_spec.deposit_contract().map(|dc| dc.address);
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

undo

@github-project-automation github-project-automation Bot moved this from Backlog to In Progress in Reth Tracker Apr 10, 2026
@mattsse mattsse changed the title chore: bump alloy to 2.0.0-rc.1 chore: bump alloy to 2.0.0 Apr 13, 2026
Comment thread crates/evm/evm/src/execute.rs Outdated
Comment on lines +464 to +475
self.executor.execute_transaction_with_commit_condition((tx_env, &tx), f)?
self.executor.execute_transaction_with_commit_condition((tx_env, &tx), |result| {
f(&result.result().result)
})?
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

we want to change the closure type of the BlockBuilder trait so that it gets the inner Executor::Result

@mattsse mattsse marked this pull request as ready for review April 13, 2026 13:34
@mattsse mattsse enabled auto-merge April 13, 2026 13:35
@mattsse mattsse added this pull request to the merge queue Apr 13, 2026
Merged via the queue into paradigmxyz:main with commit bfb7ab7 Apr 13, 2026
34 checks passed
@github-project-automation github-project-automation Bot moved this from In Progress to Done in Reth Tracker Apr 13, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

Status: Done

Development

Successfully merging this pull request may close these issues.

4 participants