only import what is necessary

.github/workflows/integration.yml

@@ -62,16 +62,6 @@ jobs:
           sed -i 's/\(alloy = { git = "https:\/\/github.com\/alloy-rs\/alloy", rev = "\)[^"]*/\1'"$latest_alloy_commit"'/' \
           Cargo.toml
 
-          # Temporary patch until https://github.com/alloy-rs/alloy/pull/392 is resolved
-          sed -i 's/\(alloy-rpc-client = { git = "https:\/\/github.com\/alloy-rs\/alloy", rev = "\)[^"]*/\1'"$latest_alloy_commit"'/' \
-          examples/providers/Cargo.toml
-          sed -i 's/\(alloy-provider = { git = "https:\/\/github.com\/alloy-rs\/alloy", rev = "\)[^"]*/\1'"$latest_alloy_commit"'/' \
-          examples/providers/Cargo.toml
-          sed -i 's/\(alloy-rpc-client = { git = "https:\/\/github.com\/alloy-rs\/alloy", rev = "\)[^"]*/\1'"$latest_alloy_commit"'/' \
-          examples/subscriptions/Cargo.toml
-          sed -i 's/\(alloy-provider = { git = "https:\/\/github.com\/alloy-rs\/alloy", rev = "\)[^"]*/\1'"$latest_alloy_commit"'/' \
-          examples/subscriptions/Cargo.toml
-
           # Temporary patch until `patch` section in Alloy is removed
           sed -i 's/\(alloy-core = { git = "https:\/\/github.com\/alloy-rs\/core", rev = "\)[^"]*/\1'"$latest_alloy_core_commit"'/' \
           Cargo.toml

Cargo.toml

@@ -81,41 +81,26 @@ unnecessary_struct_initialization = "allow"
 use_self = "allow"
 
 [workspace.dependencies]
-alloy = { git = "https://github.com/alloy-rs/alloy", rev = "66fa192", features = [
-    # "dyn-abi",
-    # "json-abi",
-    # "json",
-    "sol-types",
-    # "rlp",
-    # "serde",
+alloy = { git = "https://github.com/zerosnacks/alloy", branch = "fix/rpc-client-exports", features = [
     "contract",
-    # "consensus",
-    # "eips",
     "network",
-    # "genesis",
     "node-bindings",
     "providers",
-    "rpc",
-    # "json-rpc",
+    "provider-http",
+    "provider-ipc",
+    "provider-ws",
     "rpc-client",
-    # "rpc-types",
+    "rpc-client-ipc",
+    "rpc-client-ws",
     "rpc-types-eth",
-    # "rpc-types-engine",
     "rpc-types-trace",
     "signers",
-    # "signer-aws",
-    # "signer-gcp",
     "signer-keystore",
     "signer-ledger",
     "signer-mnemonic",
     "signer-trezor",
     "signer-wallet",
     "signer-yubihsm",
-    "transports",
-    "transport-http",
-    "transport-ipc",
-    "transport-ws",
-    "pubsub",
 ] }
 
 # async

examples/providers/Cargo.toml

@@ -14,15 +14,6 @@ workspace = true
 
 [dev-dependencies]
 alloy.workspace = true
-# Temp dependency fix to enable relevant features - Ref: https://github.com/alloy-rs/examples/pull/3#discussion_r1537842062
-alloy-rpc-client = { git = "https://github.com/alloy-rs/alloy", rev = "66fa192", features = [
-    "pubsub",
-] }
-alloy-provider = { git = "https://github.com/alloy-rs/alloy", rev = "66fa192", features = [
-    "pubsub",
-    "ws",
-] }
-
 
 eyre.workspace = true
 futures-util = "0.3"

examples/providers/examples/ipc.rs

@@ -3,9 +3,9 @@
 use alloy::{
     network::Ethereum,
     providers::{Provider, RootProvider},
+    rpc::client::RpcClient,
     transports::ipc::IpcConnect,
 };
-use alloy_rpc_client::RpcClient;
 use eyre::Result;
 
 #[tokio::main]

examples/providers/examples/ws.rs

@@ -1,10 +1,10 @@
 //! Example of using the WS provider to subscribe to new blocks.
 
-use alloy::network::Ethereum;
-// Temp Fix
-use alloy_provider::{Provider, RootProvider};
-use alloy_rpc_client::{RpcClient, WsConnect};
-//
+use alloy::{
+    network::Ethereum,
+    providers::{Provider, RootProvider},
+    rpc::client::{RpcClient, WsConnect},
+};
 use eyre::Result;
 use futures_util::StreamExt;
 

examples/providers/examples/ws_with_auth.rs

@@ -1,10 +1,11 @@
 //! Example of using the WS provider with auth to subscribe to new blocks.
 
-use alloy::{network::Ethereum, transports::Authorization};
-// Temp Fix
-use alloy_provider::{Provider, RootProvider};
-use alloy_rpc_client::{RpcClient, WsConnect};
-//
+use alloy::{
+    network::Ethereum,
+    providers::{Provider, RootProvider},
+    rpc::client::{RpcClient, WsConnect},
+    transports::Authorization,
+};
 use eyre::Result;
 use futures_util::StreamExt;
 

examples/subscriptions/Cargo.toml

@@ -14,23 +14,6 @@ workspace = true
 
 [dev-dependencies]
 alloy.workspace = true
-# Temp fix for enabling features. Ref: https://github.com/alloy-rs/examples/pull/3/#discussion_r1537842062
-alloy-rpc-client = { git = "https://github.com/alloy-rs/alloy", rev = "66fa192", features = [
-    "pubsub",
-    "ws",
-] }
-alloy-provider = { git = "https://github.com/alloy-rs/alloy", rev = "66fa192", features = [
-    "pubsub",
-] }
-# alloy-contract.workspace = true
-# alloy-network.workspace = true
-# alloy-node-bindings.workspace = true
-# alloy-provider = { workspace = true, features = ["pubsub", "ws"] }
-# alloy-pubsub.workspace = true
-# alloy-primitives.workspace = true
-# alloy-rpc-client.workspace = true
-# alloy-rpc-types.workspace = true
-# alloy-sol-types = { workspace = true }
 
 eyre.workspace = true
 futures-util = "0.3"

examples/subscriptions/examples/event_multiplexer.rs

@@ -1,8 +1,14 @@
 //! Example of multiplexing the watching of event logs.
 
-use alloy::{network::Ethereum, node_bindings::Anvil, primitives::I256, sol, sol_types::SolEvent};
-use alloy_provider::RootProvider;
-use alloy_rpc_client::{RpcClient, WsConnect};
+use alloy::{
+    network::Ethereum,
+    node_bindings::Anvil,
+    primitives::I256,
+    providers::RootProvider,
+    rpc::client::{RpcClient, WsConnect},
+    sol,
+    sol_types::SolEvent,
+};
 use eyre::Result;
 use futures_util::StreamExt;
 use std::str::FromStr;

examples/subscriptions/examples/subscribe_blocks.rs

@@ -1,8 +1,11 @@
 //! Example of subscribing to blocks and watching block headers by polling.
 
-use alloy::{network::Ethereum, node_bindings::Anvil};
-use alloy_provider::{Provider, RootProvider};
-use alloy_rpc_client::RpcClient;
+use alloy::{
+    network::Ethereum,
+    node_bindings::Anvil,
+    providers::{Provider, RootProvider},
+    rpc::client::{RpcClient, WsConnect},
+};
 use eyre::Result;
 use futures_util::{stream, StreamExt};
 
@@ -13,7 +16,7 @@ async fn main() -> Result<()> {
     let anvil = Anvil::new().block_time(1).try_spawn()?;
 
     // Create a provider.
-    let ws = alloy_rpc_client::WsConnect::new(anvil.ws_endpoint());
+    let ws = WsConnect::new(anvil.ws_endpoint());
     let provider = RootProvider::<Ethereum, _>::new(RpcClient::connect_pubsub(ws).await?);
 
     // Subscribe to blocks.

examples/subscriptions/examples/watch_contract_event.rs

@@ -1,8 +1,12 @@
 //! Example of watching contract events.
 
-use alloy::{network::Ethereum, node_bindings::Anvil, sol};
-use alloy_provider::RootProvider;
-use alloy_rpc_client::RpcClient;
+use alloy::{
+    network::Ethereum,
+    node_bindings::Anvil,
+    providers::RootProvider,
+    rpc::client::{RpcClient, WsConnect},
+    sol,
+};
 use eyre::Result;
 use futures_util::StreamExt;
 
@@ -37,7 +41,7 @@ async fn main() -> Result<()> {
 
     // Create a WebSocket provider.
     let ws_rpc_url = anvil.ws_endpoint();
-    let ws = alloy_rpc_client::WsConnect::new(ws_rpc_url);
+    let ws = WsConnect::new(ws_rpc_url);
     let provider = RootProvider::<Ethereum, _>::new(RpcClient::connect_pubsub(ws).await?);
 
     // Deploy the `Counter` contract.