merge conflicts

Author: avalonche

Cargo.lock

@@ -4,12 +4,10 @@ resolver = "3"
 members = [
     "crates/rollup-boost",
     "crates/websocket-proxy",
-    "crates/rollup-boost-types",
 ]
 
 [workspace.dependencies]
 rollup-boost = { path = "crates/rollup-boost" }
-rollup-boost-types = { path = "crates/rollup-boost-types" }
 
 backoff = "0.4.0"
 clap = { version = "4", features = ["derive", "env"] }

Cargo.toml

@@ -5,7 +5,6 @@ edition = "2024"
 license = "MIT"
 
 [dependencies]
-rollup-boost-types.workspace = true
 tracing.workspace = true
 tracing-subscriber.workspace = true
 clap.workspace = true

crates/rollup-boost-types/Cargo.toml

@@ -4,6 +4,7 @@ use std::{net::SocketAddr, path::PathBuf};
 use tokio::signal::unix::{SignalKind, signal as unix_signal};
 use tracing::{Level, info};
 
+use crate::payload::PayloadSource;
 use crate::{
     BlockSelectionPolicy, ClientArgs, DebugServer, FlashblocksArgs, ProxyLayer, RollupBoostServer,
     client::rpc::{BuilderArgs, L2ClientArgs},
@@ -12,7 +13,6 @@ use crate::{
     probe::ProbeLayer,
 };
 use crate::{FlashblocksService, RpcClient};
-use rollup_boost_types::payload::PayloadSource;
 
 #[derive(Clone, Debug, clap::Args)]
 pub struct RollupBoostLibArgs {

crates/rollup-boost-types/src/lib.rs

@@ -1,6 +1,7 @@
 use std::time::Duration;
 
 use crate::client::auth::AuthLayer;
+use crate::payload::PayloadSource;
 use alloy_primitives::bytes::Bytes;
 use alloy_rpc_types_engine::JwtSecret;
 use http::Uri;
@@ -13,7 +14,6 @@ use hyper_util::rt::TokioExecutor;
 use jsonrpsee::core::BoxError;
 use jsonrpsee::server::HttpBody;
 use opentelemetry::trace::SpanKind;
-use rollup_boost_types::payload::PayloadSource;
 use tower::{
     Service as _, ServiceBuilder, ServiceExt,
     timeout::{Timeout, TimeoutLayer},

crates/rollup-boost/Cargo.toml

@@ -1,6 +1,7 @@
 use crate::EngineApiExt;
 use crate::client::auth::AuthLayer;
 use crate::client::http::HttpClient as RollupBoostHttpClient;
+use crate::payload::{NewPayload, OpExecutionPayloadEnvelope, PayloadSource, PayloadVersion};
 use crate::server::EngineApiClient;
 use crate::version::{CARGO_PKG_VERSION, VERGEN_GIT_SHA};
 use alloy_primitives::{B256, Bytes};
@@ -23,9 +24,6 @@ use op_alloy_rpc_types_engine::{
 };
 use opentelemetry::trace::SpanKind;
 use paste::paste;
-use rollup_boost_types::payload::{
-    NewPayload, OpExecutionPayloadEnvelope, PayloadSource, PayloadVersion,
-};
 use std::path::PathBuf;
 use std::time::Duration;
 use thiserror::Error;
@@ -478,12 +476,12 @@ pub mod tests {
     use jsonrpsee::core::client::ClientT;
     use parking_lot::Mutex;
 
+    use crate::payload::PayloadSource;
     use alloy_rpc_types_engine::JwtSecret;
     use jsonrpsee::core::client::Error as ClientError;
     use jsonrpsee::server::{ServerBuilder, ServerHandle};
     use jsonrpsee::{RpcModule, rpc_params};
     use predicates::prelude::*;
-    use rollup_boost_types::payload::PayloadSource;
     use std::collections::HashSet;
     use std::net::SocketAddr;
     use std::net::TcpListener;

crates/rollup-boost/src/cli.rs

@@ -4,7 +4,7 @@ use jsonrpsee::core::async_trait;
 use op_alloy_rpc_types_engine::OpPayloadAttributes;
 
 use crate::ClientResult;
-use rollup_boost_types::payload::{NewPayload, OpExecutionPayloadEnvelope, PayloadVersion};
+use crate::payload::{NewPayload, OpExecutionPayloadEnvelope, PayloadVersion};
 
 #[async_trait]
 pub trait EngineApiExt: Send + Sync + 'static {

crates/rollup-boost/src/client/http.rs

@@ -5,7 +5,6 @@ use backoff::backoff::Backoff;
 use bytes::Bytes;
 use futures::{SinkExt, StreamExt};
 use lru::LruCache;
-use std::io::ErrorKind::TimedOut;
 use op_alloy_rpc_types_engine::OpFlashblockPayload;
 use std::io::ErrorKind::TimedOut;
 use std::num::NonZeroUsize;