Merge pull request #25 from nymtech/features/version_number_to_presence

Features/version number to presence

client/src/clients/directory/presence.rs

@@ -15,6 +15,7 @@ pub struct MixNodePresence {
     pub pub_key: String,
     pub layer: u64,
     pub last_seen: u64,
+    pub version: String,
 }
 
 #[derive(Clone, Debug, Deserialize, Serialize)]
@@ -23,6 +24,7 @@ pub struct MixProviderPresence {
     pub host: String,
     pub pub_key: String,
     pub registered_clients: Vec<MixProviderClient>,
+    pub version: String,
 }
 
 #[derive(Clone, Debug, Deserialize, Serialize)]

client/src/clients/directory/requests/presence_mixnodes_post.rs

@@ -81,6 +81,7 @@ mod metrics_get_request {
                 pub_key: "abc".to_string(),
                 layer: 1,
                 last_seen: 0,
+                version: "0.1.0".to_string(),
             }
         }
     }

client/src/clients/directory/requests/presence_providers_post.rs

@@ -79,6 +79,7 @@ mod metrics_get_request {
                 host: "foo.com".to_string(),
                 pub_key: "abc".to_string(),
                 registered_clients: vec![],
+                version: "0.1.0".to_string(),
             }
         }
     }

client/src/clients/directory/requests/presence_topology_get.rs

@@ -101,37 +101,43 @@ mod topology_requests {
                        "host": "35.176.155.107:1789",
                        "pubKey": "zSob16499jT7C3S3ky4GihNOjlU6aLfSRkf1xAxOwV0=",
                        "layer": 3,
-                       "lastSeen": 1575915096805374500
+                       "lastSeen": 1575915096805374500,
+                       "version": "0.1.0"
                      },
                      {
                        "host": "18.130.86.190:1789",
                        "pubKey": "vCdpFc0NvW0NSqsuTxtjFtiSY35aXesgT3JNA8sSIXk=",
                        "layer": 1,
-                       "lastSeen": 1575915097370376000
+                       "lastSeen": 1575915097370376000,
+                       "version": "0.1.0"
                      },
                      {
                        "host": "3.10.22.152:1789",
                        "pubKey": "OwOqwWjh_IlnaWS2PxO6odnhNahOYpRCkju50beQCTA=",
                        "layer": 1,
-                       "lastSeen": 1575915097639423500
+                       "lastSeen": 1575915097639423500,
+                       "version": "0.1.0"
                      },
                      {
                        "host": "35.178.213.77:1789",
                        "pubKey": "nkkrUjgL8UJk05QydvWvFSvtRB6nmeV8RMvH5540J3s=",
                        "layer": 2,
-                       "lastSeen": 1575915097895166500
+                       "lastSeen": 1575915097895166500,
+                       "version": "0.1.0"
                      },
                      {
                        "host": "52.56.99.196:1789",
                        "pubKey": "whHuBuEc6zyOZOquKbuATaH4Crml61V_3Y-MztpWhF4=",
                        "layer": 2,
-                       "lastSeen": 1575915096255174700
+                       "lastSeen": 1575915096255174700,
+                       "version": "0.1.0"
                      },
                      {
                        "host": "3.9.12.238:1789",
                        "pubKey": "vk5Sr-Xyi0cTbugACv8U42ZJ6hs6cGDox0rpmXY94Fc=",
                        "layer": 3,
-                       "lastSeen": 1575915096497827600
+                       "lastSeen": 1575915096497827600,
+                       "version": "0.1.0"
                      }
                    ],
                    "mixProviderNodes": [
@@ -248,7 +254,8 @@ mod topology_requests {
                            "pubKey": "COGdpfhmzNGR6YX820GqJIkjOihL8mr6-h-d3JlTDFA="
                          }
                        ],
-                       "lastSeen": 1575915097358694100
+                       "lastSeen": 1575915097358694100,
+                       "version": "0.1.0"
                      },
                      {
                        "host": "35.178.212.193:1789",
@@ -297,7 +304,8 @@ mod topology_requests {
                            "pubKey": "w1bfLpnd3rWu5JczB0nQfnE2S6nUCbx2AA7HDE48DQo="
                          }
                        ],
-                       "lastSeen": 1575915097869025000
+                       "lastSeen": 1575915097869025000,
+                       "version": "0.1.0"
                      }
                    ]
                  }"#.to_string()

mixnode/src/node/presence.rs

@@ -22,6 +22,7 @@ impl Notifier {
             pub_key: node_config.public_key_string(),
             layer: node_config.layer as u64,
             last_seen: 0,
+            version: env!("CARGO_PKG_VERSION").to_string(),
         };
         Notifier {
             net_client,

sfw-provider/src/provider/presence.rs

@@ -43,6 +43,7 @@ impl Notifier {
             host: self.host.clone(),
             pub_key: self.pub_key.clone(),
             registered_clients: unlocked_ledger.current_clients(),
+            version: env!("CARGO_PKG_VERSION").to_string(),
         }
     }