Skip to content
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.

Sign up for GitHub

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

Jump to bottom

chore: replace reth-rpc-types by alloy-rpc-types #11071

Merged
merged 3 commits into from
Sep 21, 2024
Merged

chore: replace reth-rpc-types by alloy-rpc-types #11071

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
984bfc9
replace reth-rpc-types by alloy-rpc-types in reth-node-builder
greged93 Sep 20, 2024
ace8428
Merge branch 'main' into chore/node-builder-without-reth-rpc-types
mattsse Sep 21, 2024
e1ec107
cleanup
mattsse Sep 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion crates/node/builder/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ reth-rpc-builder.workspace = true
reth-rpc-engine-api.workspace = true
reth-rpc-eth-types.workspace = true
reth-rpc-layer.workspace = true
reth-rpc-types.workspace = true
reth-rpc.workspace = true
reth-stages.workspace = true
reth-static-file.workspace = true
Expand All @@ -61,6 +60,7 @@ reth-transaction-pool.workspace = true

## ethereum
alloy-primitives.workspace = true
alloy-rpc-types = { workspace = true, features = ["engine"] }
Copy link
Contributor Author

@greged93 greged93 Sep 20, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

I could also use alloy-rpc-types-eth, alloy-rpc-types-engine and alloy-serde instead. Don't know how granular you want to get.

Copy link
Collaborator

Choose a reason for hiding this comment

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

this is fine


## async
futures.workspace = true
Expand Down
6 changes: 3 additions & 3 deletions crates/node/builder/src/launch/common.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -925,9 +925,9 @@ where
// Verify that the healthy node is running the same chain as the current node.
let chain_id = futures::executor::block_on(async {
EthApiClient::<
reth_rpc_types::Transaction,
reth_rpc_types::Block,
reth_rpc_types::Receipt,
alloy_rpc_types::Transaction,
alloy_rpc_types::Block,
alloy_rpc_types::Receipt,
>::chain_id(&client)
.await
})?
Expand Down
2 changes: 1 addition & 1 deletion crates/node/builder/src/launch/engine.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
//! Engine node related functionality.

use alloy_rpc_types::engine::ClientVersionV1;
use futures::{future::Either, stream, stream_select, StreamExt};
use reth_beacon_consensus::{
hooks::{EngineHooks, StaticFileHook},
Expand Down Expand Up @@ -31,7 +32,6 @@ use reth_node_events::{cl::ConsensusLayerHealthEvents, node};
use reth_payload_primitives::PayloadBuilder;
use reth_provider::providers::BlockchainProvider2;
use reth_rpc_engine_api::{capabilities::EngineCapabilities, EngineApi};
use reth_rpc_types::engine::ClientVersionV1;
use reth_tasks::TaskExecutor;
use reth_tokio_util::EventSender;
use reth_tracing::tracing::{debug, error, info};
Expand Down
2 changes: 1 addition & 1 deletion crates/node/builder/src/launch/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ pub use exex::ExExLauncher;

use std::{future::Future, sync::Arc};

use alloy_rpc_types::engine::ClientVersionV1;
use futures::{future::Either, stream, stream_select, StreamExt};
use reth_beacon_consensus::{
hooks::{EngineHooks, PruneHook, StaticFileHook},
Expand All @@ -35,7 +36,6 @@ use reth_node_events::{cl::ConsensusLayerHealthEvents, node};
use reth_primitives::format_ether;
use reth_provider::providers::BlockchainProvider;
use reth_rpc_engine_api::{capabilities::EngineCapabilities, EngineApi};
use reth_rpc_types::engine::ClientVersionV1;
use reth_tasks::TaskExecutor;
use reth_tracing::tracing::{debug, info};
use reth_transaction_pool::TransactionPool;
Expand Down
Loading