cmd/lncli: add version command that reads verrpc.GetVersion

cmd/lncli/cmd_version.go

@@ -0,0 +1,54 @@
+package main
+
+import (
+	"context"
+	"fmt"
+
+	"github.com/lightningnetwork/lnd/build"
+	"github.com/lightningnetwork/lnd/lnrpc/lnclipb"
+	"github.com/lightningnetwork/lnd/lnrpc/verrpc"
+	"github.com/urfave/cli"
+)
+
+var versionCommand = cli.Command{
+	Name:  "version",
+	Usage: "Display lncli and lnd version info.",
+	Description: `
+	Returns version information about both lncli and lnd. If lncli is unable
+	to connect to lnd, the command fails but still prints the lncli version.
+	`,
+	Action: actionDecorator(version),
+}
+
+func version(ctx *cli.Context) error {
+	conn := getClientConn(ctx, false)
+	defer conn.Close()
+
+	versions := &lnclipb.VersionResponse{
+		Lncli: &verrpc.Version{
+			Commit:        build.Commit,
+			CommitHash:    build.CommitHash,
+			Version:       build.Version(),
+			AppMajor:      uint32(build.AppMajor),
+			AppMinor:      uint32(build.AppMinor),
+			AppPatch:      uint32(build.AppPatch),
+			AppPreRelease: build.AppPreRelease,
+			BuildTags:     build.Tags(),
+			GoVersion:     build.GoVersion,
+		},
+	}
+
+	client := verrpc.NewVersionerClient(conn)
+
+	ctxb := context.Background()
+	lndVersion, err := client.GetVersion(ctxb, &verrpc.VersionRequest{})
+	if err != nil {
+		printRespJSON(versions)
+		return fmt.Errorf("unable fetch version from lnd: %v", err)
+	}
+	versions.Lnd = lndVersion
+
+	printRespJSON(versions)
+
+	return nil
+}

cmd/lncli/main.go

@@ -301,6 +301,7 @@ func main() {
 		restoreChanBackupCommand,
 		bakeMacaroonCommand,
 		trackPaymentCommand,
+		versionCommand,
 	}
 
 	// Add any extra commands determined by build flags.

lnrpc/lnclipb/lncli.pb.go

@@ -0,0 +1,91 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// source: lnclipb/lncli.proto
+
+package lnclipb
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	verrpc "github.com/lightningnetwork/lnd/lnrpc/verrpc"
+	math "math"
+)
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ = proto.Marshal
+var _ = fmt.Errorf
+var _ = math.Inf
+
+// This is a compile-time assertion to ensure that this generated file
+// is compatible with the proto package it is being compiled against.
+// A compilation error at this line likely means your copy of the
+// proto package needs to be updated.
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
+
+type VersionResponse struct {
+	/// The version information for lncli.
+	Lncli *verrpc.Version `protobuf:"bytes,1,opt,name=lncli,proto3" json:"lncli,omitempty"`
+	/// The version information for lnd.
+	Lnd                  *verrpc.Version `protobuf:"bytes,2,opt,name=lnd,proto3" json:"lnd,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}        `json:"-"`
+	XXX_unrecognized     []byte          `json:"-"`
+	XXX_sizecache        int32           `json:"-"`
+}
+
+func (m *VersionResponse) Reset()         { *m = VersionResponse{} }
+func (m *VersionResponse) String() string { return proto.CompactTextString(m) }
+func (*VersionResponse) ProtoMessage()    {}
+func (*VersionResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_88b54c9c61b986c4, []int{0}
+}
+
+func (m *VersionResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_VersionResponse.Unmarshal(m, b)
+}
+func (m *VersionResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_VersionResponse.Marshal(b, m, deterministic)
+}
+func (m *VersionResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_VersionResponse.Merge(m, src)
+}
+func (m *VersionResponse) XXX_Size() int {
+	return xxx_messageInfo_VersionResponse.Size(m)
+}
+func (m *VersionResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_VersionResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_VersionResponse proto.InternalMessageInfo
+
+func (m *VersionResponse) GetLncli() *verrpc.Version {
+	if m != nil {
+		return m.Lncli
+	}
+	return nil
+}
+
+func (m *VersionResponse) GetLnd() *verrpc.Version {
+	if m != nil {
+		return m.Lnd
+	}
+	return nil
+}
+
+func init() {
+	proto.RegisterType((*VersionResponse)(nil), "lnclipb.VersionResponse")
+}
+
+func init() { proto.RegisterFile("lnclipb/lncli.proto", fileDescriptor_88b54c9c61b986c4) }
+
+var fileDescriptor_88b54c9c61b986c4 = []byte{
+	// 159 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x12, 0xce, 0xc9, 0x4b, 0xce,
+	0xc9, 0x2c, 0x48, 0xd2, 0x07, 0xd3, 0x7a, 0x05, 0x45, 0xf9, 0x25, 0xf9, 0x42, 0xec, 0x50, 0x41,
+	0x29, 0xe1, 0xb2, 0xd4, 0xa2, 0xa2, 0x82, 0x64, 0x7d, 0x08, 0x05, 0x91, 0x55, 0x8a, 0xe6, 0xe2,
+	0x0f, 0x4b, 0x2d, 0x2a, 0xce, 0xcc, 0xcf, 0x0b, 0x4a, 0x2d, 0x2e, 0xc8, 0xcf, 0x2b, 0x4e, 0x15,
+	0x52, 0xe5, 0x62, 0x05, 0x6b, 0x91, 0x60, 0x54, 0x60, 0xd4, 0xe0, 0x36, 0xe2, 0xd7, 0x83, 0x6a,
+	0x80, 0xa9, 0x83, 0xc8, 0x0a, 0x29, 0x72, 0x31, 0xe7, 0xe4, 0xa5, 0x48, 0x30, 0x61, 0x57, 0x04,
+	0x92, 0x73, 0xd2, 0x8f, 0xd2, 0x4d, 0xcf, 0x2c, 0xc9, 0x28, 0x4d, 0xd2, 0x4b, 0xce, 0xcf, 0xd5,
+	0xcf, 0xc9, 0x4c, 0xcf, 0x28, 0xc9, 0xcb, 0xcc, 0x4b, 0xcf, 0x4b, 0x2d, 0x29, 0xcf, 0x2f, 0xca,
+	0xd6, 0xcf, 0xc9, 0x4b, 0xd1, 0xcf, 0xc9, 0x03, 0x39, 0x09, 0xea, 0xc4, 0x24, 0x36, 0xb0, 0xa3,
+	0x8c, 0x01, 0x01, 0x00, 0x00, 0xff, 0xff, 0x4d, 0xfc, 0x5e, 0x89, 0xc9, 0x00, 0x00, 0x00,
+}

lnrpc/lnclipb/lncli.proto

@@ -0,0 +1,15 @@
+syntax = "proto3";
+
+import "verrpc/verrpc.proto";
+
+package lnclipb;
+
+option go_package = "github.com/lightningnetwork/lnd/lnrpc/lnclipb";
+
+message VersionResponse {
+    /// The version information for lncli.
+    verrpc.Version lncli = 1;
+
+    /// The version information for lnd.
+    verrpc.Version lnd = 2;
+};