Merge branch 'main' into feat/block-selection-policy

Author: 0xKitsune

.github/workflows/kurtosis_integration.yml

@@ -23,7 +23,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Setup Rust
-        uses: actions-rs/toolchain@v1
+        uses: dtolnay/rust-toolchain@stable
         with:
           toolchain: stable
           profile: minimal

.github/workflows/lint.yml

@@ -15,7 +15,7 @@ jobs:
           uses: actions/checkout@v2
 
         - name: Set up Rust
-          uses: actions-rs/toolchain@v1
+          uses: dtolnay/rust-toolchain@stable
           with:
             toolchain: stable
             override: true

.github/workflows/test.yml

@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: actions-rs/toolchain@v1
+      - uses: dtolnay/rust-toolchain@stable
         with:
           toolchain: stable
       - name: Install cargo-nextest

.github/workflows/websocket-proxy-ci.yaml

@@ -25,7 +25,7 @@ jobs:
           sudo apt-get install -y redis
 
       - name: Set up Rust
-        uses: actions-rs/toolchain@v1
+        uses: dtolnay/rust-toolchain@stable
         with:
           toolchain: stable
           override: true

README.md

@@ -18,12 +18,13 @@ cargo run -- [OPTIONS]
 - `--builder-url <URL>`: URL of the builder execution engine (required)
 - `--builder-jwt-token <TOKEN>`: JWT token for builder authentication (required)
 - `--builder-jwt-path <PATH>`: Path to the builder JWT secret file (required if `--builder-jwt-token` is not provided)
-- `--rpc-host <HOST>`: Host to run the server on (default: 0.0.0.0)
+- `--rpc-host <HOST>`: Host to run the server on (default: 127.0.0.1)
 - `--rpc-port <PORT>`: Port to run the server on (default: 8081)
 - `--tracing`: Enable tracing (default: false)
 - `--log-level <LEVEL>`: Log level (default: info)
 - `--log-format <FORMAT>`: Log format (default: text)
 - `--metrics`: Enable metrics (default: false)
+- `--metrics-host <METRICS_HOST>`: Host to run the metrics server on (default: 127.0.0.1)
 - `--debug-host <HOST>`: Host to run the server on (default: 127.0.0.1)
 - `--debug-server-port <PORT>`: Port to run the debug server on (default: 5555)
 

scripts/ci/stress.sh

@@ -58,7 +58,7 @@ run() {
     contender setup -p $PREFUNDED_PRIV_KEY "/tmp/scenario.toml" -r $ROLLUP_BOOST_SOCKET --optimism
 
     # Run the scenario on the builder
-    contender run -p $PREFUNDED_PRIV_KEY fill-block -r $OP_RETH_BUILDER_SOCKET --optimism
+    contender spam --tps 50 -p $PREFUNDED_PRIV_KEY -r $OP_RETH_BUILDER_SOCKET --optimism fill-block
 }
 
 clean() {

src/cli.rs

@@ -37,7 +37,7 @@ pub struct Args {
     pub max_unsafe_interval: u64,
 
     /// Host to run the server on
-    #[arg(long, env, default_value = "0.0.0.0")]
+    #[arg(long, env, default_value = "127.0.0.1")]
     pub rpc_host: String,
 
     /// Port to run the server on
@@ -53,7 +53,7 @@ pub struct Args {
     pub metrics: bool,
 
     /// Host to run the metrics server on
-    #[arg(long, env, default_value = "0.0.0.0")]
+    #[arg(long, env, default_value = "127.0.0.1")]
     pub metrics_host: String,
 
     /// Port to run the metrics server on
@@ -94,9 +94,7 @@ pub struct Args {
 
 impl Args {
     pub async fn run(self) -> eyre::Result<()> {
-        rustls::crypto::ring::default_provider()
-            .install_default()
-            .expect("Failed to install TLS ring CryptoProvider");
+        let _ = rustls::crypto::ring::default_provider().install_default();
 
         let debug_addr = format!("{}:{}", self.debug_host, self.debug_server_port);
 
@@ -107,7 +105,7 @@ impl Args {
                 Commands::Debug { command } => match command {
                     DebugCommands::SetExecutionMode { execution_mode } => {
                         let client = DebugClient::new(debug_addr.as_str())?;
-                        let result = client.set_execution_mode(execution_mode).await.unwrap();
+                        let result = client.set_execution_mode(execution_mode).await?;
                         println!("Response: {:?}", result.execution_mode);
 
                         Ok(())

src/client/auth.rs

@@ -77,12 +77,12 @@ pub fn secret_to_bearer_header(secret: &JwtSecret) -> HeaderValue {
             .encode(&Claims {
                 iat: SystemTime::now()
                     .duration_since(UNIX_EPOCH)
-                    .unwrap()
+                    .expect("Failed to get epoch time")
                     .as_secs(),
                 exp: None,
             })
-            .unwrap()
+            .expect("Failed to encode JWT claims")
     )
     .parse()
-    .unwrap()
+    .expect("Failed to parse JWT Header")
 }

src/client/rpc.rs

@@ -392,7 +392,7 @@ pub mod tests {
 
     use super::*;
 
-    const AUTH_ADDR: &str = "0.0.0.0";
+    const AUTH_ADDR: &str = "127.0.0.1";
     const SECRET: &str = "f79ae8046bc11c9927afe911db7143c51a806c4a537cc08e0d37140b0192f430";
 
     pub fn get_available_port() -> u16 {

src/health.rs

@@ -101,7 +101,7 @@ mod tests {
                 + 'static,
         {
             {
-                let listener = TcpListener::bind("0.0.0.0:0").await?;
+                let listener = TcpListener::bind("127.0.0.1:0").await?;
                 let addr = listener.local_addr()?;
 
                 let handle = tokio::spawn(async move {

src/lib.rs

@@ -32,4 +32,4 @@ mod payload;
 pub use payload::*;
 
 mod selection;
-pub use selection::*;
+pub use selection::*;

src/metrics.rs

@@ -46,12 +46,13 @@ async fn init_metrics_server(addr: SocketAddr, handle: PrometheusHandle) -> eyre
                             "/metrics" => Response::builder()
                                 .header("content-type", "text/plain")
                                 .body(HttpBody::from(handle.render()))
-                                .unwrap(),
+                                .expect("Failed to create metrics response"),
                             _ => Response::builder()
                                 .status(StatusCode::NOT_FOUND)
                                 .body(HttpBody::empty())
-                                .unwrap(),
+                                .expect("Failed to create not found response"),
                         };
+
                         async { Ok::<_, hyper::Error>(response) }
                     });
 

src/payload.rs

@@ -22,7 +22,7 @@ impl OpExecutionPayloadEnvelope {
             OpExecutionPayloadEnvelope::V4(_) => PayloadVersion::V4,
         }
     }
-
+  
     pub fn gas_used(&self) -> u64 {
         match self {
             OpExecutionPayloadEnvelope::V3(payload) => {

src/probe.rs

@@ -127,19 +127,19 @@ fn ok() -> HttpResponse<HttpBody> {
     HttpResponse::builder()
         .status(200)
         .body(HttpBody::from("OK"))
-        .unwrap()
+        .expect("Failed to create OK reponse")
 }
 
 fn partial_content() -> HttpResponse<HttpBody> {
     HttpResponse::builder()
         .status(206)
         .body(HttpBody::from("Partial Content"))
-        .unwrap()
+        .expect("Failed to create partial content response")
 }
 
 fn service_unavailable() -> HttpResponse<HttpBody> {
     HttpResponse::builder()
         .status(503)
         .body(HttpBody::from("Service Unavailable"))
-        .unwrap()
+        .expect("Failed to create service unavailable response")
 }

src/proxy.rs

@@ -206,7 +206,7 @@ mod tests {
                 // None,
             ));
 
-            let temp_listener = TcpListener::bind("0.0.0.0:0").await?;
+            let temp_listener = TcpListener::bind("127.0.0.1:0").await?;
             let server_addr = temp_listener.local_addr()?;
             drop(temp_listener);
 
@@ -247,7 +247,7 @@ mod tests {
 
     impl MockHttpServer {
         async fn serve() -> eyre::Result<Self> {
-            let listener = TcpListener::bind("0.0.0.0:0").await?;
+            let listener = TcpListener::bind("127.0.0.1:0").await?;
             let addr = listener.local_addr()?;
             let requests = Arc::new(Mutex::new(vec![]));
 

tests/common/mod.rs

@@ -8,6 +8,7 @@ use alloy_rpc_types_engine::{
 };
 use alloy_rpc_types_eth::BlockNumberOrTag;
 use bytes::BytesMut;
+use eyre::{Context, ContextCompat};
 use futures::FutureExt;
 use futures::future::BoxFuture;
 use jsonrpsee::http_client::{HttpClient, transport::HttpBackend};
@@ -82,7 +83,7 @@ impl EngineApi {
         let client = jsonrpsee::http_client::HttpClientBuilder::default()
             .set_http_middleware(middleware)
             .build(url)
-            .expect("Failed to create http client");
+            .context("Failed to create http client")?;
 
         Ok(Self {
             engine_api_client: client,
@@ -411,7 +412,7 @@ impl SimpleBlockGenerator {
 
     /// Initialize the block generator by fetching the latest block
     pub async fn init(&mut self) -> eyre::Result<()> {
-        let latest_block = self.engine_api.latest().await?.expect("block not found");
+        let latest_block = self.engine_api.latest().await?.context("block not found")?;
         self.latest_hash = latest_block.header.hash;
         self.timestamp = latest_block.header.timestamp;
         Ok(())
@@ -470,7 +471,7 @@ impl SimpleBlockGenerator {
             )
             .await?;
 
-        let payload_id = result.payload_id.expect("missing payload id");
+        let payload_id = result.payload_id.context("missing payload id")?;
 
         if !empty_blocks {
             tokio::time::sleep(tokio::time::Duration::from_secs(1)).await;
@@ -505,7 +506,7 @@ impl SimpleBlockGenerator {
             .validator
             .get_block_creator(new_block_hash)
             .await?
-            .expect("block creator not found");
+            .context("block creator not found")?;
 
         Ok((new_block_hash, block_creator))
     }