Merge branch 'release/1.0.0-rc.1' into develop

Conflicts:
	validator-api/Cargo.toml

validator-api/src/config/mod.rs

@@ -34,7 +34,8 @@ const DEFAULT_PER_NODE_TEST_PACKETS: usize = 3;
 
 const DEFAULT_CACHE_INTERVAL: Duration = Duration::from_secs(30);
 const DEFAULT_MONITOR_THRESHOLD: u8 = 60;
-const DEFAULT_MIN_RELIABILITY: u8 = 50;
+const DEFAULT_MIN_MIXNODE_RELIABILITY: u8 = 50;
+const DEFAULT_MIN_GATEWAY_RELIABILITY: u8 = 20;
 
 #[derive(Debug, Default, Deserialize, PartialEq, Serialize)]
 pub struct Config {
@@ -109,8 +110,8 @@ impl Default for Base {
 #[serde(default)]
 pub struct NetworkMonitor {
     //  Mixnodes and gateways with relialability lower the this get blacklisted by network monitor, get no traffic and cannot be selected into a rewarded set.
-    min_reliability: u8,
-
+    min_mixnode_reliability: u8, // defaults to 50
+    min_gateway_reliability: u8, // defaults to 20
     /// Specifies whether network monitoring service is enabled in this process.
     enabled: bool,
 
@@ -192,7 +193,8 @@ impl NetworkMonitor {
 impl Default for NetworkMonitor {
     fn default() -> Self {
         NetworkMonitor {
-            min_reliability: DEFAULT_MIN_RELIABILITY,
+            min_mixnode_reliability: DEFAULT_MIN_MIXNODE_RELIABILITY,
+            min_gateway_reliability: DEFAULT_MIN_GATEWAY_RELIABILITY,
             enabled: false,
             testnet_mode: false,
             all_validator_apis: default_api_endpoints(),
@@ -334,6 +336,16 @@ impl Config {
         self
     }
 
+    pub fn with_min_mixnode_reliability(mut self, min_mixnode_reliability: u8) -> Self {
+        self.network_monitor.min_mixnode_reliability = min_mixnode_reliability;
+        self
+    }
+
+    pub fn with_min_gateway_reliability(mut self, min_gateway_reliability: u8) -> Self {
+        self.network_monitor.min_gateway_reliability = min_gateway_reliability;
+        self
+    }
+
     #[cfg(not(feature = "coconut"))]
     pub fn with_eth_private_key(mut self, eth_private_key: String) -> Self {
         self.network_monitor.eth_private_key = eth_private_key;
@@ -423,8 +435,12 @@ impl Config {
         self.network_monitor.minimum_test_routes
     }
 
-    pub fn get_min_reliability(&self) -> u8 {
-        self.network_monitor.min_reliability
+    pub fn get_min_mixnode_reliability(&self) -> u8 {
+        self.network_monitor.min_mixnode_reliability
+    }
+
+    pub fn get_min_gateway_reliability(&self) -> u8 {
+        self.network_monitor.min_gateway_reliability
     }
 
     pub fn get_route_test_packets(&self) -> usize {

validator-api/src/config/template.rs

@@ -21,7 +21,8 @@ mixnet_contract_address = '{{ base.mixnet_contract_address }}'
 [network_monitor]
 
 # Mixnodes and gateways with relialability lower the this get blacklisted by network monitor, get no traffic and cannot be selected into a rewarded set.
-min_reliability = {{ network_monitor.min_reliability }}
+min_mixnode_reliability = {{ network_monitor.min_mixnode_reliability }} # deafults to 50
+min_gateway_reliability = {{ network_monitor.min_gateway_reliability }} # defaults to 20
 
 # Specifies whether network monitoring service is enabled in this process.
 enabled = {{ network_monitor.enabled }}