multi: update GetInfoResponse` response

Add the `tag` and `commit_hash` fields to the GetInfoResponse. The
semantics of the `version` field is also updated to always contain the
most recent semantic version of the litd node, following the semantic
versioning 2.0.0 spec (http://semver.org/).

This commit also updates the `litcli --version` command result, to
include all three fields of the GetInfoResponse.

Author: ViktorTigerstrom

Makefile

@@ -16,7 +16,7 @@ GOIMPORTS_BIN := $(GO_BIN)/gosimports
 
 COMMIT := $(shell git describe --abbrev=40 --dirty --tags)
 COMMIT_HASH := $(shell git rev-parse HEAD)
-PUBLIC_URL := 
+PUBLIC_URL :=
 
 # GO_VERSION is the Go version used for the release build, docker files, and
 # GitHub Actions. This is the reference version for the project. All other Go
@@ -69,6 +69,7 @@ make_ldflags = $(2) -X $(LND_PKG)/build.Commit=lightning-terminal-$(COMMIT) \
 	-X $(LND_PKG)/build.RawTags=$(shell echo $(1) | sed -e 's/ /,/g') \
 	-X $(PKG).appFilesPrefix=$(PUBLIC_URL) \
 	-X $(PKG).Commit=$(COMMIT) \
+	-X $(PKG).GitCommitHash=$(COMMIT_HASH) \
 	-X $(LOOP_PKG).Commit=$(LOOP_COMMIT) \
 	-X $(POOL_PKG).Commit=$(POOL_COMMIT) \
 	-X $(TAP_PKG).Commit=$(TAP_COMMIT)

app/src/types/generated/proxy_pb.d.ts

@@ -73,7 +73,7 @@ var (
 func main() {
 	app := cli.NewApp()
 
-	app.Version = terminal.Version()
+	app.Version = terminal.RichVersion()
 	app.Name = "litcli"
 	app.Usage = "control plane for your Lightning Terminal (lit) daemon"
 	app.Flags = []cli.Flag{

app/src/types/generated/proxy_pb.js

@@ -367,7 +367,7 @@ func loadAndValidateConfig(interceptor signal.Interceptor) (*Config, error) {
 	appName := filepath.Base(os.Args[0])
 	appName = strings.TrimSuffix(appName, filepath.Ext(appName))
 	if preCfg.ShowVersion {
-		fmt.Println(appName, "version", Version())
+		fmt.Println(appName, "version", RichVersion())
 		os.Exit(0)
 	}
 	if preCfg.Lnd.ShowVersion {

cmd/litcli/main.go

@@ -52,6 +52,16 @@ message GetInfoRequest {
 }
 
 message GetInfoResponse {
-    // The version of the LiTd software that the node is running.
+    // The application version of the LiTd software running on the node,
+    // following the Semantic Versioning 2.0.0 specification
+    // (http://semver.org/).
     string version = 1;
+
+    // The Git tag that the LiTd binary build was based on. If the build was
+    // not based on a clean tagged commit, this field will contain the most
+    // recent tag suffixed by the commit hash, and/or a "-dirty" suffix.
+    string tag = 2;
+
+    // The Git commit hash the LiTd binary build was based on.
+    string commit_hash = 3;
 }

config.go

@@ -135,7 +135,15 @@
       "properties": {
         "version": {
           "type": "string",
-          "description": "The version of the LiTd software that the node is running."
+          "description": "The application version of the LiTd software running on the node,\nfollowing the Semantic Versioning 2.0.0 specification\n(http://semver.org/)."
+        },
+        "tag": {
+          "type": "string",
+          "description": "The Git tag that the LiTd binary build was based on. If the build was\nnot based on a clean tagged commit, this field will contain the most\nrecent tag suffixed by the commit hash, and/or a \"-dirty\" suffix."
+        },
+        "commit_hash": {
+          "type": "string",
+          "description": "The Git commit hash the LiTd binary build was based on."
         }
       }
     },

litrpc/proxy.pb.go

@@ -52,6 +52,16 @@ message GetInfoRequest {
 }
 
 message GetInfoResponse {
-    // The version of the LiTd software that the node is running.
+    // The application version of the LiTd software running on the node,
+    // following the Semantic Versioning 2.0.0 specification
+    // (http://semver.org/).
     string version = 1;
+
+    // The Git tag that the LiTd binary build was based on. If the build was
+    // not based on a clean tagged commit, this field will contain the most
+    // recent tag suffixed by the commit hash, and/or a "-dirty" suffix.
+    string tag = 2;
+
+    // The Git commit hash the LiTd binary build was based on.
+    string commit_hash = 3;
 }

litrpc/proxy.proto

@@ -240,7 +240,9 @@ func (p *rpcProxy) GetInfo(_ context.Context, _ *litrpc.GetInfoRequest) (
 	*litrpc.GetInfoResponse, error) {
 
 	return &litrpc.GetInfoResponse{
-		Version: Version(),
+		Version:    Version(),
+		Tag:        CommitTag(),
+		CommitHash: CommitHash(),
 	}, nil
 }