Merge pull request #120 from worldcoin/forerunner/deadlock-fix

Better LRU and Fix for Deadlock

Author: avalonche

Cargo.lock

@@ -1,7 +1,7 @@
 [package]
 name = "rollup-boost"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 
 [dependencies]
 op-alloy-rpc-types-engine = "0.7.3"
@@ -18,7 +18,7 @@ serde = { version = "1", features = ["derive"] }
 thiserror = "1.0"
 clap = { version = "4", features = ["derive", "env"] }
 jsonrpsee = { version = "0.24", features = ["server", "http-client", "macros"] }
-lru = "0.10.0"
+moka = { version = "0.12.10", features = ["sync"] }
 reqwest = "0.12.5"
 http = "1.1.0"
 dotenv = "0.15.0"
@@ -28,7 +28,7 @@ http-body-util = "0.1.2"
 hyper = { version = "1.4.1", features = ["full"] }
 hyper-util = { version = "0.1", features = ["full"] }
 hyper-rustls = { version = "0.27.0", features = ["ring"] }
-rustls = {version = "0.23.23", features = ["ring"] }
+rustls = { version = "0.23.23", features = ["ring"] }
 serde_json = "1.0.96"
 opentelemetry = { version = "0.26.0", features = ["trace"] }
 opentelemetry-http = "0.26.0"
@@ -54,6 +54,7 @@ paste = "1.0.15"
 time = { version = "0.3.36", features = ["macros", "formatting", "parsing"] }
 futures-util = "0.3.31"
 lazy_static = "1.5.0"
+parking_lot = "0.12.3"
 
 [dev-dependencies]
 anyhow = "1.0"

Cargo.toml

@@ -1,6 +1,6 @@
 // From reth_rpc_layer
 use alloy_rpc_types_engine::{Claims, JwtSecret};
-use http::{header::AUTHORIZATION, HeaderValue};
+use http::{HeaderValue, header::AUTHORIZATION};
 use std::{
     task::{Context, Poll},
     time::{Duration, SystemTime, UNIX_EPOCH},

src/auth_layer.rs

@@ -6,7 +6,7 @@ use alloy_rpc_types_engine::{
     ExecutionPayload, ExecutionPayloadV3, ForkchoiceState, ForkchoiceUpdated, JwtError, JwtSecret,
     PayloadId, PayloadStatus,
 };
-use clap::{arg, Parser};
+use clap::{Parser, arg};
 use http::{StatusCode, Uri};
 use jsonrpsee::core::{ClientError, RpcResult};
 use jsonrpsee::http_client::transport::HttpBackend;

src/client.rs

@@ -1,10 +1,10 @@
-use jsonrpsee::core::{async_trait, RpcResult};
+use jsonrpsee::core::{RpcResult, async_trait};
 use jsonrpsee::http_client::HttpClient;
 use jsonrpsee::proc_macros::rpc;
 use jsonrpsee::server::Server;
+use parking_lot::Mutex;
 use serde::{Deserialize, Serialize};
 use std::sync::Arc;
-use tokio::sync::Mutex;
 
 use crate::server::ExecutionMode;
 
@@ -57,6 +57,14 @@ impl DebugServer {
 
         Ok(())
     }
+
+    pub fn execution_mode(&self) -> ExecutionMode {
+        *self.execution_mode.lock()
+    }
+
+    pub fn set_execution_mode(&self, mode: ExecutionMode) {
+        *self.execution_mode.lock() = mode;
+    }
 }
 
 #[async_trait]
@@ -65,8 +73,7 @@ impl DebugApiServer for DebugServer {
         &self,
         request: SetExecutionModeRequest,
     ) -> RpcResult<SetExecutionModeResponse> {
-        let mut execution_mode = self.execution_mode.lock().await;
-        *execution_mode = request.execution_mode.clone();
+        self.set_execution_mode(request.execution_mode);
 
         tracing::info!("Set execution mode to {:?}", request.execution_mode);
 
@@ -76,9 +83,8 @@ impl DebugApiServer for DebugServer {
     }
 
     async fn get_execution_mode(&self) -> RpcResult<GetExecutionModeResponse> {
-        let execution_mode = self.execution_mode.lock().await;
         Ok(GetExecutionModeResponse {
-            execution_mode: execution_mode.clone(),
+            execution_mode: self.execution_mode(),
         })
     }
 }
@@ -121,7 +127,7 @@ mod tests {
         let execution_mode = Arc::new(Mutex::new(ExecutionMode::Enabled));
 
         let server = DebugServer::new(execution_mode.clone());
-        let _ = server.run(DEFAULT_ADDR).await.unwrap();
+        server.run(DEFAULT_ADDR).await.unwrap();
 
         let client = DebugClient::new(format!("http://{}", DEFAULT_ADDR).as_str()).unwrap();
 

src/debug_api.rs

@@ -9,11 +9,11 @@ use alloy_rpc_types_engine::{
     ExecutionPayloadV3, ForkchoiceState, ForkchoiceUpdated, PayloadAttributes, PayloadId,
     PayloadStatus, PayloadStatusEnum,
 };
-use jsonrpsee::http_client::{transport::HttpBackend, HttpClient};
+use jsonrpsee::http_client::{HttpClient, transport::HttpBackend};
 use jsonrpsee::proc_macros::rpc;
 use lazy_static::lazy_static;
 use op_alloy_rpc_types_engine::{OpExecutionPayloadEnvelopeV3, OpPayloadAttributes};
-use proxy::{start_proxy_server, DynHandlerFn};
+use proxy::{DynHandlerFn, start_proxy_server};
 use serde_json::Value;
 use std::collections::{HashMap, HashSet};
 use std::path::{Path, PathBuf};
@@ -28,7 +28,7 @@ use std::{
     time::{Duration, SystemTime},
 };
 use thiserror::Error;
-use time::{format_description, OffsetDateTime};
+use time::{OffsetDateTime, format_description};
 
 /// Default JWT token for testing purposes
 pub const DEFAULT_JWT_TOKEN: &str =
@@ -551,7 +551,7 @@ pub struct RollupBoostTestHarness {
 /// Test node P2P configuration (private_key, enode_address)
 pub const TEST_NODE_P2P_ADDR: (&str, &str) = (
     "a11ac89899cd86e36b6fb881ec1255b8a92a688790b7d950f8b7d8dd626671fb",
-    "3479db4d9217fb5d7a8ed4d61ac36e120b05d36c2eefb795dc42ff2e971f251a2315f5649ea1833271e020b9adc98d5db9973c7ed92d6b2f1f2223088c3d852f"
+    "3479db4d9217fb5d7a8ed4d61ac36e120b05d36c2eefb795dc42ff2e971f251a2315f5649ea1833271e020b9adc98d5db9973c7ed92d6b2f1f2223088c3d852f",
 );
 
 const PROXY_START_PORT: u16 = 4444;

src/integration/mod.rs

@@ -1,6 +1,6 @@
 use bytes::Bytes;
 use http::header;
-use http_body_util::{combinators::BoxBody, BodyExt, Full};
+use http_body_util::{BodyExt, Full, combinators::BoxBody};
 use hyper::client::conn::http1::Builder;
 use hyper::server::conn::http1;
 use hyper::service::service_fn;

src/integration/proxy.rs

@@ -1,4 +1,4 @@
-use clap::{arg, Parser, Subcommand};
+use clap::{Parser, Subcommand, arg};
 use client::{BuilderArgs, ExecutionClient, L2ClientArgs};
 use debug_api::DebugClient;
 use metrics::{ClientMetrics, ServerMetrics};
@@ -10,22 +10,22 @@ use dotenv::dotenv;
 use eyre::bail;
 use http::StatusCode;
 use hyper::service::service_fn;
-use hyper::{server::conn::http1, Request, Response};
+use hyper::{Request, Response, server::conn::http1};
 use hyper_util::rt::TokioIo;
+use jsonrpsee::RpcModule;
 use jsonrpsee::http_client::HttpBody;
 use jsonrpsee::server::Server;
-use jsonrpsee::RpcModule;
 use metrics_exporter_prometheus::{PrometheusBuilder, PrometheusHandle};
 use metrics_util::layers::{PrefixLayer, Stack};
 use opentelemetry::global;
 use opentelemetry_otlp::WithExportConfig;
-use opentelemetry_sdk::{propagation::TraceContextPropagator, trace::Config, Resource};
+use opentelemetry_sdk::{Resource, propagation::TraceContextPropagator, trace::Config};
 use proxy::ProxyLayer;
 use server::{PayloadSource, RollupBoostServer};
 
 use tokio::net::TcpListener;
-use tokio::signal::unix::{signal as unix_signal, SignalKind};
-use tracing::{error, info, Level};
+use tokio::signal::unix::{SignalKind, signal as unix_signal};
+use tracing::{Level, error, info};
 use tracing_subscriber::EnvFilter;
 
 mod auth_layer;
@@ -369,10 +369,10 @@ mod tests {
     use crate::auth_layer::AuthClientService;
     use crate::server::PayloadSource;
     use alloy_rpc_types_engine::JwtSecret;
+    use jsonrpsee::RpcModule;
+    use jsonrpsee::http_client::HttpClient;
     use jsonrpsee::http_client::transport::Error as TransportError;
     use jsonrpsee::http_client::transport::HttpBackend;
-    use jsonrpsee::http_client::HttpClient;
-    use jsonrpsee::RpcModule;
     use jsonrpsee::{
         core::ClientError,
         rpc_params,

src/main.rs

@@ -1,6 +1,6 @@
 use std::time::Duration;
 
-use metrics::{counter, histogram, Counter, Histogram};
+use metrics::{Counter, Histogram, counter, histogram};
 use metrics_derive::Metrics;
 
 use crate::server::PayloadSource;