Merge pull request #181 from guggero/lnd-version-aware

Make loop aware of lnd's version

Author: guggero

README.md

@@ -57,25 +57,36 @@ problems. Community support is also available in the
 LND and the loop client are using Go modules. Make sure that the `GO111MODULE`
 env variable is set to `on`.
 
-In order to execute a swap, **You need to run lnd 0.7.1+, or master built with
-sub-servers enabled.**
+In order to execute a swap, **you need to run a compatible lnd version built
+with the correct sub-servers enabled.**
 
 ### LND
 
-If you are building from source, and not using a 0.7.1 or higher release of
-lnd, make sure that you are using the `master` branch of lnd. You can get this
-by git cloning the repository
+To run loop, you need a compatible version of `lnd` running. It is generally
+recommended to always keep both `lnd` and `loop` updated to the most recent
+released version. If you need to run an older version of `lnd`, please consult
+the following table for supported versions.
+
+Loop Version | Compatible LND Version(s)
+------------------|------------------
+`>= v0.6.0-beta`  | `v0.10.x-beta`
+`<= 0.5.1-beta`   | `v0.7.1-beta` - `v0.10.x-beta`
+
+If you are building from source make sure you are using the latest tagged
+version of lnd. You can get this by git cloning the repository and checking out
+a specific tag:
 
 ```
 git clone https://github.com/lightningnetwork/lnd.git
+cd lnd
+git checkout v0.10.0-beta
 ```
 
 Once the lnd repository is cloned, it will need to be built with special build
 tags that enable the swap. This enables the required lnd rpc services.
 
 ```
-cd lnd
-make install tags="signrpc walletrpc chainrpc invoicesrpc routerrpc"
+make install tags="signrpc walletrpc chainrpc invoicesrpc"
 ```
 
 Check to see if you have already installed lnd. If you have, you will need to

client.go

@@ -2,9 +2,7 @@ package loop
 
 import (
 	"context"
-	"encoding/hex"
 	"errors"
-	"fmt"
 	"strings"
 	"sync"
 	"sync/atomic"
@@ -211,13 +209,9 @@ func (s *Client) Run(ctx context.Context,
 	}
 
 	// Log connected node.
-	info, err := s.lndServices.Client.GetInfo(ctx)
-	if err != nil {
-		return fmt.Errorf("GetInfo error: %v", err)
-	}
-	log.Infof("Connected to lnd node %v with pubkey %v",
-		info.Alias, hex.EncodeToString(info.IdentityPubkey[:]),
-	)
+	log.Infof("Connected to lnd node '%v' with pubkey %x (version %s)",
+		s.lndServices.NodeAlias, s.lndServices.NodePubkey,
+		lndclient.VersionString(s.lndServices.Version))
 
 	// Setup main context used for cancelation.
 	mainCtx, mainCancel := context.WithCancel(ctx)

client_test.go

@@ -35,14 +35,13 @@ var (
 	prepayInvoiceDesc = "prepay"
 )
 
-// TestSuccess tests the uncharge happy flow.
+// TestSuccess tests the loop out happy flow.
 func TestSuccess(t *testing.T) {
 	defer test.Guard(t)()
 
 	ctx := createClientTestContext(t, nil)
 
-	// Initiate uncharge.
-
+	// Initiate loop out.
 	hash, _, err := ctx.swapClient.LoopOut(context.Background(), testRequest)
 	if err != nil {
 		t.Fatal(err)
@@ -54,7 +53,7 @@ func TestSuccess(t *testing.T) {
 	signalSwapPaymentResult := ctx.AssertPaid(swapInvoiceDesc)
 	signalPrepaymentResult := ctx.AssertPaid(prepayInvoiceDesc)
 
-	// Expect client to register for conf
+	// Expect client to register for conf.
 	confIntent := ctx.AssertRegisterConf()
 
 	testSuccess(ctx, testRequest.Amount, *hash,
@@ -228,7 +227,7 @@ func testResume(t *testing.T, expired, preimageRevealed, expectSuccess bool) {
 	signalSwapPaymentResult := ctx.AssertPaid(swapInvoiceDesc)
 	signalPrepaymentResult := ctx.AssertPaid(prepayInvoiceDesc)
 
-	// Expect client to register for conf
+	// Expect client to register for conf.
 	confIntent := ctx.AssertRegisterConf()
 
 	signalSwapPaymentResult(nil)