Merge pull request #141 from lightninglabs/loop-user-agent-initiator

Loop user agent initiator

Author: guggero

Makefile

@@ -1,6 +1,7 @@
 PKG := github.com/lightninglabs/lightning-terminal
 ESCPKG := github.com\/lightninglabs\/lightning-terminal
 LND_PKG := github.com/lightningnetwork/lnd
+LOOP_PKG := github.com/lightninglabs/loop
 
 LINT_PKG := github.com/golangci/golangci-lint/cmd/golangci-lint
 GOVERALLS_PKG := github.com/mattn/goveralls
@@ -16,6 +17,12 @@ STATIK_BIN := $(GO_BIN)/statik
 COMMIT := $(shell git describe --abbrev=40 --dirty --tags)
 COMMIT_HASH := $(shell git rev-parse HEAD)
 
+LOOP_COMMIT := $(shell cat go.mod | \
+		grep $(LOOP_PKG) | \
+		head -n1 | \
+		awk -F " " '{ print $$2 }' | \
+		awk -F "/" '{ print $$1 }')
+
 LINT_COMMIT := v1.18.0
 GOACC_COMMIT := ddc355013f90fea78d83d3a6c71f1d37ac07ecd5
 
@@ -44,7 +51,8 @@ include make/release_flags.mk
 make_ldflags = $(2) -X $(LND_PKG)/build.Commit=lightning-terminal-$(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')
+	-X $(LND_PKG)/build.RawTags=$(shell echo $(1) | sed -e 's/ /,/g') \
+	-X $(LOOP_PKG).Commit=$(LOOP_COMMIT)
 
 LDFLAGS := $(call make_ldflags, $(LND_RELEASE_TAGS))
 

app/src/api/loop.ts

@@ -5,6 +5,8 @@ import Big from 'big.js';
 import BaseApi from './base';
 import GrpcClient from './grpc';
 
+const LOOP_INITIATOR = 'lit-ui';
+
 /** the names and argument types for the subscription events */
 interface LoopEvents {
   monitor: LOOP.SwapStatus.AsObject;
@@ -89,6 +91,7 @@ class LoopApi extends BaseApi<LoopEvents> {
     req.setAmt(+amount);
     req.setMaxSwapFee(+quote.swapFee);
     req.setMaxMinerFee(+quote.minerFee);
+    req.setInitiator(LOOP_INITIATOR);
     if (lastHop) req.setLastHop(Buffer.from(lastHop, 'hex').toString('base64'));
     if (confTarget) req.setHtlcConfTarget(confTarget);
     const res = await this._grpc.request(SwapClient.LoopIn, req, this._meta);
@@ -115,6 +118,7 @@ class LoopApi extends BaseApi<LoopEvents> {
     req.setMaxPrepayRoutingFee(this._calcRoutingFee(+quote.prepayAmount));
     req.setOutgoingChanSetList(chanIds);
     req.setSwapPublicationDeadline(deadline);
+    req.setInitiator(LOOP_INITIATOR);
     if (confTarget) req.setSweepConfTarget(confTarget);
     if (destAddress) req.setDest(destAddress);
 

go.mod

@@ -10,7 +10,7 @@ require (
 	github.com/lightninglabs/aperture v0.1.3-beta
 	github.com/lightninglabs/faraday v0.2.2-alpha
 	github.com/lightninglabs/lndclient v0.11.0-3
-	github.com/lightninglabs/loop v0.11.0-beta.0.20201030095204-66eff361c2ef
+	github.com/lightninglabs/loop v0.11.1-beta
 	github.com/lightninglabs/pool v0.3.2-alpha
 	github.com/lightningnetwork/lnd v0.11.1-beta
 	github.com/lightningnetwork/lnd/cert v1.0.3

go.sum

@@ -230,8 +230,8 @@ github.com/lightninglabs/lndclient v0.11.0-0/go.mod h1:8/cTKNwgL87NX123gmlv3Xh6p
 github.com/lightninglabs/lndclient v0.11.0-3 h1:x8co3UOeaUwh0iBFNeaPaqJsg8gvlgV/+fQHp2MT9eI=
 github.com/lightninglabs/lndclient v0.11.0-3/go.mod h1:8/cTKNwgL87NX123gmlv3Xh6p1a7pvzu+40Un3PhHiI=
 github.com/lightninglabs/lndclient v0.11.0-3/go.mod h1:8/cTKNwgL87NX123gmlv3Xh6p1a7pvzu+40Un3PhHiI=
-github.com/lightninglabs/loop v0.11.0-beta.0.20201030095204-66eff361c2ef h1:t8Y2vF10nJUdDuhDcTrd2mEEls/jcIlpass03FpUP0g=
-github.com/lightninglabs/loop v0.11.0-beta.0.20201030095204-66eff361c2ef/go.mod h1:xZfGG0AbxwAoarGGLeEl8TEzGm/Wz81L8IN51iqWn3M=
+github.com/lightninglabs/loop v0.11.1-beta h1:FN2MJBn3MIFLxjdyOCqyVSSopFMHQDX5HtqNBdx4svE=
+github.com/lightninglabs/loop v0.11.1-beta/go.mod h1:xZfGG0AbxwAoarGGLeEl8TEzGm/Wz81L8IN51iqWn3M=
 github.com/lightninglabs/neutrino v0.11.0/go.mod h1:CuhF0iuzg9Sp2HO6ZgXgayviFTn1QHdSTJlMncK80wg=
 github.com/lightninglabs/neutrino v0.11.1-0.20200316235139-bffc52e8f200 h1:j4iZ1XlUAPQmW6oSzMcJGILYsRHNs+4O3Gk+2Ms5Dww=
 github.com/lightninglabs/neutrino v0.11.1-0.20200316235139-bffc52e8f200/go.mod h1:MlZmoKa7CJP3eR1s5yB7Rm5aSyadpKkxqAwLQmog7N0=