Merge pull request #1012 from AleoHQ/staging

Release v1.3.13

Author: howardwu

Cargo.lock

@@ -44,17 +44,17 @@ name = "snarkos"
 path = "snarkos/main.rs"
 
 [dependencies.snarkvm-algorithms]
-version = "=0.7.5"
+version = "=0.7.6"
 default-features = false
 
 [dependencies.snarkvm-dpc]
-version = "=0.7.5"
+version = "=0.7.6"
 
 [dependencies.snarkvm-posw]
-version = "=0.7.5"
+version = "=0.7.6"
 
 [dependencies.snarkvm-utilities]
-version = "=0.7.5"
+version = "=0.7.6"
 
 [dependencies.snarkos-consensus]
 path = "./consensus"

Cargo.toml

@@ -33,22 +33,22 @@ path = "network/network.rs"
 harness = false
 
 [dependencies.snarkvm-algorithms]
-version = "=0.7.5"
+version = "=0.7.6"
 
 [dependencies.snarkvm-curves]
-version = "=0.7.5"
+version = "=0.7.6"
 
 [dependencies.snarkvm-dpc]
-version = "=0.7.5"
+version = "=0.7.6"
 
 [dependencies.snarkvm-parameters]
-version = "=0.7.5"
+version = "=0.7.6"
 
 [dependencies.snarkvm-posw]
-version = "=0.7.5"
+version = "=0.7.6"
 
 [dependencies.snarkvm-utilities]
-version = "=0.7.5"
+version = "=0.7.6"
 
 [dependencies.snarkos-profiler]
 path = "../profiler"

benchmarks/Cargo.toml

@@ -18,19 +18,19 @@ license = "GPL-3.0"
 edition = "2018"
 
 [dependencies.snarkvm-algorithms]
-version = "=0.7.5"
+version = "=0.7.6"
 
 [dependencies.snarkvm-curves]
-version = "=0.7.5"
+version = "=0.7.6"
 
 [dependencies.snarkvm-dpc]
-version = "=0.7.5"
+version = "=0.7.6"
 
 [dependencies.snarkvm-posw]
-version = "=0.7.5"
+version = "=0.7.6"
 
 [dependencies.snarkvm-utilities]
-version = "=0.7.5"
+version = "=0.7.6"
 
 [dependencies.metrics]
 version = "0.17"

consensus/Cargo.toml

@@ -37,4 +37,4 @@ version = "1"
 features = [ "macros", "rt-multi-thread" ]
 
 [dev-dependencies.snarkvm-derives]
-version = "=0.7.5"
+version = "=0.7.6"

metrics/Cargo.toml

@@ -21,13 +21,13 @@ edition = "2018"
 prometheus = [ "snarkos-metrics/prometheus" ]
 
 [dependencies.snarkvm-algorithms]
-version = "=0.7.5"
+version = "=0.7.6"
 
 [dependencies.snarkvm-dpc]
-version = "=0.7.5"
+version = "=0.7.6"
 
 [dependencies.snarkvm-utilities]
-version = "=0.7.5"
+version = "=0.7.6"
 
 [dependencies.snarkos-consensus]
 path = "../consensus"

network/Cargo.toml

@@ -50,7 +50,7 @@ pub mod topology;
 pub use topology::*;
 
 /// The maximum number of block hashes that can be requested or provided in a single batch.
-pub const MAX_BLOCK_SYNC_COUNT: u32 = 64;
+pub const MAX_BLOCK_SYNC_COUNT: u32 = snarkos_storage::NUM_LOCATOR_HASHES;
 /// The maximum amount of time allowed to process a single batch of sync blocks. It should be aligned
 /// with `MAX_BLOCK_SYNC_COUNT`.
 pub const BLOCK_SYNC_EXPIRATION_SECS: u8 = 30;

network/src/lib.rs

@@ -199,11 +199,12 @@ impl<S: Storage + Send + core::marker::Sync + 'static> Node<S> {
             let node_clone = self.clone();
 
             let known_network_task = task::spawn(async move {
-                loop {
-                    // Should always be present since we check for it before this block.
-                    if let Some(known_network) = node_clone.known_network() {
-                        known_network.update().await
-                    }
+                // Safe since we check the presence of `known_network`.
+                let known_network = node_clone.known_network().unwrap();
+                let mut receiver = known_network.take_receiver().unwrap();
+
+                while let Some(message) = receiver.recv().await {
+                    known_network.update(message);
                 }
             });
             self.register_task(known_network_task);

network/src/node.rs

@@ -16,7 +16,7 @@
 
 use std::{cmp, net::SocketAddr, time::Duration};
 
-use rand::seq::IteratorRandom;
+use rand::{prelude::SliceRandom, seq::IteratorRandom};
 use snarkvm_dpc::Storage;
 use tokio::task;
 
@@ -112,7 +112,14 @@ impl<S: Storage + Send + Sync + 'static> Node<S> {
         // Attempt to connect to the default bootnodes of the network if the node has no active
         // connections.
         if self.peer_book.get_active_peer_count() == 0 {
-            self.connect_to_addresses(&self.config.bootnodes()).await;
+            let random_bootnodes = self
+                .config
+                .bootnodes()
+                .choose_multiple(&mut rand::thread_rng(), 2)
+                .copied()
+                .collect::<Vec<_>>();
+
+            self.connect_to_addresses(&random_bootnodes).await;
         }
 
         if number_to_connect != 0 {
@@ -299,7 +306,6 @@ impl<S: Storage + Send + Sync + 'static> Node<S> {
         // Broadcast the sanitized list of connected peers back to the requesting peer.
 
         use crate::Peer;
-        use rand::prelude::SliceRandom;
 
         let connected_peers = self.peer_book.connected_peers_snapshot().await;