Merge branch 'master' into closed-channel-payment

* master:
  add network info in payment failure.
  rescan when force bootstrap is found.
  add missing parameter.
  In case neutrino files are deleted, make sure we sync to chain on start.
  don't return error on bootstrap when chain service already exists. This means the bootstrap has already been done.
  stop chain service before closing the walletDB

account/payments.go

@@ -14,6 +14,7 @@ import (
 
 	"github.com/breez/breez/data"
 	"github.com/breez/breez/db"
+	"github.com/golang/protobuf/jsonpb"
 	"github.com/lightningnetwork/lnd/lnrpc"
 )
 
@@ -224,6 +225,18 @@ func (a *Service) createPaymentTraceReport(paymentRequest string, amount int64,
 		return "", err
 	}
 
+	netInfo, err := lnclient.GetNetworkInfo(context.Background(), &lnrpc.NetworkInfoRequest{})
+	if err != nil {
+		a.log.Errorf("GetNetworkInfo error: %v", err)
+		return "", err
+	}
+	marshaller := jsonpb.Marshaler{}
+	netInfoData, err := marshaller.MarshalToString(netInfo)
+	if err != nil {
+		a.log.Errorf("failed to marshal network info: %v", err)
+		return "", err
+	}
+
 	if amount == 0 {
 		amount = decodedPayReq.NumSatoshis
 	}
@@ -233,6 +246,7 @@ func (a *Service) createPaymentTraceReport(paymentRequest string, amount int64,
 			"source_node":     lnInfo.IdentityPubkey,
 			"amount":          amount,
 			"payment_request": decodedPayReq,
+			"network_info":    netInfoData,
 		},
 	}
 

app_init.go

@@ -70,7 +70,7 @@ func (a *AuthService) SignIn() (string, error) {
 }
 
 // NewApp create a new application
-func NewApp(workingDir string, applicationServices AppServices) (*App, error) {
+func NewApp(workingDir string, applicationServices AppServices, startBeforeSync bool) (*App, error) {
 	app := &App{
 		quitChan:          make(chan struct{}),
 		notificationsChan: make(chan data.NotificationEvent),
@@ -101,7 +101,7 @@ func NewApp(workingDir string, applicationServices AppServices) (*App, error) {
 
 	app.log.Infof("New db")
 
-	app.lnDaemon, err = lnnode.NewDaemon(app.cfg, app.breezDB)
+	app.lnDaemon, err = lnnode.NewDaemon(app.cfg, app.breezDB, startBeforeSync)
 	if err != nil {
 		return nil, fmt.Errorf("Failed to create lnnode.Daemon: %v", err)
 	}

bindings/api.go

@@ -119,17 +119,18 @@ func Init(tempDir string, workingDir string, services AppServices) (err error) {
 		return err
 	}
 	appLogger.Log("Breez initialization started", "INFO")
+	startBeforeSync := true
+	shouldForceRescan := false
+	shouldForceBootstrap := false
+	if _, err := os.Stat(path.Join(workingDir, forceRescan)); err == nil {
+		appLogger.Log(fmt.Sprintf("%v present. Run Drop", forceRescan), "INFO")
+		shouldForceRescan = true
+	}
 	if _, err := os.Stat(path.Join(workingDir, forceBootstrap)); err == nil {
 		appLogger.Log(fmt.Sprintf("%v present. Deleting neutrino files", forceBootstrap), "INFO")
-		err = chainservice.ResetChainService(workingDir)
-		appLogger.Log(fmt.Sprintf("Delete result: %v", err), "INFO")
-		if err == nil {
-			err = os.Remove(path.Join(workingDir, forceBootstrap))
-			appLogger.Log(fmt.Sprintf("Removed file: %v result: %v", forceBootstrap, err), "INFO")
-		}
+		shouldForceBootstrap = true
 	}
-	if _, err := os.Stat(path.Join(workingDir, forceRescan)); err == nil {
-		appLogger.Log(fmt.Sprintf("%v present. Run Drop", forceRescan), "INFO")
+	if shouldForceBootstrap || shouldForceRescan {
 		err = dropwtx.Drop(workingDir)
 		appLogger.Log(fmt.Sprintf("Drop result: %v", err), "INFO")
 		err = drophintcache.Drop(workingDir)
@@ -138,9 +139,18 @@ func Init(tempDir string, workingDir string, services AppServices) (err error) {
 			err = os.Remove(path.Join(workingDir, forceRescan))
 			appLogger.Log(fmt.Sprintf("Removed file: %v result: %v", forceRescan, err), "INFO")
 		}
+		if shouldForceBootstrap {
+			err = chainservice.ResetChainService(workingDir)
+			appLogger.Log(fmt.Sprintf("Delete result: %v", err), "INFO")
+			if err == nil {
+				err = os.Remove(path.Join(workingDir, forceBootstrap))
+				startBeforeSync = false
+				appLogger.Log(fmt.Sprintf("Removed file: %v result: %v", forceBootstrap, err), "INFO")
+			}
+		}
 	}
 	mu.Lock()
-	breezApp, err = breez.NewApp(workingDir, services)
+	breezApp, err = breez.NewApp(workingDir, services, startBeforeSync)
 	mu.Unlock()
 	if err != nil {
 		appLogger.Log("Breez initialization failed: %v", "INFO")
@@ -260,7 +270,7 @@ func RestoreBackup(nodeID string, encryptionKey []byte) (err error) {
 	}
 	encKey := append([]byte(nil), encryptionKey...)
 	_, err = getBreezApp().BackupManager.Restore(nodeID, encKey)
-	breezApp, _ = breez.NewApp(getBreezApp().GetWorkingDir(), appServices)
+	breezApp, _ = breez.NewApp(getBreezApp().GetWorkingDir(), appServices, true)
 	return err
 }
 

chainservice/bootstrap.go

@@ -3,7 +3,6 @@ package chainservice
 import (
 	"bytes"
 	"encoding/binary"
-	"errors"
 	"os"
 	"path"
 	"sync"
@@ -95,7 +94,8 @@ func Bootstrap(workingDir string) error {
 	logger = logBackend.Logger("CHAIN")
 	logger.Infof("Bootstrap started")
 	if service != nil {
-		return errors.New("Chain service already created, can't bootstrap")
+		logger.Info("Chain service already created, already bootstrapped")
+		return nil
 	}
 
 	bootstrapped, err := Bootstrapped(workingDir)

chainservice/init.go

@@ -134,18 +134,17 @@ func createService(workingDir string, breezDB *db.DB) (*neutrino.ChainService, r
 }
 
 func stopService() error {
-
-	if walletDB != nil {
-		if err := walletDB.Close(); err != nil {
-			return err
-		}
-	}
 	if service != nil {
 		if err := service.Stop(); err != nil {
 			return err
 		}
 		service = nil
 	}
+	if walletDB != nil {
+		if err := walletDB.Close(); err != nil {
+			return err
+		}
+	}
 	return nil
 }
 

lnnode/daemon.go

@@ -142,7 +142,9 @@ func (d *Daemon) startDaemon() error {
 		params := []string{"lightning-libs",
 			"--lnddir", deps.workingDir,
 			"--bitcoin." + d.cfg.Network,
-			"--bitcoin.startbeforesynced",
+		}
+		if d.startBeforeSync {
+			params = append(params, "--bitcoin.startbeforesynced")
 		}
 		err = lnd.Main(lnd.ListenerCfg{}, params, deps)
 

lnnode/init.go

@@ -45,20 +45,22 @@ type Daemon struct {
 	routerClient      routerrpc.RouterClient
 	ntfnServer        *subscribe.Server
 	quitChan          chan struct{}
+	startBeforeSync   bool
 }
 
 // NewDaemon is used to create a new daemon that wraps a lightning
 // network daemon.
-func NewDaemon(cfg *config.Config, db *db.DB) (*Daemon, error) {
+func NewDaemon(cfg *config.Config, db *db.DB, startBeforeSync bool) (*Daemon, error) {
 	logBackend, err := breezlog.GetLogBackend(cfg.WorkingDir)
 	if err != nil {
 		return nil, err
 	}
 
 	return &Daemon{
-		cfg:        cfg,
-		breezDB:    db,
-		ntfnServer: subscribe.NewServer(),
-		log:        logBackend.Logger("DAEM"),
+		cfg:             cfg,
+		breezDB:         db,
+		ntfnServer:      subscribe.NewServer(),
+		log:             logBackend.Logger("DAEM"),
+		startBeforeSync: startBeforeSync,
 	}, nil
 }