Merge pull request #64 from guggero/lnd-0.10.2

mod: use lnd v0.10.2-beta, downgrade faraday

Author: guggero

Makefile

@@ -14,6 +14,7 @@ GOACC_BIN := $(GO_BIN)/go-acc
 STATIK_BIN := $(GO_BIN)/statik
 
 COMMIT := $(shell git describe --abbrev=40 --dirty --tags)
+COMMIT_HASH := $(shell git rev-parse HEAD)
 
 LINT_COMMIT := v1.18.0
 GOACC_COMMIT := ddc355013f90fea78d83d3a6c71f1d37ac07ecd5
@@ -40,7 +41,7 @@ include make/release_flags.mk
 # We only return the part inside the double quote here to avoid escape issues
 # when calling the external release script. The second parameter can be used to
 # add additional ldflags if needed (currently only used for the release).
-make_ldflags = $(2) -X $(LND_PKG)/build.Commit=$(COMMIT) \
+make_ldflags = $(2) -X $(LND_PKG)/build.Commit=shushtar-$(COMMIT) \
 	-X $(LND_PKG)/build.CommitHash=$(COMMIT_HASH) \
 	-X $(LND_PKG)/build.GoVersion=$(GOVERSION) \
 	-X $(LND_PKG)/build.RawTags=$(shell echo $(1) | sed -e 's/ /,/g')

go.mod

@@ -7,9 +7,9 @@ require (
 	github.com/grpc-ecosystem/grpc-gateway v1.12.2
 	github.com/improbable-eng/grpc-web v0.12.0
 	github.com/jessevdk/go-flags v1.4.0
-	github.com/lightninglabs/faraday v0.2.0-alpha
+	github.com/lightninglabs/faraday v0.1.0-alpha.0.20200518080657-d3726a59507c
 	github.com/lightninglabs/loop v0.6.3-beta
-	github.com/lightningnetwork/lnd v0.10.1
+	github.com/lightningnetwork/lnd v0.10.2-beta-rc1-branch
 	github.com/lightningnetwork/lnd/cert v1.0.2
 	github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f
 	github.com/mwitkow/grpc-proxy v0.0.0-20181017164139-0f1106ef9c76
@@ -26,6 +26,6 @@ require (
 
 // Manually solve the conflict between loop's lndclient version of lnd and what
 // we explicitly need for the unified binary to work.
-replace github.com/lightningnetwork/lnd => github.com/lightningnetwork/lnd v0.10.0-beta.rc6.0.20200603172101-595bb7c1ff14
+replace github.com/lightningnetwork/lnd => github.com/lightningnetwork/lnd v0.10.1-beta.rc3.0.20200618073938-797de8445bdb
 
 go 1.13