Skip to content

Commit ec5ce21

Browse files
klkvronbjerg
klkvr
and
onbjerg
authored
chore(deps): bump alloy (#10537)
Co-authored-by: Oliver <[email protected]>
1 parent 019ec72 commit ec5ce21

File tree

50 files changed

+529
-579
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+529
-579
lines changed

‎Cargo.lock

+232-296
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml

+35-34
Original file line numberDiff line numberDiff line change
@@ -395,59 +395,60 @@ reth-trie-db = { path = "crates/trie/db" }
395395
reth-trie-parallel = { path = "crates/trie/parallel" }
396396

397397
# revm
398-
revm = { version = "13.0.0", features = [
398+
revm = { version = "14.0.0", features = [
399399
"std",
400400
"secp256k1",
401401
"blst",
402402
], default-features = false }
403-
revm-inspectors = "0.5"
404-
revm-primitives = { version = "8.0.0", features = [
403+
revm-inspectors = "0.6"
404+
revm-primitives = { version = "9.0.0", features = [
405405
"std",
406406
], default-features = false }
407407

408408
# eth
409409
alloy-chains = "0.1.18"
410-
alloy-dyn-abi = "0.7.2"
411-
alloy-primitives = { version = "0.7.2", default-features = false }
410+
alloy-dyn-abi = "0.8.0"
411+
alloy-primitives = { version = "0.8.0", default-features = false }
412412
alloy-rlp = "0.3.4"
413-
alloy-sol-types = "0.7.2"
414-
alloy-trie = { version = "0.4", default-features = false }
413+
alloy-sol-types = "0.8.0"
414+
alloy-trie = { version = "0.5", default-features = false }
415415

416-
alloy-consensus = { version = "0.2.1", default-features = false }
417-
alloy-eips = { version = "0.2.1", default-features = false }
418-
alloy-genesis = { version = "0.2.1", default-features = false }
419-
alloy-json-rpc = { version = "0.2.1", default-features = false }
420-
alloy-network = { version = "0.2.1", default-features = false }
421-
alloy-node-bindings = { version = "0.2.1", default-features = false }
422-
alloy-provider = { version = "0.2.1", features = [
416+
alloy-consensus = { version = "0.3.0", default-features = false }
417+
alloy-eips = { version = "0.3.0", default-features = false }
418+
alloy-genesis = { version = "0.3.0", default-features = false }
419+
alloy-json-rpc = { version = "0.3.0", default-features = false }
420+
alloy-network = { version = "0.3.0", default-features = false }
421+
alloy-node-bindings = { version = "0.3.0", default-features = false }
422+
alloy-provider = { version = "0.3.0", features = [
423423
"reqwest",
424424
], default-features = false }
425-
alloy-pubsub = { version = "0.2.1", default-features = false }
426-
alloy-rpc-client = { version = "0.2.1", default-features = false }
427-
alloy-rpc-types = { version = "0.2.1", features = [
425+
alloy-pubsub = { version = "0.3.0", default-features = false }
426+
alloy-rpc-client = { version = "0.3.0", default-features = false }
427+
alloy-rpc-types = { version = "0.3.0", features = [
428428
"eth",
429429
], default-features = false }
430-
alloy-rpc-types-admin = { version = "0.2.1", default-features = false }
431-
alloy-rpc-types-anvil = { version = "0.2.1", default-features = false }
432-
alloy-rpc-types-beacon = { version = "0.2.1", default-features = false }
433-
alloy-rpc-types-engine = { version = "0.2.1", default-features = false }
434-
alloy-rpc-types-eth = { version = "0.2.1", default-features = false }
435-
alloy-rpc-types-mev = { version = "0.2.1", default-features = false }
436-
alloy-rpc-types-trace = { version = "0.2.1", default-features = false }
437-
alloy-rpc-types-txpool = { version = "0.2.1", default-features = false }
438-
alloy-serde = { version = "0.2.1", default-features = false }
439-
alloy-signer = { version = "0.2.1", default-features = false }
440-
alloy-signer-local = { version = "0.2.1", default-features = false }
441-
alloy-transport = { version = "0.2.1" }
442-
alloy-transport-http = { version = "0.2.1", features = [
430+
alloy-rpc-types-admin = { version = "0.3.0", default-features = false }
431+
alloy-rpc-types-anvil = { version = "0.3.0", default-features = false }
432+
alloy-rpc-types-beacon = { version = "0.3.0", default-features = false }
433+
alloy-rpc-types-engine = { version = "0.3.0", default-features = false }
434+
alloy-rpc-types-eth = { version = "0.3.0", default-features = false }
435+
alloy-rpc-types-mev = { version = "0.3.0", default-features = false }
436+
alloy-rpc-types-trace = { version = "0.3.0", default-features = false }
437+
alloy-rpc-types-txpool = { version = "0.3.0", default-features = false }
438+
alloy-serde = { version = "0.3.0", default-features = false }
439+
alloy-signer = { version = "0.3.0", default-features = false }
440+
alloy-signer-local = { version = "0.3.0", default-features = false }
441+
alloy-transport = { version = "0.3.0" }
442+
alloy-transport-http = { version = "0.3.0", features = [
443443
"reqwest-rustls-tls",
444444
], default-features = false }
445-
alloy-transport-ipc = { version = "0.2.1", default-features = false }
446-
alloy-transport-ws = { version = "0.2.1", default-features = false }
445+
alloy-transport-ipc = { version = "0.3.0", default-features = false }
446+
alloy-transport-ws = { version = "0.3.0", default-features = false }
447447

448448
# op
449-
op-alloy-rpc-types = "0.1"
450-
op-alloy-network = "0.1"
449+
op-alloy-rpc-types = "0.2"
450+
op-alloy-rpc-types-engine = "0.2"
451+
op-alloy-network = "0.2"
451452

452453
# misc
453454
aquamarine = "0.5"

‎bin/reth-bench/src/bench/context.rs

+5-17
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,7 @@
33
44
use crate::{authenticated_transport::AuthenticatedTransportConnect, bench_mode::BenchMode};
55
use alloy_eips::BlockNumberOrTag;
6-
use alloy_provider::{
7-
network::{AnyNetwork, Ethereum},
8-
Provider, ProviderBuilder, RootProvider,
9-
};
6+
use alloy_provider::{network::AnyNetwork, Provider, ProviderBuilder, RootProvider};
107
use alloy_rpc_client::ClientBuilder;
118
use alloy_rpc_types_engine::JwtSecret;
129
use alloy_transport::BoxTransport;
@@ -24,7 +21,7 @@ pub(crate) struct BenchContext {
2421
/// The auth provider used for engine API queries.
2522
pub(crate) auth_provider: RootProvider<BoxTransport, AnyNetwork>,
2623
/// The block provider used for block queries.
27-
pub(crate) block_provider: RootProvider<Http<Client>, Ethereum>,
24+
pub(crate) block_provider: RootProvider<Http<Client>, AnyNetwork>,
2825
/// The benchmark mode, which defines whether the benchmark should run for a closed or open
2926
/// range of blocks.
3027
pub(crate) benchmark_mode: BenchMode,
@@ -46,7 +43,8 @@ impl BenchContext {
4643
}
4744

4845
// set up alloy client for blocks
49-
let block_provider = ProviderBuilder::new().on_http(rpc_url.parse()?);
46+
let block_provider =
47+
ProviderBuilder::new().network::<AnyNetwork>().on_http(rpc_url.parse()?);
5048

5149
// If neither `--from` nor `--to` are provided, we will run the benchmark continuously,
5250
// starting at the latest block.
@@ -95,17 +93,7 @@ impl BenchContext {
9593
}
9694
};
9795

98-
let next_block = match first_block.header.number {
99-
Some(number) => {
100-
// fetch next block
101-
number + 1
102-
}
103-
None => {
104-
// this should never happen
105-
return Err(eyre::eyre!("First block number is None"));
106-
}
107-
};
108-
96+
let next_block = first_block.header.number + 1;
10997
Ok(Self { auth_provider, block_provider, benchmark_mode, next_block })
11098
}
11199
}

‎bin/reth-bench/src/bench/new_payload_fcu.rs

+5-23
Original file line numberDiff line numberDiff line change
@@ -45,17 +45,8 @@ impl Command {
4545
while benchmark_mode.contains(next_block) {
4646
let block_res = block_provider.get_block_by_number(next_block.into(), true).await;
4747
let block = block_res.unwrap().unwrap();
48-
let block = match block.header.hash {
49-
Some(block_hash) => {
50-
// we can reuse the hash in the response
51-
Block::try_from(block).unwrap().seal(block_hash)
52-
}
53-
None => {
54-
// we don't have the hash, so let's just hash it
55-
Block::try_from(block).unwrap().seal_slow()
56-
}
57-
};
58-
48+
let block_hash = block.header.hash;
49+
let block = Block::try_from(block.inner).unwrap().seal(block_hash);
5950
let head_block_hash = block.hash();
6051
let safe_block_hash = block_provider
6152
.get_block_by_number(block.number.saturating_sub(32).into(), false);
@@ -65,18 +56,9 @@ impl Command {
6556

6657
let (safe, finalized) = tokio::join!(safe_block_hash, finalized_block_hash,);
6758

68-
let safe_block_hash = safe
69-
.unwrap()
70-
.expect("finalized block exists")
71-
.header
72-
.hash
73-
.expect("finalized block has hash");
74-
let finalized_block_hash = finalized
75-
.unwrap()
76-
.expect("finalized block exists")
77-
.header
78-
.hash
79-
.expect("finalized block has hash");
59+
let safe_block_hash = safe.unwrap().expect("finalized block exists").header.hash;
60+
let finalized_block_hash =
61+
finalized.unwrap().expect("finalized block exists").header.hash;
8062

8163
next_block += 1;
8264
sender

‎bin/reth-bench/src/bench/new_payload_only.rs

+2-10
Original file line numberDiff line numberDiff line change
@@ -45,16 +45,8 @@ impl Command {
4545
while benchmark_mode.contains(next_block) {
4646
let block_res = block_provider.get_block_by_number(next_block.into(), true).await;
4747
let block = block_res.unwrap().unwrap();
48-
let block = match block.header.hash {
49-
Some(block_hash) => {
50-
// we can reuse the hash in the response
51-
Block::try_from(block).unwrap().seal(block_hash)
52-
}
53-
None => {
54-
// we don't have the hash, so let's just hash it
55-
Block::try_from(block).unwrap().seal_slow()
56-
}
57-
};
48+
let block_hash = block.header.hash;
49+
let block = Block::try_from(block.inner).unwrap().seal(block_hash);
5850

5951
next_block += 1;
6052
sender.send(block).await.unwrap();

‎bin/reth/src/commands/debug_cmd/build_block.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ impl Command {
224224
#[cfg(feature = "optimism")]
225225
reth_node_optimism::OptimismPayloadBuilderAttributes::try_new(
226226
best_block.hash(),
227-
reth_rpc_types::engine::OptimismPayloadAttributes {
227+
reth_rpc_types::optimism::OptimismPayloadAttributes {
228228
payload_attributes: payload_attrs,
229229
transactions: None,
230230
no_tx_pool: None,

‎crates/consensus/debug-client/src/client.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ pub trait BlockProvider: Send + Sync + 'static {
4747
None => return Ok(B256::default()),
4848
};
4949
let block = self.get_block(previous_block_number).await?;
50-
block.header.hash.ok_or_else(|| eyre::eyre!("previous block does not have hash"))
50+
Ok(block.header.hash)
5151
}
5252
}
5353
}
@@ -198,13 +198,13 @@ pub fn block_to_execution_payload_v3(block: Block) -> ExecutionNewPayload {
198198
receipts_root: block.header.receipts_root,
199199
logs_bloom: block.header.logs_bloom,
200200
prev_randao: block.header.mix_hash.unwrap(),
201-
block_number: block.header.number.unwrap(),
201+
block_number: block.header.number,
202202
gas_limit: block.header.gas_limit.try_into().unwrap(),
203203
gas_used: block.header.gas_used.try_into().unwrap(),
204204
timestamp: block.header.timestamp,
205205
extra_data: block.header.extra_data.clone(),
206206
base_fee_per_gas: block.header.base_fee_per_gas.unwrap().try_into().unwrap(),
207-
block_hash: block.header.hash.unwrap(),
207+
block_hash: block.header.hash,
208208
transactions: transactions
209209
.into_iter()
210210
.map(|tx| {

‎crates/consensus/debug-client/src/providers/etherscan.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ impl BlockProvider for EtherscanBlockProvider {
6363
continue
6464
}
6565
};
66-
let block_number = block.header.number.unwrap();
66+
let block_number = block.header.number;
6767
if Some(block_number) == last_block_number {
6868
continue;
6969
}

‎crates/consensus/debug-client/src/providers/rpc.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ impl BlockProvider for RpcBlockProvider {
3333

3434
while let Some(block) = stream.next().await {
3535
let full_block = ws_provider
36-
.get_block_by_hash(block.header.hash.unwrap(), BlockTransactionsKind::Full)
36+
.get_block_by_hash(block.header.hash, BlockTransactionsKind::Full)
3737
.await
3838
.expect("failed to get block")
3939
.expect("block not found");

‎crates/e2e-test-utils/src/lib.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,9 @@ where
5959
N::AddOns: NodeAddOns<
6060
Adapter<N>,
6161
EthApi: FullEthApiServer<
62-
NetworkTypes: Network<TransactionResponse = reth_rpc_types::Transaction>,
62+
NetworkTypes: Network<
63+
TransactionResponse = reth_rpc_types::WithOtherFields<reth_rpc_types::Transaction>,
64+
>,
6365
> + AddDevSigners
6466
+ EthApiBuilderProvider<Adapter<N>>,
6567
>,

‎crates/e2e-test-utils/src/node.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ use reth::{
1717
};
1818
use reth_node_builder::{EthApiTypes, NodeAddOns, NodeTypes};
1919
use reth_primitives::{BlockHash, BlockNumber, Bytes, B256};
20+
use reth_rpc_types::WithOtherFields;
2021
use reth_stages_types::StageId;
2122
use tokio_stream::StreamExt;
2223

@@ -94,7 +95,7 @@ where
9495
From<<Node::Engine as PayloadTypes>::BuiltPayload> + PayloadEnvelopeExt,
9596
AddOns::EthApi: EthApiSpec + EthTransactions + TraceExt,
9697
<AddOns::EthApi as EthApiTypes>::NetworkTypes:
97-
Network<TransactionResponse = alloy_rpc_types::Transaction>,
98+
Network<TransactionResponse = WithOtherFields<alloy_rpc_types::Transaction>>,
9899
{
99100
let mut chain = Vec::with_capacity(length as usize);
100101
for i in 0..length {

‎crates/e2e-test-utils/src/rpc.rs

+6-2
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ use reth::{
99
};
1010
use reth_node_builder::EthApiTypes;
1111
use reth_primitives::{Bytes, B256};
12+
use reth_rpc_types::WithOtherFields;
1213

1314
#[allow(missing_debug_implementations)]
1415
pub struct RpcTestContext<Node: FullNodeComponents, EthApi: EthApiTypes> {
@@ -19,8 +20,11 @@ impl<Node, EthApi> RpcTestContext<Node, EthApi>
1920
where
2021
Node: FullNodeComponents,
2122
EthApi: EthApiSpec
22-
+ EthTransactions<NetworkTypes: Network<TransactionResponse = alloy_rpc_types::Transaction>>
23-
+ TraceExt,
23+
+ EthTransactions<
24+
NetworkTypes: Network<
25+
TransactionResponse = WithOtherFields<alloy_rpc_types::Transaction>,
26+
>,
27+
> + TraceExt,
2428
{
2529
/// Injects a raw transaction into the node tx pool via RPC server
2630
pub async fn inject_tx(&self, raw_tx: Bytes) -> Result<B256, EthApi::Error> {

‎crates/e2e-test-utils/src/traits.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
use reth::rpc::types::{
2-
engine::{ExecutionPayloadEnvelopeV3, OptimismExecutionPayloadEnvelopeV3},
2+
engine::ExecutionPayloadEnvelopeV3, optimism::OptimismExecutionPayloadEnvelopeV3,
33
ExecutionPayloadV3,
44
};
55

‎crates/ethereum/evm/src/lib.rs

-6
Original file line numberDiff line numberDiff line change
@@ -203,9 +203,6 @@ mod tests {
203203
// Ensure that the logs database is empty
204204
assert!(evm.context.evm.inner.db.logs.is_empty());
205205

206-
// Ensure that there are no valid authorizations in the EVM context
207-
assert!(evm.context.evm.inner.valid_authorizations.is_empty());
208-
209206
// No Optimism
210207
assert_eq!(evm.handler.cfg, HandlerCfg { spec_id: SpecId::LATEST, ..Default::default() });
211208
}
@@ -357,9 +354,6 @@ mod tests {
357354
// Ensure that the logs database is empty
358355
assert!(evm.context.evm.inner.db.logs.is_empty());
359356

360-
// Ensure that there are no valid authorizations in the EVM context
361-
assert!(evm.context.evm.inner.valid_authorizations.is_empty());
362-
363357
// No Optimism
364358
assert_eq!(evm.handler.cfg, HandlerCfg { spec_id: SpecId::LATEST, ..Default::default() });
365359
}

‎crates/node/builder/src/builder/mod.rs

+5-2
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
pub mod add_ons;
66
mod states;
77

8+
use reth_rpc_types::WithOtherFields;
89
pub use states::*;
910

1011
use std::sync::Arc;
@@ -330,7 +331,7 @@ where
330331
>
331332
+ FullEthApiServer<
332333
NetworkTypes: alloy_network::Network<
333-
TransactionResponse = reth_rpc_types::Transaction
334+
TransactionResponse = WithOtherFields<reth_rpc_types::Transaction>,
334335
>,
335336
>
336337
+ AddDevSigners
@@ -479,7 +480,9 @@ where
479480
NodeAdapter<RethFullAdapter<DB, T>, CB::Components>,
480481
EthApi: EthApiBuilderProvider<NodeAdapter<RethFullAdapter<DB, T>, CB::Components>>
481482
+ FullEthApiServer<
482-
NetworkTypes: alloy_network::Network<TransactionResponse = reth_rpc_types::Transaction>,
483+
NetworkTypes: alloy_network::Network<
484+
TransactionResponse = WithOtherFields<reth_rpc_types::Transaction>,
485+
>,
483486
> + AddDevSigners,
484487
>,
485488
{

‎crates/node/builder/src/launch/engine.rs

+4-2
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ use reth_node_core::{
2727
use reth_node_events::{cl::ConsensusLayerHealthEvents, node};
2828
use reth_provider::providers::BlockchainProvider2;
2929
use reth_rpc_engine_api::{capabilities::EngineCapabilities, EngineApi};
30-
use reth_rpc_types::engine::ClientVersionV1;
30+
use reth_rpc_types::{engine::ClientVersionV1, WithOtherFields};
3131
use reth_tasks::TaskExecutor;
3232
use reth_tokio_util::EventSender;
3333
use reth_tracing::tracing::{debug, error, info};
@@ -67,7 +67,9 @@ where
6767
NodeAdapter<T, CB::Components>,
6868
EthApi: EthApiBuilderProvider<NodeAdapter<T, CB::Components>>
6969
+ FullEthApiServer<
70-
NetworkTypes: alloy_network::Network<TransactionResponse = reth_rpc_types::Transaction>,
70+
NetworkTypes: alloy_network::Network<
71+
TransactionResponse = WithOtherFields<reth_rpc_types::Transaction>,
72+
>,
7173
> + AddDevSigners,
7274
>,
7375
{

0 commit comments

Comments
 (0)