Merge pull request #653 from hashgraph/sr/mirror-tls

Author: mehcode

Cargo.lock

@@ -41,7 +41,7 @@ sha3 = "0.10.2"
 thiserror = "1.0.31"
 time = "0.3.9"
 tokio = { version = "1.24.2", features = ["time"] }
-tonic = "0.9.0"
+tonic = { version = "0.9.0", features = ["tls", "tls-webpki-roots"] }
 tinystr = { version = "0.7.0", default-features = false }
 arc-swap = "1.6.0"
 rlp = "0.5.2"

Cargo.toml

@@ -238,8 +238,8 @@ impl Client {
     /// Current return values (reminder that these are semver exempt)
     ///
     /// - mainnet: `["mainnet-public.mirrornode.hedera.com:443"]`
-    /// - testnet: `["hcs.testnet.mirrornode.hedera.com:5600"]`
-    /// - previewnet: `["hcs.previewnet.mirrornode.hedera.com:5600"]`
+    /// - testnet: `["testnet.mirrornode.hedera.com:443"]`
+    /// - previewnet: `["previewnet.mirrornode.hedera.com:443"]`
     ///
     /// # Examples
     ///
@@ -251,7 +251,7 @@ impl Client {
     /// let client = Client::for_testnet();
     ///
     /// // note: This isn't *guaranteed* in a semver sense, but this is the current result.
-    /// let expected = Vec::from(["hcs.testnet.mirrornode.hedera.com:5600".to_owned()]);
+    /// let expected = Vec::from(["testnet.mirrornode.hedera.com:443".to_owned()]);
     /// assert_eq!(expected, client.mirror_network());
     ///
     /// # }

src/client/mod.rs

@@ -25,6 +25,7 @@ use std::time::Duration;
 use once_cell::sync::OnceCell;
 use tonic::transport::{
     Channel,
+    ClientTlsConfig,
     Endpoint,
 };
 use triomphe::Arc;
@@ -33,9 +34,9 @@ use crate::ArcSwap;
 
 pub(crate) const MAINNET: &str = "mainnet-public.mirrornode.hedera.com:443";
 
-pub(crate) const TESTNET: &str = "hcs.testnet.mirrornode.hedera.com:5600";
+pub(crate) const TESTNET: &str = "testnet.mirrornode.hedera.com:443";
 
-pub(crate) const PREVIEWNET: &str = "hcs.previewnet.mirrornode.hedera.com:5600";
+pub(crate) const PREVIEWNET: &str = "previewnet.mirrornode.hedera.com:443";
 
 #[derive(Default)]
 pub(crate) struct MirrorNetwork(ArcSwap<MirrorNetworkData>);
@@ -50,15 +51,21 @@ impl Deref for MirrorNetwork {
 
 impl MirrorNetwork {
     pub(crate) fn mainnet() -> Self {
-        Self(ArcSwap::new(Arc::new(MirrorNetworkData::from_static(&[MAINNET]))))
+        Self::network(MAINNET)
     }
 
     pub(crate) fn testnet() -> Self {
-        Self(ArcSwap::new(Arc::new(MirrorNetworkData::from_static(&[TESTNET]))))
+        Self::network(TESTNET)
     }
 
     pub(crate) fn previewnet() -> Self {
-        Self(ArcSwap::new(Arc::new(MirrorNetworkData::from_static(&[PREVIEWNET]))))
+        Self::network(PREVIEWNET)
+    }
+
+    fn network(address: &'static str) -> Self {
+        let tls_config = ClientTlsConfig::new().domain_name(address.split_once(':').unwrap().0);
+
+        Self(ArcSwap::new(Arc::new(MirrorNetworkData::from_static(&[address], tls_config))))
     }
 
     #[cfg(feature = "serde")]
@@ -71,21 +78,22 @@ impl MirrorNetwork {
 pub(crate) struct MirrorNetworkData {
     addresses: Vec<Cow<'static, str>>,
     channel: OnceCell<Channel>,
+    tls_config: ClientTlsConfig,
 }
 
 impl MirrorNetworkData {
     pub(crate) fn from_addresses(addresses: Vec<Cow<'static, str>>) -> Self {
-        Self { addresses, channel: OnceCell::new() }
+        Self { addresses, channel: OnceCell::new(), tls_config: ClientTlsConfig::new() }
     }
 
-    pub(crate) fn from_static(network: &[&'static str]) -> Self {
+    pub(crate) fn from_static(network: &[&'static str], tls_config: ClientTlsConfig) -> Self {
         let mut addresses = Vec::with_capacity(network.len());
 
         for address in network {
             addresses.push(Cow::Borrowed(*address));
         }
 
-        Self { addresses, channel: OnceCell::new() }
+        Self { addresses, channel: OnceCell::new(), tls_config }
     }
 
     pub(crate) fn channel(&self) -> Channel {
@@ -96,6 +104,8 @@ impl MirrorNetworkData {
                     Endpoint::from_shared(uri)
                         .unwrap()
                         .keep_alive_timeout(Duration::from_secs(10))
+                        .tls_config(self.tls_config.clone())
+                        .unwrap()
                         .keep_alive_while_idle(true)
                         .tcp_keepalive(Some(Duration::from_secs(10)))
                         .connect_timeout(Duration::from_secs(10))