Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
96 changes: 61 additions & 35 deletions Cargo.lock

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

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -502,7 +502,7 @@ revm-inspectors = "0.29.0"

# eth
alloy-chains = { version = "0.2.5", default-features = false }
alloy-dyn-abi = "1.3.1"
alloy-dyn-abi = "1.4.1"
alloy-eip2124 = { version = "0.2.0", default-features = false }
alloy-evm = { version = "0.21.2", default-features = false }
alloy-primitives = { version = "1.3.1", default-features = false, features = ["map-foldhash"] }
Expand Down
2 changes: 1 addition & 1 deletion crates/chain-state/src/in_memory.rs
Original file line number Diff line number Diff line change
Expand Up @@ -570,7 +570,7 @@ pub struct BlockState<N: NodePrimitives = EthPrimitives> {
/// The executed block that determines the state after this block has been executed.
block: ExecutedBlockWithTrieUpdates<N>,
/// The block's parent block if it exists.
parent: Option<Arc<BlockState<N>>>,
parent: Option<Arc<Self>>,
}

impl<N: NodePrimitives> BlockState<N> {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -510,7 +510,7 @@ where
Box::pin(async move {
let mut accepted_check: bool = false;

let mut latest_block = env
let latest_block = env
.current_block_info()
.ok_or_else(|| eyre::eyre!("No latest block information available"))?;

Expand Down Expand Up @@ -603,10 +603,6 @@ where
rpc_latest_header.inner.timestamp;
env.active_node_state_mut()?.latest_fork_choice_state.head_block_hash =
rpc_latest_header.hash;

// update local copy for any further usage in this scope
latest_block.hash = rpc_latest_header.hash;
latest_block.number = rpc_latest_header.inner.number;
}
}

Expand Down
2 changes: 1 addition & 1 deletion crates/net/discv4/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2402,7 +2402,7 @@ pub enum DiscoveryUpdate {
/// Node that was removed from the table
Removed(PeerId),
/// A series of updates
Batch(Vec<DiscoveryUpdate>),
Batch(Vec<Self>),
}

#[cfg(test)]
Expand Down
4 changes: 1 addition & 3 deletions crates/net/network/src/transactions/fetcher.rs
Original file line number Diff line number Diff line change
Expand Up @@ -284,9 +284,7 @@ impl<N: NetworkPrimitives> TransactionFetcher<N> {

// folds size based on expected response size and adds selected hashes to the request
// list and the other hashes to the surplus list
loop {
let Some((hash, metadata)) = hashes_from_announcement_iter.next() else { break };

for (hash, metadata) in hashes_from_announcement_iter.by_ref() {
let Some((_ty, size)) = metadata else {
unreachable!("this method is called upon reception of an eth68 announcement")
};
Expand Down
1 change: 1 addition & 0 deletions crates/node/builder/src/launch/engine.rs
Original file line number Diff line number Diff line change
Expand Up @@ -237,6 +237,7 @@ impl EngineNodeLauncher {

info!(target: "reth::cli", "Consensus engine initialized");

#[allow(clippy::needless_continue)]
let events = stream_select!(
event_sender.new_listener().map(Into::into),
pipeline_events.map(Into::into),
Expand Down
2 changes: 1 addition & 1 deletion crates/node/builder/src/node.rs
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ where
/// Returns the [`EngineApiClient`] interface for the authenticated engine API.
///
/// This will send authenticated http requests to the node's auth server.
pub fn engine_http_client(&self) -> impl EngineApiClient<Engine> {
pub fn engine_http_client(&self) -> impl EngineApiClient<Engine> + use<Engine, Node, AddOns> {
self.auth_server_handle().http_client()
}

Expand Down
4 changes: 3 additions & 1 deletion crates/rpc/rpc-builder/src/auth.rs
Original file line number Diff line number Diff line change
Expand Up @@ -354,7 +354,9 @@ impl AuthServerHandle {
/// Returns a http client connected to the server.
///
/// This client uses the JWT token to authenticate requests.
pub fn http_client(&self) -> impl SubscriptionClientT + Clone + Send + Sync + Unpin + 'static {
pub fn http_client(
&self,
) -> impl SubscriptionClientT + use<> + Clone + Send + Sync + Unpin + 'static {
// Create a middleware that adds a new JWT token to every request.
let secret_layer = AuthClientLayer::new(self.secret);
let middleware = tower::ServiceBuilder::default().layer(secret_layer);
Expand Down
2 changes: 1 addition & 1 deletion crates/transaction-pool/src/test_utils/pool.rs
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ pub(crate) enum Scenario {
HigherNonce { onchain: u64, nonce: u64 },
Multi {
// Execute multiple test scenarios
scenario: Vec<Scenario>,
scenario: Vec<Self>,
},
}

Expand Down
Loading