feat: NetworkHandle support announce block to peer (#377)

* feat: NetworkHandle support announce block to peer

* update comment

* remove unused file

* fix clippy

* fix deny

* fix deny

* fix: comment

* fix: fmt

* update cargo deny

---------

Co-authored-by: frisitano <[email protected]>

Author: yiweichi

crates/era-downloader/src/fs.rs

@@ -43,7 +43,7 @@ pub fn read_dir(
         .collect::<eyre::Result<Vec<_>>>()?;
     let mut checksums = checksums.ok_or_eyre("Missing file `checksums.txt` in the `dir`")?;
 
-    entries.sort_by(|(left, _), (right, _)| left.cmp(right));
+    entries.sort_by_key(|(left, _)| *left);
 
     Ok(stream::iter(entries.into_iter().skip(start_from as usize / BLOCKS_PER_FILE).map(
         move |(_, path)| {

crates/net/discv4/src/lib.rs

@@ -1628,7 +1628,7 @@ impl Discv4Service {
             .filter(|entry| entry.node.value.is_expired())
             .map(|n| n.node.value)
             .collect::<Vec<_>>();
-        nodes.sort_by(|a, b| a.last_seen.cmp(&b.last_seen));
+        nodes.sort_by_key(|a| a.last_seen);
         let to_ping = nodes.into_iter().map(|n| n.record).take(MAX_NODES_PING).collect::<Vec<_>>();
         for node in to_ping {
             self.try_ping(node, PingReason::RePing)

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

@@ -23,4 +23,12 @@ pub trait EthWireProvider<N: NetworkPrimitives> {
 
     /// Announce a new block to the network over the eth wire protocol.
     fn eth_wire_announce_block(&self, block: N::NewBlockPayload, hash: B256);
+
+    /// Announce a new block to a specific peer over the eth wire protocol.
+    fn eth_wire_announce_block_to_peer(
+        &self,
+        peer_id: PeerId,
+        block: N::NewBlockPayload,
+        hash: B256,
+    );
 }

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

@@ -223,6 +223,15 @@ impl<N: NetworkPrimitives> EthWireProvider<N> for NoopNetwork<N> {
     ) {
         unreachable!()
     }
+
+    fn eth_wire_announce_block_to_peer(
+        &self,
+        _peer_id: PeerId,
+        _block: <N as NetworkPrimitives>::NewBlockPayload,
+        _hash: alloy_primitives::B256,
+    ) {
+        unreachable!()
+    }
 }
 
 impl<Net> NetworkPeersEvents for NoopNetwork<Net>

crates/net/network/src/network.rs

@@ -1,6 +1,10 @@
 use crate::{
-    config::NetworkMode, message::PeerMessage, protocol::RlpxSubProtocol,
-    swarm::NetworkConnectionState, transactions::TransactionsHandle, FetchClient,
+    config::NetworkMode,
+    message::{NewBlockMessage, PeerMessage},
+    protocol::RlpxSubProtocol,
+    swarm::NetworkConnectionState,
+    transactions::TransactionsHandle,
+    FetchClient,
 };
 use alloy_primitives::B256;
 use enr::Enr;
@@ -237,6 +241,16 @@ impl<N: NetworkPrimitives> EthWireProvider<N> for NetworkHandle<N> {
     fn eth_wire_announce_block(&self, block: N::NewBlockPayload, hash: B256) {
         self.announce_block(block, hash)
     }
+
+    fn eth_wire_announce_block_to_peer(
+        &self,
+        peer_id: PeerId,
+        block: N::NewBlockPayload,
+        hash: B256,
+    ) {
+        let msg = NewBlockMessage { hash, block: Arc::new(block) };
+        self.send_eth_message(peer_id, PeerMessage::NewBlock(msg))
+    }
 }
 
 impl<N: NetworkPrimitives> NetworkProtocols for NetworkHandle<N> {

crates/scroll/alloy/evm/src/block/curie.rs

@@ -151,7 +151,7 @@ mod tests {
 
         // check oracle storage changeset
         let mut storage = oracle.storage.into_iter().collect::<Vec<(U256, StorageSlot)>>();
-        storage.sort_by(|(a, _), (b, _)| a.cmp(b));
+        storage.sort_by_key(|(a, _)| *a);
         for (got, expected) in storage.into_iter().zip(CURIE_L1_GAS_PRICE_ORACLE_STORAGE) {
             assert_eq!(got.0, expected.0);
             assert_eq!(got.1, StorageSlot { present_value: expected.1, ..Default::default() });

crates/scroll/alloy/evm/src/block/feynman.rs

@@ -148,7 +148,7 @@ mod tests {
 
         // check oracle storage changeset
         let mut storage = oracle.storage.into_iter().collect::<Vec<(U256, StorageSlot)>>();
-        storage.sort_by(|(a, _), (b, _)| a.cmp(b));
+        storage.sort_by_key(|(a, _)| *a);
         for (got, expected) in storage.into_iter().zip(FEYNMAN_L1_GAS_PRICE_ORACLE_STORAGE) {
             assert_eq!(got.0, expected.0);
             assert_eq!(got.1, StorageSlot { present_value: expected.1, ..Default::default() });

crates/scroll/alloy/evm/src/block/galileo_v2.rs

@@ -148,7 +148,7 @@ mod tests {
 
         // check oracle storage changeset
         let mut storage = oracle.storage.into_iter().collect::<Vec<(U256, StorageSlot)>>();
-        storage.sort_by(|(a, _), (b, _)| a.cmp(b));
+        storage.sort_by_key(|(a, _)| *a);
         for (got, expected) in storage.into_iter().zip(GALILEO_V2_L1_GAS_PRICE_ORACLE_STORAGE) {
             assert_eq!(got.0, expected.0);
             assert_eq!(got.1, StorageSlot { present_value: expected.1, ..Default::default() });

crates/scroll/evm/src/execute.rs

@@ -446,7 +446,7 @@ mod tests {
 
         // check oracle contract contains storage changeset
         let mut storage = oracle.storage.into_iter().collect::<Vec<(U256, StorageSlot)>>();
-        storage.sort_by(|(a, _), (b, _)| a.cmp(b));
+        storage.sort_by_key(|(a, _)| *a);
         for (got, expected) in storage.into_iter().zip(CURIE_L1_GAS_PRICE_ORACLE_STORAGE) {
             assert_eq!(got.0, expected.0);
             assert_eq!(got.1, StorageSlot { present_value: expected.1, ..Default::default() });

crates/stages/stages/src/stages/hashing_account.rs

@@ -99,7 +99,7 @@ impl AccountHashingStage {
             // Account State generator
             let mut account_cursor =
                 provider.tx_ref().cursor_write::<tables::PlainAccountState>()?;
-            accounts.sort_by(|a, b| a.0.cmp(&b.0));
+            accounts.sort_by_key(|a| a.0);
             for (addr, acc) in &accounts {
                 account_cursor.append(*addr, acc)?;
             }