From 8358349b2d3e4dc629c4df4c0b8a2f8218e0ed2b Mon Sep 17 00:00:00 2001
From: Olaoluwa Osuntokun <laolu32@gmail.com>
Date: Thu, 19 Oct 2017 19:53:19 -0700
Subject: [PATCH] lnd: revert back to prior default wallet public passphrase
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

In this commit we ensure the behavior of lnd with the —noencryptwallet
command line option heaves as it did before user initiated wallet
encryption was implemented. We do this by modifying the
waitForWalletPassword method to instead return two pass phrases: one
public and one private. The default wallet public passphrase is then
restarted back to the value which was used stoically in the codebase
before the latest merged PR.
---
 chainregistry.go |  7 ++++---
 lnd.go           | 24 ++++++++++++++----------
 2 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/chainregistry.go b/chainregistry.go
index 4e4baf86a..a3571db15 100644
--- a/chainregistry.go
+++ b/chainregistry.go
@@ -103,7 +103,8 @@ type chainControl struct {
 // branches of chainControl instances exist: one backed by a running btcd
 // full-node, and the other backed by a running neutrino light client instance.
 func newChainControlFromConfig(cfg *config, chanDB *channeldb.DB,
-	walletPw []byte) (*chainControl, func(), error) {
+	privateWalletPw, publicWalletPw []byte) (*chainControl, func(), error) {
+
 	// Set the RPC config from the "home" chain. Multi-chain isn't yet
 	// active, so we'll restrict usage to a particular chain for now.
 	homeChainConfig := cfg.Bitcoin
@@ -132,8 +133,8 @@ func newChainControlFromConfig(cfg *config, chanDB *channeldb.DB,
 	}
 
 	walletConfig := &btcwallet.Config{
-		PrivatePass:  walletPw,
-		PublicPass:   walletPw,
+		PrivatePass:  privateWalletPw,
+		PublicPass:   publicWalletPw,
 		DataDir:      homeChainConfig.ChainDir,
 		NetParams:    activeNetParams.Params,
 		FeeEstimator: cc.feeEstimator,
diff --git a/lnd.go b/lnd.go
index ee36e8d20..afbfa50b7 100644
--- a/lnd.go
+++ b/lnd.go
@@ -190,10 +190,13 @@ func lndMain() error {
 	// We wait until the user provides a password over RPC. In case lnd is
 	// started with the --noencryptwallet flag, we use the default password
 	// "hello" for wallet encryption.
-	walletPw := []byte("hello")
+	privateWalletPw := []byte("hello")
+	publicWalletPw := []byte("public")
 	if !cfg.NoEncryptWallet {
-		walletPw, err = waitForWalletPassword(grpcEndpoint, restEndpoint,
-			serverOpts, proxyOpts, tlsConf, macaroonService)
+		privateWalletPw, publicWalletPw, err = waitForWalletPassword(
+			grpcEndpoint, restEndpoint, serverOpts, proxyOpts,
+			tlsConf, macaroonService,
+		)
 		if err != nil {
 			return err
 		}
@@ -203,7 +206,7 @@ func lndMain() error {
 	// instances of the pertinent interfaces required to operate the
 	// Lightning Network Daemon.
 	activeChainControl, chainCleanUp, err := newChainControlFromConfig(cfg,
-		chanDB, walletPw)
+		chanDB, privateWalletPw, publicWalletPw)
 	if err != nil {
 		fmt.Printf("unable to create chain control: %v\n", err)
 		return err
@@ -623,7 +626,8 @@ func genMacaroons(svc *bakery.Service, admFile, roFile string) error {
 // the user to this RPC server.
 func waitForWalletPassword(grpcEndpoint, restEndpoint string,
 	serverOpts []grpc.ServerOption, proxyOpts []grpc.DialOption,
-	tlsConf *tls.Config, macaroonService *bakery.Service) ([]byte, error) {
+	tlsConf *tls.Config, macaroonService *bakery.Service) ([]byte, []byte, error) {
+
 	// Set up a new PasswordService, which will listen
 	// for passwords provided over RPC.
 	grpcServer := grpc.NewServer(serverOpts...)
@@ -641,7 +645,7 @@ func waitForWalletPassword(grpcEndpoint, restEndpoint string,
 	lis, err := net.Listen("tcp", grpcEndpoint)
 	if err != nil {
 		fmt.Printf("failed to listen: %v", err)
-		return nil, err
+		return nil, nil, err
 	}
 	defer lis.Close()
 
@@ -667,7 +671,7 @@ func waitForWalletPassword(grpcEndpoint, restEndpoint string,
 	err = lnrpc.RegisterWalletUnlockerHandlerFromEndpoint(ctx, mux,
 		grpcEndpoint, proxyOpts)
 	if err != nil {
-		return nil, err
+		return nil, nil, err
 	}
 	srv := &http.Server{Handler: mux}
 	defer func() {
@@ -706,10 +710,10 @@ func waitForWalletPassword(grpcEndpoint, restEndpoint string,
 	// created if none exists when creating the chain control.
 	select {
 	case walletPw := <-pwService.CreatePasswords:
-		return walletPw, nil
+		return walletPw, walletPw, nil
 	case walletPw := <-pwService.UnlockPasswords:
-		return walletPw, nil
+		return walletPw, walletPw, nil
 	case <-shutdownChannel:
-		return nil, fmt.Errorf("shutting down")
+		return nil, nil, fmt.Errorf("shutting down")
 	}
 }