multi: fix rebase issues, update release notes

Author: Roasbeef

docs/release-notes/release-notes-0.14.3.md

@@ -15,6 +15,35 @@
   A bug in the remote signer health check was also fixed that lead to too many
   open connections.
 
+* [Added signature length
+  validation](https://github.com/lightningnetwork/lnd/pull/6314) when calling
+  `NewSigFromRawSignature`.
+
+* [Fixed deadlock in invoice
+  registry](https://github.com/lightningnetwork/lnd/pull/6332).
+
+* [Fixed an issue that would cause wallet UTXO state to be incorrect if a 3rd
+  party sweeps our anchor
+  output](https://github.com/lightningnetwork/lnd/pull/6274).
+
+## Code Health
+
+### Code cleanup, refactor, typo fixes
+
+* [A refactor of
+  `SelectHopHints`](https://github.com/lightningnetwork/lnd/pull/6182) allows
+  code external to lnd to call the function, where previously it would require
+  access to lnd's internals.
+
+## Misc
+
+* [Make etcd leader election session
+  TTL](https://github.com/lightningnetwork/lnd/pull/6342) configurable.
+
 # Contributors (Alphabetical Order)
 
+* Andras Banki-Horvath
+* Carla Kirk-Cohen
+* Olaoluwa Osuntokun
 * Oliver Gugger
+* Yong Yu

docs/release-notes/release-notes-0.15.0.md

@@ -7,7 +7,9 @@ import (
 	"strings"
 	"time"
 
+	"github.com/btcsuite/btcd/chaincfg/chainhash"
 	"github.com/btcsuite/btcd/txscript"
+	"github.com/btcsuite/btcd/wire"
 	"github.com/btcsuite/btcutil"
 	"github.com/lightningnetwork/lnd/lnrpc"
 	"github.com/lightningnetwork/lnd/lnrpc/walletrpc"

lntest/itest/lnd_onchain_test.go

@@ -6,6 +6,9 @@ import (
 	"fmt"
 
 	"github.com/btcsuite/btcd/btcec"
+	"github.com/btcsuite/btcd/txscript"
+	"github.com/btcsuite/btcd/wire"
+	"github.com/btcsuite/btcutil"
 	"github.com/lightningnetwork/lnd/keychain"
 	"github.com/lightningnetwork/lnd/lnrpc"
 	"github.com/lightningnetwork/lnd/lnrpc/signrpc"
@@ -219,7 +222,7 @@ func runSignOutputRaw(t *harnessTest, net *lntest.NetworkHarness,
 	require.NoError(t.t, err)
 	require.Equal(t.t, int32(0), keyDesc.KeyLoc.KeyIndex)
 
-	targetPubKey, err := btcec.ParsePubKey(keyDesc.RawKeyBytes)
+	targetPubKey, err := btcec.ParsePubKey(keyDesc.RawKeyBytes, btcec.S256())
 	require.NoError(t.t, err)
 
 	// First, try with a key descriptor that only sets the public key.
@@ -251,7 +254,7 @@ func runSignOutputRaw(t *harnessTest, net *lntest.NetworkHarness,
 	require.NoError(t.t, err)
 	require.Equal(t.t, int32(1), keyDesc.KeyLoc.KeyIndex)
 
-	targetPubKey, err = btcec.ParsePubKey(keyDesc.RawKeyBytes)
+	targetPubKey, err = btcec.ParsePubKey(keyDesc.RawKeyBytes, btcec.S256())
 	require.NoError(t.t, err)
 
 	// First, try with a key descriptor that only sets the public key.

lntest/itest/lnd_signer_test.go

@@ -7,6 +7,7 @@ import (
 	"io"
 	"time"
 
+	"github.com/btcsuite/btcd/chaincfg/chainhash"
 	"github.com/btcsuite/btcd/rpcclient"
 	"github.com/btcsuite/btcd/txscript"
 	"github.com/btcsuite/btcd/wire"

lntest/itest/utils.go

@@ -10,11 +10,13 @@ import (
 	"time"
 
 	"github.com/btcsuite/btcd/btcec"
+	"github.com/btcsuite/btcd/chaincfg"
 	"github.com/btcsuite/btcd/txscript"
 	"github.com/btcsuite/btcd/wire"
 	"github.com/btcsuite/btcutil"
 	"github.com/btcsuite/btcutil/hdkeychain"
 	"github.com/btcsuite/btcutil/psbt"
+	"github.com/btcsuite/btcwallet/waddrmgr"
 	basewallet "github.com/btcsuite/btcwallet/wallet"
 	"github.com/lightningnetwork/lnd/input"
 	"github.com/lightningnetwork/lnd/keychain"

lnwallet/rpcwallet/rpcwallet.go

@@ -0,0 +1,29 @@
+package lnwire
+
+import (
+	"bytes"
+	"math"
+	"testing"
+)
+
+// TestMaxPongBytes tests that we'll fail to decode a Ping message that wants
+// more pong bytes that we can actually encode while adhering to the max
+// message limit.
+func TestMaxPongBytes(t *testing.T) {
+	t.Parallel()
+
+	msg := Ping{
+		NumPongBytes: math.MaxUint16,
+	}
+
+	var b bytes.Buffer
+	if _, err := WriteMessage(&b, &msg, 0); err != nil {
+		t.Fatalf("unable to write msg: %v", err)
+	}
+
+	_, err := ReadMessage(&b, 0)
+	if err != ErrMaxPongBytesExceeded {
+		t.Fatalf("incorrect error: %v, expected "+
+			"ErrMaxPongBytesExceeded", err)
+	}
+}

lnwire/ping_test.go

@@ -19,8 +19,10 @@ var (
 	errBadLength   = errors.New("malformed signature: bad length")
 	errBadRLength  = errors.New("malformed signature: bogus R length")
 	errBadSLength  = errors.New("malformed signature: bogus S length")
-	errRTooLong    = errors.New("R is over 32 bytes long without padding")
-	errSTooLong    = errors.New("S is over 32 bytes long without padding")
+	errRTooLong    = errors.New("element R is over 32 bytes long without " +
+		"padding")
+	errSTooLong = errors.New("element S is over 32 bytes long without " +
+		"padding")
 )
 
 // NewSigFromRawSignature returns a Sig from a Bitcoin raw signature encoded in
@@ -29,7 +31,7 @@ func NewSigFromRawSignature(sig []byte) (Sig, error) {
 	var b Sig
 
 	// Check the total length is above the minimal.
-	if len(sig) < ecdsa.MinSigLen {
+	if len(sig) < 8 {
 		return b, errSigTooShort
 	}
 
@@ -45,7 +47,7 @@ func NewSigFromRawSignature(sig []byte) (Sig, error) {
 
 	// siglen should be less than the entire message and greater than
 	// the minimal message size.
-	if sigLen+2 > len(sig) || sigLen+2 < ecdsa.MinSigLen {
+	if sigLen+2 > len(sig) || sigLen+2 < 8 {
 		return b, errBadLength
 	}
 

lnwire/signature.go

@@ -6,6 +6,7 @@ import (
 	"testing"
 
 	"github.com/btcsuite/btcd/btcec"
+	"github.com/stretchr/testify/require"
 )
 
 func TestSignatureSerializeDeserialize(t *testing.T) {
@@ -83,7 +84,7 @@ func TestSignatureSerializeDeserialize(t *testing.T) {
 	sig.R.Mul(btcec.S256().N, big.NewInt(2))
 	sig.S.Set(big.NewInt(127))
 	err = signatureSerializeDeserialize(sig)
-	if err.Error() != "R is over 32 bytes long without padding" {
+	if err.Error() != "element R is over 32 bytes long without padding" {
 		t.Fatalf("R = 2N, S = 128, R should be over 32 bytes: %s",
 			err.Error())
 	}