Rebase bugfix PRs, prepare for minor release

[guggero]

Replaces #6007.
Replaces #6003.

Fixes #6001.
Fixes #6002.
Fixes #5890.

Addresses an issue with explicit channel type negotiation that caused incompatibilities when opening channels with the latest versions of c-lightning and eclair (#5890).

[bhandras]

nit: I think the PR description needs an update to link to this PR #6003

LGTM 👍

[ellemouton]

latest lgtm 🚀

[Roasbeef]

Patch to resolve the comment I made above:

diff --git a/funding/commitment_type_negotiation.go b/funding/commitment_type_negotiation.go
index e2a9095a7..eb201e5b1 100644
--- a/funding/commitment_type_negotiation.go
+++ b/funding/commitment_type_negotiation.go
@@ -36,25 +36,6 @@ func negotiateCommitmentType(channelType *lnwire.ChannelType,
 				*channelType, local, remote,
 			)
 		}
-
-		// If they don't know explicit negotiation, let's fall back to
-		// implicit negotiation if they just signal one of the known
-		// default types.
-		channelFeatures := lnwire.RawFeatureVector(*channelType)
-		staticRemoteKeyOnly := channelFeatures.OnlyContains(
-			lnwire.StaticRemoteKeyRequired,
-		)
-		anchorOnly := channelFeatures.OnlyContains(
-			lnwire.AnchorsZeroFeeHtlcTxRequired,
-		)
-
-		// It's one of the default types.
-		if staticRemoteKeyOnly || anchorOnly {
-			return implicitNegotiateCommitmentType(local, remote), nil
-		}
-
-		// Something's weird, let's not accept this channel.
-		return 0, errUnsupportedExplicitNegotiation
 	}
 
 	return implicitNegotiateCommitmentType(local, remote), nil
diff --git a/funding/commitment_type_negotiation_test.go b/funding/commitment_type_negotiation_test.go
index c9ac25a7a..4da88f2a9 100644
--- a/funding/commitment_type_negotiation_test.go
+++ b/funding/commitment_type_negotiation_test.go
@@ -36,7 +36,8 @@ func TestCommitmentTypeNegotiation(t *testing.T) {
 				lnwire.StaticRemoteKeyOptional,
 				lnwire.AnchorsZeroFeeHtlcTxOptional,
 			),
-			expectsErr: errUnsupportedExplicitNegotiation,
+			expectsRes: lnwallet.CommitmentTypeAnchorsZeroFeeHtlcTx,
+			expectsErr: nil,
 		},
 		{
 			name: "explicit missing remote commitment feature",
@@ -181,8 +182,8 @@ func TestCommitmentTypeNegotiation(t *testing.T) {
 				return
 			}
 
-			require.Equal(t, testCase.expectsRes, localType)
-			require.Equal(t, testCase.expectsRes, remoteType)
+			require.Equal(t, testCase.expectsRes, localType, testCase.name)
+			require.Equal(t, testCase.expectsRes, remoteType, testCase.name)
 		})
 		if !ok {
 			return

[guggero]

Thanks! Applied the patch, going to test again vs. c-lightning 0.10.2 locally.