Embed git commit/branch into build and logging

.gitmodules

@@ -16,6 +16,7 @@
 [submodule "tools/lean-quickstart"]
 	path = tools/lean-quickstart
 	url = https://github.com/Pier-Two/lean-quickstart.git
+	branch = devnet3
 [submodule "external/c-hash-sig"]
 	path = external/c-hash-sig
 	url = https://github.com/Pier-Two/c-hash-sig.git

CMakeLists.txt

@@ -102,10 +102,40 @@ target_link_libraries(lantern PRIVATE secp256k1 libtomcrypt Threads::Threads)
 
 add_executable(lantern_cli src/core/main.c)
 target_link_libraries(lantern_cli PRIVATE lantern Threads::Threads)
+if(NOT DEFINED LANTERN_GIT_COMMIT OR LANTERN_GIT_COMMIT STREQUAL "")
+    execute_process(
+        COMMAND git rev-parse --short HEAD
+        WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
+        OUTPUT_VARIABLE LANTERN_GIT_COMMIT
+        OUTPUT_STRIP_TRAILING_WHITESPACE
+        ERROR_QUIET
+        RESULT_VARIABLE _git_commit_result
+    )
+    if(NOT _git_commit_result EQUAL 0)
+        set(LANTERN_GIT_COMMIT "unknown")
+    endif()
+endif()
+
+if(NOT DEFINED LANTERN_GIT_BRANCH OR LANTERN_GIT_BRANCH STREQUAL "")
+    execute_process(
+        COMMAND git rev-parse --abbrev-ref HEAD
+        WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
+        OUTPUT_VARIABLE LANTERN_GIT_BRANCH
+        OUTPUT_STRIP_TRAILING_WHITESPACE
+        ERROR_QUIET
+        RESULT_VARIABLE _git_branch_result
+    )
+    if(NOT _git_branch_result EQUAL 0)
+        set(LANTERN_GIT_BRANCH "unknown")
+    endif()
+endif()
+
 target_compile_definitions(lantern_cli
     PRIVATE
         _DEFAULT_SOURCE
         _POSIX_C_SOURCE=200809L
+        LANTERN_GIT_COMMIT="${LANTERN_GIT_COMMIT}"
+        LANTERN_GIT_BRANCH="${LANTERN_GIT_BRANCH}"
 )
 
 option(LANTERN_BUILD_TESTS "Build lantern unit tests" ON)

Dockerfile

@@ -47,6 +47,9 @@ ENV PATH="${CARGO_HOME}/bin:${PATH}"
 ENV CCACHE_DIR=/root/.ccache
 ENV CCACHE_MAXSIZE=2G
 
+ARG GIT_COMMIT=unknown
+ARG GIT_BRANCH=unknown
+
 WORKDIR /usr/src/lantern
 
 COPY . .
@@ -67,7 +70,7 @@ RUN --mount=type=cache,target=/root/.ccache,sharing=locked,id=ccache-${TARGETPLA
     && cmake --install deps/libtommath
 
 RUN --mount=type=cache,target=/root/.ccache,sharing=locked,id=ccache-${TARGETPLATFORM} \
-    cmake -S . -B build -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
+    cmake -S . -B build -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DLANTERN_GIT_COMMIT="${GIT_COMMIT}" -DLANTERN_GIT_BRANCH="${GIT_BRANCH}"
 
 ARG LANTERN_FORCE_REBUILD=0
 RUN echo "LANTERN_FORCE_REBUILD=${LANTERN_FORCE_REBUILD}"

include/lantern/support/version.h

@@ -4,4 +4,12 @@
 #define LANTERN_VERSION "v0.0.3"
 #define LANTERN_CLIENT_NAME "lantern"
 
+#ifndef LANTERN_GIT_COMMIT
+#define LANTERN_GIT_COMMIT "unknown"
+#endif
+
+#ifndef LANTERN_GIT_BRANCH
+#define LANTERN_GIT_BRANCH "unknown"
+#endif
+
 #endif /* LANTERN_SUPPORT_VERSION_H */

scripts/run_local_devnet.sh

@@ -450,12 +450,16 @@ fi
 
 if [[ "${RUNTIME}" == "docker" && "${DOCKER_BUILD}" == "1" ]]; then
   echo "Building docker image ${LANTERN_IMAGE}..."
+  git_build_args=(
+    --build-arg "GIT_COMMIT=$(git -C "${REPO_ROOT}" rev-parse --short HEAD 2>/dev/null || echo unknown)"
+    --build-arg "GIT_BRANCH=$(git -C "${REPO_ROOT}" rev-parse --abbrev-ref HEAD 2>/dev/null || echo unknown)"
+  )
   if [[ -n "${DOCKER_BUILD_ARGS}" ]]; then
     # shellcheck disable=SC2206
     docker_build_args=(${DOCKER_BUILD_ARGS})
-    docker build "${docker_build_args[@]}" -t "${LANTERN_IMAGE}" "${REPO_ROOT}"
+    docker build "${git_build_args[@]}" "${docker_build_args[@]}" -t "${LANTERN_IMAGE}" "${REPO_ROOT}"
   else
-    docker build -t "${LANTERN_IMAGE}" "${REPO_ROOT}"
+    docker build "${git_build_args[@]}" -t "${LANTERN_IMAGE}" "${REPO_ROOT}"
   fi
 fi
 

src/core/main.c

@@ -614,7 +614,9 @@ int main(int argc, char **argv)
 
     if (show_version)
     {
-        lantern_log_info("main", NULL, "lantern %s", LANTERN_VERSION);
+        lantern_log_info(
+            "main", NULL, "lantern %s (commit %s, branch %s)",
+            LANTERN_VERSION, LANTERN_GIT_COMMIT, LANTERN_GIT_BRANCH);
         goto cleanup;
     }
 
@@ -624,6 +626,10 @@ int main(int argc, char **argv)
         goto cleanup;
     }
 
+    lantern_log_info(
+        "cli", NULL, "lantern %s (commit %s, branch %s)",
+        LANTERN_VERSION, LANTERN_GIT_COMMIT, LANTERN_GIT_BRANCH);
+
     if (validate_required_options(&options) != 0)
     {
         exit_code = 1;