Revert "multi: persist remote static key for handshakev2"

This reverts commit 31713c6.
We will bump LNC to the latest version once the Terminal Web UI is ready
to persist the keys as well.

Author: guggero

go.mod

@@ -10,7 +10,7 @@ require (
 	github.com/improbable-eng/grpc-web v0.12.0
 	github.com/jessevdk/go-flags v1.4.0
 	github.com/lightninglabs/faraday v0.2.7-alpha
-	github.com/lightninglabs/lightning-node-connect v0.1.9-alpha
+	github.com/lightninglabs/lightning-node-connect v0.1.8-alpha
 	github.com/lightninglabs/lndclient v0.14.2-3
 	github.com/lightninglabs/loop v0.18.0-beta-lnd-14
 	github.com/lightninglabs/loop/swapserverrpc v1.0.1

go.sum

@@ -610,8 +610,8 @@ github.com/lightninglabs/faraday v0.2.7-alpha h1:lpSUk3RFfgr4/OCx1OdJ2AMHCAiTObK
 github.com/lightninglabs/faraday v0.2.7-alpha/go.mod h1:77P9EctYhneIXLvm9a6ylV9LCht/rj7j8mLwXpBgxB8=
 github.com/lightninglabs/gozmq v0.0.0-20191113021534-d20a764486bf h1:HZKvJUHlcXI/f/O0Avg7t8sqkPo78HFzjmeYFl6DPnc=
 github.com/lightninglabs/gozmq v0.0.0-20191113021534-d20a764486bf/go.mod h1:vxmQPeIQxPf6Jf9rM8R+B4rKBqLA2AjttNxkFBL2Plk=
-github.com/lightninglabs/lightning-node-connect v0.1.9-alpha h1:ri3tgMegrxffg7w+hrC2vzdler5xJp/G74gI/7uCVgU=
-github.com/lightninglabs/lightning-node-connect v0.1.9-alpha/go.mod h1:jxSnezQYIvhNXqjyyiMEmdpOURrdVaujPZV6zGCVi8o=
+github.com/lightninglabs/lightning-node-connect v0.1.8-alpha h1:bJ66JvVQCqEao4nLrPSahYtGtljUQ8tU9xx2nL/QfZE=
+github.com/lightninglabs/lightning-node-connect v0.1.8-alpha/go.mod h1:jxSnezQYIvhNXqjyyiMEmdpOURrdVaujPZV6zGCVi8o=
 github.com/lightninglabs/lightning-node-connect/hashmailrpc v1.0.2 h1:Er1miPZD2XZwcfE4xoS5AILqP1mj7kqnhbBSxW9BDxY=
 github.com/lightninglabs/lightning-node-connect/hashmailrpc v1.0.2/go.mod h1:antQGRDRJiuyQF6l+k6NECCSImgCpwaZapATth2Chv4=
 github.com/lightninglabs/lndclient v0.11.0-4/go.mod h1:8/cTKNwgL87NX123gmlv3Xh6p1a7pvzu+40Un3PhHiI=
@@ -631,8 +631,6 @@ github.com/lightninglabs/neutrino v0.11.1-0.20201210023533-e1978372d15e/go.mod h
 github.com/lightninglabs/neutrino v0.12.1/go.mod h1:GlKninWpRBbL7b8G0oQ36/8downfnFwKsr0hbRA6E/E=
 github.com/lightninglabs/neutrino v0.13.0 h1:j3PKWEJCwqwMn/qLASz2j0IuCF6AumS9DaM0i0pM/nY=
 github.com/lightninglabs/neutrino v0.13.0/go.mod h1:GlKninWpRBbL7b8G0oQ36/8downfnFwKsr0hbRA6E/E=
-github.com/lightninglabs/pool v0.5.5-alpha h1:/tte6k6fJeZlb1v0d7OkUo9tKCMarmcs3ZGdJ1nSsp8=
-github.com/lightninglabs/pool v0.5.5-alpha/go.mod h1:asKvGWumYLB4mLXAqHRjfho22/puMoRHs8JWO3C1qR8=
 github.com/lightninglabs/pool v0.5.6-alpha-lnd-14 h1:SH7ycdd/nKAYc80vnjFKCKlhdHDYkxo4t14bT8+7jko=
 github.com/lightninglabs/pool v0.5.6-alpha-lnd-14/go.mod h1:asKvGWumYLB4mLXAqHRjfho22/puMoRHs8JWO3C1qR8=
 github.com/lightninglabs/pool/auctioneerrpc v1.0.5 h1:TIPnH3gPQxoN4HQ+3ATO5geTB6kthBtnx3TLROa6QE0=

itest/litd_mode_integrated_test.go

@@ -3,6 +3,7 @@ package itest
 import (
 	"bytes"
 	"context"
+	"crypto/sha512"
 	"crypto/tls"
 	"crypto/x509"
 	"encoding/base64"
@@ -763,24 +764,24 @@ func getServerCertificates(hostPort string) ([]*x509.Certificate, error) {
 func connectMailbox(ctx context.Context,
 	connectPhrase []string) (grpc.ClientConnInterface, error) {
 
-	var mnemonicWords [mailbox.NumPassphraseWords]string
+	var mnemonicWords [mailbox.NumPasswordWords]string
 	copy(mnemonicWords[:], connectPhrase)
-	passphrase := mailbox.PassphraseMnemonicToEntropy(mnemonicWords)
+	password := mailbox.PasswordMnemonicToEntropy(mnemonicWords)
+
+	sid := sha512.Sum512(password[:])
 
 	privKey, err := btcec.NewPrivateKey(btcec.S256())
 	if err != nil {
 		return nil, err
 	}
 	ecdh := &keychain.PrivKeyECDH{PrivKey: privKey}
 
-	connData := mailbox.NewConnData(ecdh, nil, passphrase[:], nil, nil, nil)
-
-	transportConn, err := mailbox.NewClient(ctx, connData)
+	transportConn, err := mailbox.NewClient(ctx, sid)
 	if err != nil {
 		return nil, err
 	}
 
-	noiseConn := mailbox.NewNoiseGrpcConn(connData)
+	noiseConn := mailbox.NewNoiseGrpcConn(ecdh, nil, password[:])
 
 	dialOpts := []grpc.DialOption{
 		grpc.WithContextDialer(transportConn.Dial),

session/interface.go

@@ -47,7 +47,7 @@ type Session struct {
 	DevServer       bool
 	MacaroonRootKey uint64
 	MacaroonRecipe  *MacaroonRecipe
-	PairingSecret   [mailbox.NumPassphraseEntropyBytes]byte
+	PairingSecret   [mailbox.NumPasswordBytes]byte
 	LocalPrivateKey *btcec.PrivateKey
 	LocalPublicKey  *btcec.PublicKey
 	RemotePublicKey *btcec.PublicKey
@@ -58,7 +58,7 @@ func NewSession(label string, typ Type, expiry time.Time, serverAddr string,
 	devServer bool, perms []bakery.Op, caveats []macaroon.Caveat) (*Session,
 	error) {
 
-	_, pairingSecret, err := mailbox.NewPassphraseEntropy()
+	_, pairingSecret, err := mailbox.NewPassword()
 	if err != nil {
 		return nil, fmt.Errorf("error deriving pairing secret: %v", err)
 	}

session/server.go

@@ -32,27 +32,16 @@ func newMailboxSession() *mailboxSession {
 }
 
 func (m *mailboxSession) start(session *Session,
-	serverCreator GRPCServerCreator, authData []byte,
-	onUpdate func(sess *Session) error) error {
+	serverCreator GRPCServerCreator, authData []byte) error {
 
 	tlsConfig := &tls.Config{}
 	if session.DevServer {
 		tlsConfig = &tls.Config{InsecureSkipVerify: true}
 	}
 
-	ecdh := &keychain.PrivKeyECDH{PrivKey: session.LocalPrivateKey}
-
-	keys := mailbox.NewConnData(
-		ecdh, session.RemotePublicKey, session.PairingSecret[:],
-		authData, func(key *btcec.PublicKey) error {
-			session.RemotePublicKey = key
-			return onUpdate(session)
-		}, nil,
-	)
-
 	// Start the mailbox gRPC server.
 	mailboxServer, err := mailbox.NewServer(
-		session.ServerAddr, keys,
+		session.ServerAddr, session.PairingSecret[:],
 		grpc.WithTransportCredentials(credentials.NewTLS(tlsConfig)),
 		grpc.WithKeepaliveParams(keepalive.ClientParameters{
 			Time: 2 * time.Minute,
@@ -62,7 +51,10 @@ func (m *mailboxSession) start(session *Session,
 		return err
 	}
 
-	noiseConn := mailbox.NewNoiseGrpcConn(keys)
+	ecdh := &keychain.PrivKeyECDH{PrivKey: session.LocalPrivateKey}
+	noiseConn := mailbox.NewNoiseGrpcConn(
+		ecdh, authData, session.PairingSecret[:],
+	)
 	m.server = serverCreator(grpc.Creds(noiseConn))
 
 	m.wg.Add(1)
@@ -103,8 +95,8 @@ func NewServer(serverCreator GRPCServerCreator) *Server {
 	}
 }
 
-func (s *Server) StartSession(session *Session, authData []byte,
-	onUpdate func(sess *Session) error) (chan struct{}, error) {
+func (s *Server) StartSession(session *Session, authData []byte) (chan struct{},
+	error) {
 
 	s.activeSessionsMtx.Lock()
 	defer s.activeSessionsMtx.Unlock()
@@ -120,9 +112,7 @@ func (s *Server) StartSession(session *Session, authData []byte,
 	sess := newMailboxSession()
 	s.activeSessions[id] = sess
 
-	return sess.quit, sess.start(
-		session, s.serverCreator, authData, onUpdate,
-	)
+	return sess.quit, sess.start(session, s.serverCreator, authData)
 }
 
 func (s *Server) StopSession(localPublicKey *btcec.PublicKey) error {

session/store.go

@@ -3,6 +3,7 @@ package session
 import (
 	"bytes"
 	"errors"
+
 	"github.com/btcsuite/btcd/btcec"
 	"go.etcd.io/bbolt"
 )

session_rpcserver.go

@@ -141,9 +141,7 @@ func (s *sessionRpcServer) resumeSession(sess *session.Session) error {
 		return nil
 	}
 
-	sessionClosedSub, err := s.sessionServer.StartSession(
-		sess, authData, s.db.StoreSession,
-	)
+	sessionClosedSub, err := s.sessionServer.StartSession(sess, authData)
 	if err != nil {
 		return err
 	}
@@ -242,7 +240,7 @@ func marshalRPCSession(sess *session.Session) (*litrpc.Session, error) {
 		remotePubKey = sess.RemotePublicKey.SerializeCompressed()
 	}
 
-	mnemonic, err := mailbox.PassphraseEntropyToMnemonic(sess.PairingSecret)
+	mnemonic, err := mailbox.PasswordEntropyToMnemonic(sess.PairingSecret)
 	if err != nil {
 		return nil, err
 	}