Extract ReadAezeedFromTerminal into library function

cmd/chantools/chanbackup.go

@@ -30,7 +30,7 @@ func (c *chanBackupCommand) Execute(_ []string) error {
 		extendedKey, err = hdkeychain.NewKeyFromString(c.RootKey)
 
 	default:
-		extendedKey, _, err = rootKeyFromConsole()
+		extendedKey, _, err = lnd.ReadAezeedFromTerminal(chainParams)
 	}
 	if err != nil {
 		return fmt.Errorf("error reading root key: %v", err)

cmd/chantools/derivekey.go

@@ -27,7 +27,7 @@ func (c *deriveKeyCommand) Execute(_ []string) error {
 		extendedKey, err = hdkeychain.NewKeyFromString(c.RootKey)
 
 	default:
-		extendedKey, _, err = rootKeyFromConsole()
+		extendedKey, _, err = lnd.ReadAezeedFromTerminal(chainParams)
 	}
 	if err != nil {
 		return fmt.Errorf("error reading root key: %v", err)

cmd/chantools/dumpbackup.go

@@ -30,7 +30,7 @@ func (c *dumpBackupCommand) Execute(_ []string) error {
 		extendedKey, err = hdkeychain.NewKeyFromString(c.RootKey)
 
 	default:
-		extendedKey, _, err = rootKeyFromConsole()
+		extendedKey, _, err = lnd.ReadAezeedFromTerminal(chainParams)
 	}
 	if err != nil {
 		return fmt.Errorf("error reading root key: %v", err)

cmd/chantools/filterbackup.go

@@ -32,7 +32,7 @@ func (c *filterBackupCommand) Execute(_ []string) error {
 		extendedKey, err = hdkeychain.NewKeyFromString(c.RootKey)
 
 	default:
-		extendedKey, _, err = rootKeyFromConsole()
+		extendedKey, _, err = lnd.ReadAezeedFromTerminal(chainParams)
 	}
 	if err != nil {
 		return fmt.Errorf("error reading root key: %v", err)

cmd/chantools/fixoldbackup.go

@@ -30,7 +30,7 @@ func (c *fixOldBackupCommand) Execute(_ []string) error {
 		extendedKey, err = hdkeychain.NewKeyFromString(c.RootKey)
 
 	default:
-		extendedKey, _, err = rootKeyFromConsole()
+		extendedKey, _, err = lnd.ReadAezeedFromTerminal(chainParams)
 	}
 	if err != nil {
 		return fmt.Errorf("error reading root key: %v", err)

cmd/chantools/forceclose.go

@@ -39,7 +39,7 @@ func (c *forceCloseCommand) Execute(_ []string) error {
 		extendedKey, err = hdkeychain.NewKeyFromString(c.RootKey)
 
 	default:
-		extendedKey, _, err = rootKeyFromConsole()
+		extendedKey, _, err = lnd.ReadAezeedFromTerminal(chainParams)
 	}
 	if err != nil {
 		return fmt.Errorf("error reading root key: %v", err)

cmd/chantools/genimportscript.go

@@ -44,7 +44,9 @@ func (c *genImportScriptCommand) Execute(_ []string) error {
 		}
 
 	default:
-		extendedKey, birthday, err = rootKeyFromConsole()
+		extendedKey, birthday, err = lnd.ReadAezeedFromTerminal(
+			chainParams,
+		)
 		if err != nil {
 			return fmt.Errorf("error reading root key: %v", err)
 		}

cmd/chantools/main.go

@@ -10,14 +10,11 @@ import (
 	"path"
 	"strings"
 	"syscall"
-	"time"
 
 	"github.com/btcsuite/btcd/chaincfg"
 	"github.com/btcsuite/btclog"
-	"github.com/btcsuite/btcutil/hdkeychain"
 	"github.com/guggero/chantools/dataformat"
 	"github.com/jessevdk/go-flags"
-	"github.com/lightningnetwork/lnd/aezeed"
 	"github.com/lightningnetwork/lnd/build"
 	"github.com/lightningnetwork/lnd/chanbackup"
 	"github.com/lightningnetwork/lnd/channeldb"
@@ -201,59 +198,6 @@ func readInput(input string) ([]byte, error) {
 	return ioutil.ReadFile(input)
 }
 
-func rootKeyFromConsole() (*hdkeychain.ExtendedKey, time.Time, error) {
-	// We'll now prompt the user to enter in their 24-word mnemonic.
-	fmt.Printf("Input your 24-word mnemonic separated by spaces: ")
-	reader := bufio.NewReader(os.Stdin)
-	mnemonicStr, err := reader.ReadString('\n')
-	if err != nil {
-		return nil, time.Unix(0, 0), err
-	}
-
-	// We'll trim off extra spaces, and ensure the mnemonic is all
-	// lower case, then populate our request.
-	mnemonicStr = strings.TrimSpace(mnemonicStr)
-	mnemonicStr = strings.ToLower(mnemonicStr)
-
-	cipherSeedMnemonic := strings.Split(mnemonicStr, " ")
-
-	fmt.Println()
-
-	if len(cipherSeedMnemonic) != 24 {
-		return nil, time.Unix(0, 0), fmt.Errorf("wrong cipher seed "+
-			"mnemonic length: got %v words, expecting %v words",
-			len(cipherSeedMnemonic), 24)
-	}
-
-	// Additionally, the user may have a passphrase, that will also
-	// need to be provided so the daemon can properly decipher the
-	// cipher seed.
-	fmt.Printf("Input your cipher seed passphrase (press enter if " +
-		"your seed doesn't have a passphrase): ")
-	passphrase, err := terminal.ReadPassword(int(syscall.Stdin)) // nolint
-	if err != nil {
-		return nil, time.Unix(0, 0), err
-	}
-	fmt.Println()
-
-	var mnemonic aezeed.Mnemonic
-	copy(mnemonic[:], cipherSeedMnemonic)
-
-	// If we're unable to map it back into the ciphertext, then either the
-	// mnemonic is wrong, or the passphrase is wrong.
-	cipherSeed, err := mnemonic.ToCipherSeed(passphrase)
-	if err != nil {
-		return nil, time.Unix(0, 0), fmt.Errorf("failed to decrypt "+
-			"seed with passphrase: %v", err)
-	}
-	rootKey, err := hdkeychain.NewMaster(cipherSeed.Entropy[:], chainParams)
-	if err != nil {
-		return nil, time.Unix(0, 0), fmt.Errorf("failed to derive " +
-			"master extended key")
-	}
-	return rootKey, cipherSeed.BirthdayTime(), nil
-}
-
 func passwordFromConsole(userQuery string) ([]byte, error) {
 	// Read from terminal (if there is one).
 	if terminal.IsTerminal(int(syscall.Stdin)) { // nolint

cmd/chantools/rescueclosed.go

@@ -50,7 +50,7 @@ func (c *rescueClosedCommand) Execute(_ []string) error {
 		extendedKey, err = hdkeychain.NewKeyFromString(c.RootKey)
 
 	default:
-		extendedKey, _, err = rootKeyFromConsole()
+		extendedKey, _, err = lnd.ReadAezeedFromTerminal(chainParams)
 	}
 	if err != nil {
 		return fmt.Errorf("error reading root key: %v", err)

cmd/chantools/rescuefunding.go

@@ -39,7 +39,7 @@ func (c *rescueFundingCommand) Execute(_ []string) error {
 		extendedKey, err = hdkeychain.NewKeyFromString(c.RootKey)
 
 	default:
-		extendedKey, _, err = rootKeyFromConsole()
+		extendedKey, _, err = lnd.ReadAezeedFromTerminal(chainParams)
 	}
 	if err != nil {
 		return fmt.Errorf("error reading root key: %v", err)

cmd/chantools/showrootkey.go

@@ -2,6 +2,8 @@ package main
 
 import (
 	"fmt"
+
+	"github.com/guggero/chantools/lnd"
 )
 
 type showRootKeyCommand struct{}
@@ -9,7 +11,7 @@ type showRootKeyCommand struct{}
 func (c *showRootKeyCommand) Execute(_ []string) error {
 	setupChainParams(cfg)
 
-	rootKey, _, err := rootKeyFromConsole()
+	rootKey, _, err := lnd.ReadAezeedFromTerminal(chainParams)
 	if err != nil {
 		return fmt.Errorf("failed to read root key from console: %v",
 			err)

cmd/chantools/sweeptimelock.go

@@ -41,7 +41,7 @@ func (c *sweepTimeLockCommand) Execute(_ []string) error {
 		extendedKey, err = hdkeychain.NewKeyFromString(c.RootKey)
 
 	default:
-		extendedKey, _, err = rootKeyFromConsole()
+		extendedKey, _, err = lnd.ReadAezeedFromTerminal(chainParams)
 	}
 	if err != nil {
 		return fmt.Errorf("error reading root key: %v", err)

lnd/aezeed.go

@@ -0,0 +1,70 @@
+package lnd
+
+import (
+	"bufio"
+	"fmt"
+	"os"
+	"strings"
+	"syscall"
+	"time"
+
+	"github.com/btcsuite/btcd/chaincfg"
+	"github.com/btcsuite/btcutil/hdkeychain"
+	"github.com/lightningnetwork/lnd/aezeed"
+	"golang.org/x/crypto/ssh/terminal"
+)
+
+func ReadAezeedFromTerminal(params *chaincfg.Params) (*hdkeychain.ExtendedKey,
+	time.Time, error) {
+
+	// We'll now prompt the user to enter in their 24-word mnemonic.
+	fmt.Printf("Input your 24-word mnemonic separated by spaces: ")
+	reader := bufio.NewReader(os.Stdin)
+	mnemonicStr, err := reader.ReadString('\n')
+	if err != nil {
+		return nil, time.Unix(0, 0), err
+	}
+
+	// We'll trim off extra spaces, and ensure the mnemonic is all
+	// lower case, then populate our request.
+	mnemonicStr = strings.TrimSpace(mnemonicStr)
+	mnemonicStr = strings.ToLower(mnemonicStr)
+
+	cipherSeedMnemonic := strings.Split(mnemonicStr, " ")
+
+	fmt.Println()
+
+	if len(cipherSeedMnemonic) != 24 {
+		return nil, time.Unix(0, 0), fmt.Errorf("wrong cipher seed "+
+			"mnemonic length: got %v words, expecting %v words",
+			len(cipherSeedMnemonic), 24)
+	}
+
+	// Additionally, the user may have a passphrase, that will also
+	// need to be provided so the daemon can properly decipher the
+	// cipher seed.
+	fmt.Printf("Input your cipher seed passphrase (press enter if " +
+		"your seed doesn't have a passphrase): ")
+	passphrase, err := terminal.ReadPassword(int(syscall.Stdin)) // nolint
+	if err != nil {
+		return nil, time.Unix(0, 0), err
+	}
+	fmt.Println()
+
+	var mnemonic aezeed.Mnemonic
+	copy(mnemonic[:], cipherSeedMnemonic)
+
+	// If we're unable to map it back into the ciphertext, then either the
+	// mnemonic is wrong, or the passphrase is wrong.
+	cipherSeed, err := mnemonic.ToCipherSeed(passphrase)
+	if err != nil {
+		return nil, time.Unix(0, 0), fmt.Errorf("failed to decrypt "+
+			"seed with passphrase: %v", err)
+	}
+	rootKey, err := hdkeychain.NewMaster(cipherSeed.Entropy[:], params)
+	if err != nil {
+		return nil, time.Unix(0, 0), fmt.Errorf("failed to derive " +
+			"master extended key")
+	}
+	return rootKey, cipherSeed.BirthdayTime(), nil
+}