Merge branch 'feat/gossip-source' into feat/ci

Author: greged93

bin/bridge/Cargo.toml

@@ -64,6 +64,8 @@ reth-tracing = { git = "https://github.com/scroll-tech/reth.git" }
 # misc
 serde_json = { version = "1.0.94", default-features = false, features = ["alloc"] }
 
+[features]
+test-utils = []
 
 [[bin]]
 name = "bridge"

bin/bridge/assets/reth-mainnet.service

@@ -0,0 +1,17 @@
+[Unit]
+Description=Scroll Mainnet - Reth
+After=network.target
+StartLimitIntervalSec=0
+
+[Service]
+Type=simple
+Restart=always
+RestartSec=1
+User=ubuntu
+Group=ubuntu
+UMask=0002
+EnvironmentFile=/etc/bridge.env
+ExecStart=/usr/local/bin/bridge node --chain scroll-mainnet --metrics 0.0.0.0:9001 --debug.etherscan https://api.scrollscan.com/api
+
+[Install]
+WantedBy=multi-user.target

bin/bridge/src/import.rs

@@ -60,7 +60,7 @@ impl BridgeBlockImport {
             trace!(target: "bridge::import", peer_id = %peer_id, block = ?block, "Received new block from eth-wire protocol");
 
             // We trigger a new block event to be sent to the rollup node's network manager. If this
-            // results in an
+            // results in an error it means the network manager has been dropped.
             let _ =
                 self.to_scroll_network_manager.send(Event::NewBlock { peer_id, block, signature });
         } else {

bin/bridge/src/lib.rs

@@ -0,0 +1,7 @@
+//! Scroll Network Bridge Components.
+
+mod import;
+pub use import::BridgeBlockImport;
+
+mod network;
+pub use network::ScrollBridgeNetworkBuilder;

bin/bridge/src/main.rs

@@ -4,9 +4,6 @@ use network::ScrollBridgeNetworkBuilder;
 mod import;
 use import::BridgeBlockImport;
 
-#[cfg(test)]
-mod test;
-
 #[global_allocator]
 static ALLOC: reth_cli_util::allocator::Allocator = reth_cli_util::allocator::new_allocator();
 

bin/bridge/src/network.rs

@@ -16,10 +16,10 @@ pub struct ScrollBridgeNetworkBuilder {
         Option<Box<dyn reth_network::import::BlockImport<reth_scroll_primitives::ScrollBlock>>>,
 }
 
-#[cfg(test)]
 impl ScrollBridgeNetworkBuilder {
     /// Creates a new [`ScrollBridgeNetworkBuilder`] with the provided block import.
-    pub(crate) fn new(
+    #[cfg(feature = "test-utils")]
+    pub fn new(
         block_import: Box<
             dyn reth_network::import::BlockImport<reth_scroll_primitives::ScrollBlock>,
         >,

bin/bridge/src/test.rs bin/bridge/tests/e2e.rsbin/bridge/src/test.rs renamed to bin/bridge/tests/e2e.rs

@@ -1,3 +1,5 @@
+#![cfg(feature = "test-utils")]
+
 use alloy_primitives::B256;
 use reth_e2e_test_utils::{node::NodeTestContext, NodeHelperType};
 use reth_network::{NetworkConfigBuilder, PeersInfo};
@@ -204,7 +206,6 @@ impl BlockImport for TestBlockImport {
 
 // HELPERS
 // ---------------------------------------------------------------------------------------------
-
 pub async fn build_bridge_node(
     chain_spec: Arc<ScrollChainSpec>,
 ) -> eyre::Result<(NodeHelperType<ScrollNode>, TaskManager, PeerId)> {
@@ -236,9 +237,11 @@ pub async fn build_bridge_node(
     let NodeHandle { node, node_exit_future: _ } = NodeBuilder::new(node_config.clone())
         .testing_node(exec.clone())
         .with_types_and_provider::<ScrollNode, BlockchainProvider<_>>()
-        .with_components(node.components_builder().network(super::ScrollBridgeNetworkBuilder::new(
-            Box::new(ValidRethBlockImport::default()),
-        )))
+        .with_components(node.components_builder().network(
+            scroll_bridge::ScrollBridgeNetworkBuilder::new(Box::new(
+                ValidRethBlockImport::default(),
+            )),
+        ))
         .with_add_ons(node.add_ons())
         .launch()
         .await?;