Include git hash and crate version

node/forest_libp2p/Cargo.toml

@@ -45,6 +45,7 @@ ipld_blockstore = "0.1"
 async-trait = "0.1"
 lazy_static = "1.4"
 futures_cbor_codec = { git = "https://github.com/najamelan/futures_cbor_codec", rev = "de08e31530513f993cbf5efef7311ac5194b2256" }
+git-version = "0.3.4"
 
 [dev-dependencies]
 forest_address = "0.3"

node/forest_libp2p/src/behaviour.rs

@@ -16,6 +16,7 @@ use crate::{
 use forest_cid::Cid;
 use futures::channel::oneshot::{self, Sender as OneShotSender};
 use futures::{prelude::*, stream::FuturesUnordered};
+use git_version::git_version;
 use libp2p::core::PeerId;
 use libp2p::gossipsub::{
     error::PublishError, Gossipsub, GossipsubConfig, GossipsubEvent, MessageAuthenticity, Topic,
@@ -45,6 +46,11 @@ use std::{collections::HashMap, convert::TryInto};
 use std::{task::Context, task::Poll};
 use tiny_cid::Cid as Cid2;
 
+lazy_static! {
+    static ref VERSION: &'static str = env!("CARGO_PKG_VERSION");
+    static ref CURRENT_COMMIT: &'static str = git_version!();
+}
+
 #[derive(NetworkBehaviour)]
 #[behaviour(out_event = "ForestBehaviourEvent", poll_method = "poll")]
 pub struct ForestBehaviour {
@@ -434,9 +440,7 @@ impl ForestBehaviour {
             ping: Ping::default(),
             identify: Identify::new(
                 "ipfs/0.1.0".into(),
-                // TODO update to include actual version
-                // https://github.com/ChainSafe/forest/issues/934
-                format!("forest-{}", "0.1.0"),
+                format!("forest-{}-{}", *VERSION, *CURRENT_COMMIT),
                 local_key.public(),
             ),
             bitswap,

types/Cargo.toml

@@ -28,7 +28,7 @@ base64 = { version = "0.13", optional = true }
 forest_json_utils = { path = "../utils/json_utils", optional = true, version = "0.1" }
 lazy_static = "1.4"
 async-std = "1.9"
-
+git-version = "0.3.4"
 
 [features]
 json = ["base64", "forest_json_utils", "num-bigint/json"]

types/src/build_version/mod.rs

@@ -2,11 +2,9 @@
 // SPDX-License-Identifier: Apache-2.0, MIT
 
 use async_std::sync::RwLock;
+use git_version::git_version;
 use num_derive::FromPrimitive;
-use std::{
-    fmt::{Display, Formatter, Result as FmtResult},
-    process::Command,
-};
+use std::fmt::{Display, Formatter, Result as FmtResult};
 
 use serde::Serialize;
 const BUILD_VERSION: &str = "0.10.2";
@@ -23,26 +21,7 @@ const MINER_API_VERSION: Version = new_version(0, 15, 0);
 const WORKER_API_VERSION: Version = new_version(0, 15, 0);
 
 lazy_static! {
-    static ref CURRENT_COMMIT: String = {
-        let output = Command::new("git")
-            .args(&[
-                "describe",
-                "--always",
-                "--match=NeVeRmAtch",
-                "--dirty",
-                "2>/dev/null",
-            ])
-            .output()
-            .map(|s| s.stdout)
-            .unwrap_or_else(|_| {
-                Command::new("git")
-                    .args(&["rev-parse", "--short", "HEAD", "2>/dev/null"])
-                    .output()
-                    .map(|s| s.stdout)
-                    .unwrap_or_default()
-            });
-        String::from(std::str::from_utf8(&output).unwrap_or_default())
-    };
+    pub static ref CURRENT_COMMIT: String = git_version!().to_string();
     pub static ref BUILD_TYPE: RwLock<BuildType> = RwLock::new(BuildType::BuildDefault);
     pub static ref RUNNING_NODE_TYPE: RwLock<NodeType> = RwLock::new(NodeType::Full);
 }