Merge pull request #500 from hashgraph/sr/deps

Author: mehcode

Cargo.lock

@@ -20,10 +20,9 @@ mnemonic = []
 [dependencies]
 async-stream = "0.3.3"
 backoff = "0.4.0"
-ed25519-dalek = { version = "2.0.0-pre.0", features = ["rand_core"] }
-fraction = { version = "0.11.0", default-features = false }
+ed25519-dalek = { version = "2.0.0-rc.2", features = ["rand_core"] }
+fraction = { version = "0.13.0", default-features = false }
 futures-core = "0.3.21"
-futures-util = "0.3.21"
 hedera-proto = { path = "./protobufs", version = "0.6.0", features = [
   "time_0_3",
   "fraction",
@@ -33,35 +32,42 @@ hmac = "0.12.1"
 log = "0.4.17"
 num-bigint = "0.4.3"
 once_cell = "1.10.0"
-parking_lot = "0.12.0"
-pbkdf2 = { version = "0.11.0", default-features = false }
-pem-rfc7468 = { version = "0.6.0", features = ["std"] }
-prost = "0.11.0"
+pbkdf2 = { version = "0.12.0", default-features = false }
+pem-rfc7468 = { version = "0.7.0", features = ["std"] }
 rand = "0.8.5"
 sha2 = "0.10.2"
 sha3 = "0.10.2"
 thiserror = "1.0.31"
 time = "0.3.9"
-tokio = { version = "1.24.2", features = ["rt-multi-thread"] }
-tonic = "0.8.0"
-tinystr = "0.7.0"
+tokio = { version = "1.24.2", features = ["time"] }
+tonic = "0.9.0"
+tinystr = { version = "0.7.0", default-features = false }
 arc-swap = "1.6.0"
 rlp = "0.5.2"
-bytes = "1.2.1"
+bytes = { version = "1.2.1", default-features = false }
 pin-project-lite = "0.2.9"
 
+[dependencies.futures-util]
+version = "0.3.21"
+default-features = false
+
+[dependencies.prost]
+version = "0.11"
+default-features = false
+features = ["std"]
+
 [dependencies.rust_decimal]
 version = "1.26.1"
 default-features = false
 features = ["std"]
 
 [dependencies.k256]
-version = "0.12.0"
+version = "0.13.0"
 default-features = false
-features = ["arithmetic", "ecdsa", "pkcs8", "precomputed-tables", "std"]
+features = ["ecdsa", "precomputed-tables", "std"]
 
 [dependencies.pkcs8]
-version = "0.9.0"
+version = "0.10.0"
 default_features = false
 features = ["encryption"]
 
@@ -70,7 +76,15 @@ anyhow = "1.0.57"
 assert_matches = "1.5.0"
 clap = { version = "4.0.0", features = ["derive", "env"] }
 dotenvy = "0.15.5"
-env_logger = "0.10.0"
 expect-test = "1.4.0"
-hex-literal = "0.3.4"
-tokio = { version = "1.24.2", features = ["full"] }
+hex-literal = "0.4.0"
+parking_lot = "0.12.0"
+
+[dev-dependencies.tokio]
+version = "1.24.2"
+features = ["rt-multi-thread", "macros"]
+
+[dev-dependencies.env_logger]
+version = "0.10.0"
+default-features = false
+features = ["auto-color", "color", "humantime"]

Cargo.toml

@@ -9,15 +9,19 @@ version = "0.6.0"
 [features]
 
 [dependencies]
-fraction = { version = "0.11.0", optional = true }
-prost = "0.11.0"
+fraction = { version = "0.13.0", default-features = false, optional = true }
 prost-types = "0.11.0"
 time_0_3 = { version = "0.3.9", optional = true, package = "time" }
 
+[dependencies.prost]
+version = "0.11"
+default-features = false
+features = ["std", "prost-derive"]
+
 # todo: get the tonic devs to actually make `channel` usable without `transport` (it *should*, it's *documented* as such, but it just doesn't work).
 [dependencies.tonic]
-version = "0.8.0"
+version = "0.9.0"
 
 [build-dependencies]
 anyhow = "1.0.55"
-tonic-build = "0.8.0"
+tonic-build = "0.9.0"

protobufs/Cargo.toml

@@ -21,7 +21,7 @@
 use std::borrow::Cow;
 use std::time::Duration;
 
-use parking_lot::RwLock;
+use once_cell::sync::OnceCell;
 use tonic::transport::{
     Channel,
     Endpoint,
@@ -35,7 +35,7 @@ pub(crate) const PREVIEWNET: &str = "hcs.previewnet.mirrornode.hedera.com:5600";
 
 pub(crate) struct MirrorNetwork {
     addresses: Vec<Cow<'static, str>>,
-    channel: RwLock<Option<Channel>>,
+    channel: OnceCell<Channel>,
 }
 
 impl MirrorNetwork {
@@ -58,30 +58,24 @@ impl MirrorNetwork {
             addresses.push(Cow::Borrowed(*address));
         }
 
-        Self { addresses, channel: RwLock::new(None) }
+        Self { addresses, channel: OnceCell::new() }
     }
 
     pub(crate) fn channel(&self) -> Channel {
-        if let Some(channel) = &*self.channel.read_recursive() {
-            return channel.clone();
-        }
-
-        let mut slot = self.channel.write();
-
-        let endpoints = self.addresses.iter().map(|address| {
-            let uri = format!("tcp://{address}");
-            Endpoint::from_shared(uri)
-                .unwrap()
-                .keep_alive_timeout(Duration::from_secs(10))
-                .keep_alive_while_idle(true)
-                .tcp_keepalive(Some(Duration::from_secs(10)))
-                .connect_timeout(Duration::from_secs(10))
-        });
-
-        let channel = Channel::balance_list(endpoints);
-
-        *slot = Some(channel.clone());
-
-        channel
+        self.channel
+            .get_or_init(|| {
+                let endpoints = self.addresses.iter().map(|address| {
+                    let uri = format!("tcp://{address}");
+                    Endpoint::from_shared(uri)
+                        .unwrap()
+                        .keep_alive_timeout(Duration::from_secs(10))
+                        .keep_alive_while_idle(true)
+                        .tcp_keepalive(Some(Duration::from_secs(10)))
+                        .connect_timeout(Duration::from_secs(10))
+                });
+
+                Channel::balance_list(endpoints)
+            })
+            .clone()
     }
 }

src/client/mirror_network.rs

@@ -26,7 +26,7 @@ use std::sync::atomic::{
 };
 use std::time::Duration;
 
-use parking_lot::RwLock;
+use once_cell::sync::OnceCell;
 use time::OffsetDateTime;
 use tonic::transport::{
     Channel,
@@ -141,7 +141,7 @@ pub(crate) struct Network {
     map: HashMap<AccountId, usize>,
     nodes: Vec<AccountId>,
     addresses: Vec<Vec<Cow<'static, str>>>,
-    channels: Vec<RwLock<Option<Channel>>>,
+    channels: Vec<OnceCell<Channel>>,
     healthy: Vec<AtomicI64>,
     last_pinged: Vec<AtomicI64>,
 }
@@ -173,7 +173,7 @@ impl Network {
             map.insert(node_account_id, i);
             nodes.push(node_account_id);
             addresses.push(address.iter().map(|address| Cow::Borrowed(*address)).collect());
-            channels.push(RwLock::new(None));
+            channels.push(OnceCell::new());
             healthy.push(AtomicI64::new(0));
             last_pinged.push(AtomicI64::new(0));
         }
@@ -236,39 +236,23 @@ impl Network {
     pub(crate) fn channel(&self, index: usize) -> (AccountId, Channel) {
         let id = self.nodes[index];
 
-        // Double lock check: We'd really rather not take a write lock if possible.
-        // (paired with the below comment)
-        if let Some(channel) = &*self.channels[index].read_recursive() {
-            return (id, channel.clone());
-        }
-
-        let mut slot = self.channels[index].write();
-
-        // Double lock check: We'd rather not replace the channel if one exists already, they aren't free.
-        // (paired with the above comment)
-        // Between returning `None` in the above `read` and getting
-        // the `WriteGuard` some *other* write to this channel could've happened
-        // causing the channel to be `Some` here, despite this thread not
-        // changing it.
-        if let Some(channel) = &*slot {
-            return (id, channel.clone());
-        }
-
-        let addresses = &self.addresses[index];
-
-        let endpoints = addresses.iter().map(|address| {
-            let uri = format!("tcp://{address}:50211");
-            Endpoint::from_shared(uri)
-                .unwrap()
-                .keep_alive_timeout(Duration::from_secs(10))
-                .keep_alive_while_idle(true)
-                .tcp_keepalive(Some(Duration::from_secs(10)))
-                .connect_timeout(Duration::from_secs(10))
-        });
-
-        let channel = Channel::balance_list(endpoints);
-
-        *slot = Some(channel.clone());
+        let channel = self.channels[index]
+            .get_or_init(|| {
+                let addresses = &self.addresses[index];
+
+                let endpoints = addresses.iter().map(|address| {
+                    let uri = format!("tcp://{address}:50211");
+                    Endpoint::from_shared(uri)
+                        .unwrap()
+                        .keep_alive_timeout(Duration::from_secs(10))
+                        .keep_alive_while_idle(true)
+                        .tcp_keepalive(Some(Duration::from_secs(10)))
+                        .connect_timeout(Duration::from_secs(10))
+                });
+
+                Channel::balance_list(endpoints)
+            })
+            .clone();
 
         (id, channel)
     }

src/client/network.rs

@@ -278,12 +278,12 @@ impl FromProtobuf<services::response::Response> for ContractFunctionResult {
 
 #[cfg(test)]
 mod tests {
-    use fraction::{
+    use hedera_proto::services;
+    use hex_literal::hex;
+    use num_bigint::{
         BigInt,
         BigUint,
     };
-    use hedera_proto::services;
-    use hex_literal::hex;
 
     use crate::protobuf::{
         FromProtobuf,

src/contract/contract_function_result.rs

@@ -194,7 +194,7 @@ where
                 )
             };
 
-            futures_util::pin_mut!(random_node_indexes);
+            let mut random_node_indexes = std::pin::pin!(random_node_indexes);
 
             while let Some(node_index) = random_node_indexes.next().await {
                 let tmp = execute_single(