jleony/nanoreth
1
0
Fork 0
mirror of https://github.com/hl-archive-node/nanoreth.git synced 2025-12-06 10:59:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: clear reth rpc types from reth binary (#11120)

Browse Source
This commit is contained in:
greged93
2024-09-23 10:50:24 +02:00
committed by GitHub
parent 242a3ab06b
commit 560b061e5e
8 changed files with 9 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.lock generated
View File

@ -6175,6 +6175,7 @@ name = "reth"
version = "1.0.7"
dependencies = [
"alloy-rlp",
"alloy-rpc-types",
"aquamarine",
"backon",
"clap",
@ -6223,7 +6224,6 @@ dependencies = [
"reth-rpc-builder",
"reth-rpc-eth-types",
"reth-rpc-server-types",
"reth-rpc-types",
"reth-rpc-types-compat",
"reth-stages",
"reth-static-file",

2
bin/reth/Cargo.toml
View File

@ -37,7 +37,6 @@ reth-consensus-common.workspace = true
reth-blockchain-tree.workspace = true
reth-rpc-builder.workspace = true
reth-rpc.workspace = true
reth-rpc-types.workspace = true
reth-rpc-types-compat.workspace = true
reth-rpc-api = { workspace = true, features = ["client"] }
reth-rpc-eth-types.workspace = true
@ -68,6 +67,7 @@ reth-prune.workspace = true
# crypto
alloy-rlp.workspace = true
alloy-rpc-types = { workspace = true, features = ["engine"] }
# tracing
tracing.workspace = true

2
bin/reth/src/commands/debug_cmd/build_block.rs
View File

@ -1,5 +1,6 @@
//! Command for debugging block building.
use alloy_rlp::Decodable;
use alloy_rpc_types::engine::{BlobsBundleV1, PayloadAttributes};
use clap::Parser;
use eyre::Context;
use reth_basic_payload_builder::{
@ -31,7 +32,6 @@ use reth_provider::{
ProviderFactory, StageCheckpointReader, StateProviderFactory,
};
use reth_revm::{database::StateProviderDatabase, primitives::EnvKzgSettings};
use reth_rpc_types::engine::{BlobsBundleV1, PayloadAttributes};
use reth_stages::StageId;
use reth_transaction_pool::{
blobstore::InMemoryBlobStore, BlobStore, EthPooledTransaction, PoolConfig, TransactionOrigin,

4
bin/reth/src/lib.rs
View File

@ -151,9 +151,9 @@ pub mod rpc {
pub use reth_rpc_builder::*;
}
/// Re-exported from `reth_rpc_types`.
/// Re-exported from `alloy_rpc_types`.
pub mod types {
pub use reth_rpc_types::*;
pub use alloy_rpc_types::*;
}
/// Re-exported from `reth_rpc_server_types`.

7
crates/e2e-test-utils/src/network.rs
View File

@ -1,9 +1,6 @@
use futures_util::StreamExt;
use reth::{
network::{NetworkEvent, NetworkEventListenerProvider, PeersHandleProvider, PeersInfo},
rpc::types::PeerId,
};
use reth_network_peers::NodeRecord;
use reth::network::{NetworkEvent, NetworkEventListenerProvider, PeersHandleProvider, PeersInfo};
use reth_network_peers::{NodeRecord, PeerId};
use reth_tokio_util::EventStream;
use reth_tracing::tracing::info;

2
crates/e2e-test-utils/src/traits.rs
View File

@ -1,5 +1,5 @@
use op_alloy_rpc_types_engine::OptimismExecutionPayloadEnvelopeV3;
use reth::rpc::types::{engine::ExecutionPayloadEnvelopeV3, ExecutionPayloadV3};
use reth::rpc::types::engine::{ExecutionPayloadEnvelopeV3, ExecutionPayloadV3};
/// The execution payload envelope type.
pub trait PayloadEnvelopeExt: Send + Sync + std::fmt::Debug {

3
crates/rpc/rpc-types/src/lib.rs
View File

@ -12,9 +12,6 @@
#[allow(hidden_glob_reexports)]
mod eth;
/// Alias for a peer identifier
pub type PeerId = alloy_primitives::B512;
// Ethereum specific rpc types related to typed transaction requests and the engine API.
#[cfg(feature = "jsonrpsee-types")]
pub use eth::error::ToRpcError;

3
examples/custom-rlpx-subprotocol/src/subprotocol/connection/handler.rs
View File

@ -6,8 +6,7 @@ use reth_eth_wire::{
capability::SharedCapabilities, multiplex::ProtocolConnection, protocol::Protocol,
};
use reth_network::protocol::{ConnectionHandler, OnNotSupported};
use reth_network_api::Direction;
use reth_rpc_types::PeerId;
use reth_network_api::{Direction, PeerId};
use tokio::sync::mpsc;
use tokio_stream::wrappers::UnboundedReceiverStream;