Merge branch 'scroll' into feat/scroll-alloy-provider

Signed-off-by: Gregory Edison <[email protected]>

.github/workflows/lint.yml

@@ -195,7 +195,7 @@ jobs:
             --exclude reth-e2e-test-utils --exclude reth-ethereum-payload-builder --exclude reth-exex-test-utils \
             --exclude reth-node-ethereum --exclude reth-scroll-cli --exclude reth-scroll-evm \
             --exclude reth-scroll-node --exclude scroll-reth --exclude reth-scroll-rpc  --exclude reth-scroll-trie \
-            --exclude reth-scroll-engine-primitives
+            --exclude reth-scroll-engine-primitives --exclude scroll-alloy-provider
 
   book:
     name: book

crates/scroll/alloy/provider/Cargo.toml

@@ -42,8 +42,8 @@ reth-provider = { workspace = true, features = ["test-utils"] }
 reth-rpc-builder.workspace = true
 reth-rpc-engine-api.workspace = true
 reth-rpc-types-compat.workspace = true
-reth-scroll-engine-primitives = { workspace = true, features = ["scroll"] }
-reth-scroll-node = { workspace = true, features = ["scroll"] }
+reth-scroll-engine-primitives.workspace = true
+reth-scroll-node.workspace = true
 reth-scroll-payload.workspace = true
 reth-scroll-chainspec.workspace = true
 reth-tasks.workspace = true
@@ -58,5 +58,17 @@ default = ["std"]
 std = [
     "alloy-primitives/std",
     "alloy-rpc-types-engine/std",
-    "scroll-alloy-rpc-types-engine/std"
+    "scroll-alloy-rpc-types-engine/std",
+    "derive_more/std",
+    "reth-primitives/std",
+    "reth-primitives-traits/std",
 ]
+scroll = [
+    "reth-scroll-node/scroll",
+    "reth-scroll-engine-primitives/scroll"
+]
+optimism = [
+    "reth-provider/optimism",
+    "reth-scroll-engine-primitives/optimism",
+    "reth-scroll-node/optimism"
+]

crates/scroll/alloy/provider/src/engine/provider.rs

@@ -43,7 +43,7 @@ impl ScrollAuthEngineApiProvider {
     }
 }
 
-#[cfg(test)]
+#[cfg(all(test, feature = "scroll", not(feature = "optimism")))]
 mod tests {
     use super::*;
     use crate::engine::ScrollEngineApi;
@@ -84,7 +84,6 @@ mod tests {
         handle
     }
 
-    /// Localhost with port 0 so a free port is used.
     const fn test_address() -> SocketAddr {
         SocketAddr::V4(SocketAddrV4::new(Ipv4Addr::UNSPECIFIED, 0))
     }

crates/scroll/alloy/provider/src/lib.rs

@@ -1,4 +1,4 @@
-//! Providers implementations fitted for Scroll needs.
+//! Providers implementations fitted to Scroll needs.
 
 mod engine;
 pub use engine::{JwtAuthHttpClient, ScrollAuthEngineApiProvider, ScrollEngineApi};