feat: eth wire announce block (#298)

* eth wire announce block

* refactor EthWireProivder trait

* fix noop network api

Author: frisitano

crates/net/network-api/src/block.rs

@@ -1,5 +1,5 @@
 use super::*;
-use reth_primitives_traits::Block;
+use alloy_primitives::B256;
 use reth_tokio_util::EventStream;
 use tokio::sync::oneshot;
 
@@ -13,14 +13,14 @@ pub struct NewBlockWithPeer<B> {
 }
 
 /// Provides a listener for new blocks on the eth wire protocol.
-pub trait EthWireBlockListenerProvider {
-    /// The network primitives.
-    type Block: Block;
-
+pub trait EthWireProvider<N: NetworkPrimitives> {
     /// Create a new eth wire block listener.
     fn eth_wire_block_listener(
         &self,
     ) -> impl Future<
-        Output = Result<EventStream<NewBlockWithPeer<Self::Block>>, oneshot::error::RecvError>,
+        Output = Result<EventStream<NewBlockWithPeer<N::Block>>, oneshot::error::RecvError>,
     > + Send;
+
+    /// Announce a new block to the network over the eth wire protocol.
+    fn eth_wire_announce_block(&self, block: N::NewBlockPayload, hash: B256);
 }

crates/net/network-api/src/lib.rs

@@ -24,7 +24,7 @@ pub mod noop;
 pub mod block;
 
 pub mod test_utils;
-use block::EthWireBlockListenerProvider;
+use block::EthWireProvider;
 use test_utils::PeersHandleProvider;
 
 pub use alloy_rpc_types_admin::EthProtocolInfo;
@@ -58,7 +58,7 @@ pub trait FullNetwork:
     + NetworkEventListenerProvider
     + Peers
     + PeersHandleProvider
-    + EthWireBlockListenerProvider<Block = <Self::Primitives as NetworkPrimitives>::Block>
+    + EthWireProvider<Self::Primitives>
     + Clone
     + Unpin
     + 'static
@@ -73,7 +73,7 @@ impl<T> FullNetwork for T where
         + NetworkEventListenerProvider
         + Peers
         + PeersHandleProvider
-        + EthWireBlockListenerProvider<Block = <Self::Primitives as NetworkPrimitives>::Block>
+        + EthWireProvider<Self::Primitives>
         + Clone
         + Unpin
         + 'static

crates/net/network-api/src/noop.rs

@@ -7,7 +7,7 @@ use core::{fmt, marker::PhantomData};
 use std::net::{IpAddr, SocketAddr};
 
 use crate::{
-    block::{EthWireBlockListenerProvider, NewBlockWithPeer},
+    block::{EthWireProvider, NewBlockWithPeer},
     events::{NetworkPeersEvents, PeerEventStream},
     test_utils::{PeersHandle, PeersHandleProvider},
     BlockDownloaderProvider, DiscoveryEvent, NetworkError, NetworkEvent,
@@ -201,12 +201,18 @@ where
     }
 }
 
-impl<N: NetworkPrimitives> EthWireBlockListenerProvider for NoopNetwork<N> {
-    type Block = N::Block;
-
+impl<N: NetworkPrimitives> EthWireProvider<N> for NoopNetwork<N> {
     async fn eth_wire_block_listener(
         &self,
-    ) -> Result<EventStream<NewBlockWithPeer<Self::Block>>, RecvError> {
+    ) -> Result<EventStream<NewBlockWithPeer<N::Block>>, RecvError> {
+        unreachable!()
+    }
+
+    fn eth_wire_announce_block(
+        &self,
+        _block: <N as NetworkPrimitives>::NewBlockPayload,
+        _hash: alloy_primitives::B256,
+    ) {
         unreachable!()
     }
 }

crates/net/network/src/network.rs

@@ -14,7 +14,7 @@ use reth_eth_wire::{
 };
 use reth_ethereum_forks::Head;
 use reth_network_api::{
-    block::{EthWireBlockListenerProvider, NewBlockWithPeer},
+    block::{EthWireProvider, NewBlockWithPeer},
     events::{NetworkPeersEvents, PeerEvent, PeerEventStream},
     test_utils::{PeersHandle, PeersHandleProvider},
     BlockDownloaderProvider, DiscoveryEvent, NetworkError, NetworkEvent,
@@ -225,16 +225,18 @@ impl<N: NetworkPrimitives> NetworkEventListenerProvider for NetworkHandle<N> {
     }
 }
 
-impl<N: NetworkPrimitives> EthWireBlockListenerProvider for NetworkHandle<N> {
-    type Block = <N as NetworkPrimitives>::Block;
-
+impl<N: NetworkPrimitives> EthWireProvider<N> for NetworkHandle<N> {
     async fn eth_wire_block_listener(
         &self,
-    ) -> Result<EventStream<NewBlockWithPeer<Self::Block>>, oneshot::error::RecvError> {
+    ) -> Result<EventStream<NewBlockWithPeer<N::Block>>, oneshot::error::RecvError> {
         let (tx, rx) = oneshot::channel();
         self.send_message(NetworkHandleMessage::EthWireBlockListener(tx));
         rx.await
     }
+
+    fn eth_wire_announce_block(&self, block: N::NewBlockPayload, hash: B256) {
+        self.announce_block(block, hash)
+    }
 }
 
 impl<N: NetworkPrimitives> NetworkProtocols for NetworkHandle<N> {