Add proto+s3 clients to fuel client

.changes/added/3157.md

@@ -0,0 +1 @@
+Add protobuf and s3 bucket support to fuel client

bin/fuel-core/src/lib.rs

@@ -6,5 +6,4 @@
 pub mod cli;
 pub use fuel_core::service::FuelService;
 
-use fuel_core_block_aggregator_api as _;
 use tikv_jemallocator as _; // Used only by the binary

crates/client/Cargo.toml

@@ -24,13 +24,15 @@ subscriptions = [
     "fuel-core-types/serde",
 ]
 fault-proving = ["fuel-core-types/fault-proving"]
+rpc = ["dep:fuel-core-protobuf", "dep:tonic"]
 
 [dependencies]
 anyhow = { workspace = true }
 base64 = { version = "0.22.1", optional = true }
 cynic = { workspace = true }
 derive_more = { workspace = true }
 eventsource-client = { version = "0.13.0", optional = true }
+fuel-core-protobuf = { workspace = true, optional = true }
 fuel-core-types = { workspace = true, features = ["alloc", "serde"] }
 futures = { workspace = true, optional = true }
 hex = { workspace = true }
@@ -46,6 +48,7 @@ serde_json = { version = "1.0", features = ["raw_value"] }
 # We force the version because 4.1.0 update leap seconds that breaks our timestamps
 tai64 = { version = "=4.0.0", features = ["serde"] }
 thiserror = "1.0"
+tonic = { workspace = true, optional = true }
 tracing = "0.1"
 
 [build-dependencies]

crates/client/src/client.rs

@@ -167,8 +167,13 @@ use types::{
     },
 };
 
+use fuel_core_protobuf::{
+    self,
+    block_aggregator_client::BlockAggregatorClient,
+};
 #[cfg(feature = "subscriptions")]
 use std::pin::Pin;
+use tonic::codegen::StdError;
 
 pub mod pagination;
 pub mod schema;
@@ -246,6 +251,10 @@ pub struct FuelClient {
     transport: FailoverTransport,
     require_height: ConsistencyPolicy,
     chain_state_info: ChainStateInfo,
+    #[cfg(feature = "rpc")]
+    protobuf_client: Option<BlockAggregatorClient<tonic::transport::Channel>>,
+    #[cfg(feature = "rpc")]
+    s3_client: (),
 }
 
 impl FromStr for FuelClient {
@@ -268,6 +277,10 @@ impl FromStr for FuelClient {
                 height: Arc::new(Mutex::new(None)),
             },
             chain_state_info: Default::default(),
+            #[cfg(feature = "rpc")]
+            protobuf_client: None,
+            #[cfg(feature = "rpc")]
+            s3_client: (),
         })
     }
 }
@@ -300,15 +313,51 @@ impl FuelClient {
         Self::from_str(url.as_ref())
     }
 
+    #[cfg(feature = "rpc")]
+    pub async fn new_with_rpc<D>(
+        graphql_url: impl AsRef<str>,
+        rpc_url: D,
+    ) -> anyhow::Result<Self>
+    where
+        D: TryInto<tonic::transport::Endpoint>,
+        D::Error: Into<StdError>,
+    {
+        let mut client = Self::new(graphql_url)?;
+        let rpc_client = BlockAggregatorClient::connect(rpc_url)
+            .await
+            .context("Failed to connect to the Block Aggregator RPC")?;
+        client.protobuf_client = Some(rpc_client);
+        Ok(client)
+    }
+
     pub fn with_urls(urls: Vec<Url>) -> anyhow::Result<Self> {
         Ok(Self {
             transport: FailoverTransport::new(urls)?,
             require_height: ConsistencyPolicy::Auto {
                 height: Arc::new(Mutex::new(None)),
             },
             chain_state_info: Default::default(),
+            #[cfg(feature = "rpc")]
+            protobuf_client: None,
         })
     }
+
+    #[cfg(feature = "rpc")]
+    pub async fn with_urls_and_rpc<D>(
+        graph_ql_urls: Vec<Url>,
+        rpc_url: D,
+    ) -> anyhow::Result<Self>
+    where
+        D: TryInto<tonic::transport::Endpoint>,
+        D::Error: Into<StdError>,
+    {
+        let mut client = Self::with_urls(graph_ql_urls)?;
+        let rpc_client = BlockAggregatorClient::connect(rpc_url)
+            .await
+            .context("Failed to connect to the Block Aggregator RPC")?;
+        client.protobuf_client = Some(rpc_client);
+        Ok(client)
+    }
 }
 
 impl FuelClient {