multi: make static remote key compulsory

feature/manager.go

@@ -21,10 +21,6 @@ var (
 // our purposes, this typically means disabling certain features to test legacy
 // protocol interoperability or functionality.
 type Config struct {
-	// NoStaticRemoteKey unsets any optional or required StaticRemoteKey
-	// bits from all feature sets.
-	NoStaticRemoteKey bool
-
 	// NoAnchors unsets any bits signaling support for anchor outputs.
 	NoAnchors bool
 
@@ -112,10 +108,6 @@ func newManager(cfg Config, desc setDesc) (*Manager, error) {
 	// Now, remove any features as directed by the config.
 	configFeatures := make(map[Set]*lnwire.FeatureVector)
 	for set, raw := range fsets {
-		if cfg.NoStaticRemoteKey {
-			raw.Unset(lnwire.StaticRemoteKeyOptional)
-			raw.Unset(lnwire.StaticRemoteKeyRequired)
-		}
 		if cfg.NoAnchors {
 			raw.Unset(lnwire.AnchorsZeroFeeHtlcTxOptional)
 			raw.Unset(lnwire.AnchorsZeroFeeHtlcTxRequired)

feature/manager_internal_test.go

@@ -23,7 +23,7 @@ var testSetDesc = setDesc{
 		SetInit:    {}, // I
 		SetNodeAnn: {}, // N
 	},
-	lnwire.StaticRemoteKeyOptional: {
+	lnwire.StaticRemoteKeyRequired: {
 		SetInit:    {}, // I
 		SetNodeAnn: {}, // N
 	},
@@ -34,12 +34,6 @@ var managerTests = []managerTest{
 		name: "default",
 		cfg:  Config{},
 	},
-	{
-		name: "no static remote key",
-		cfg: Config{
-			NoStaticRemoteKey: true,
-		},
-	},
 	{
 		name: "anchors should disable anything dependent on it",
 		cfg: Config{
@@ -90,9 +84,6 @@ func testManager(t *testing.T, test managerTest) {
 
 		// Assert that the manager properly unset the configured feature
 		// bits from all sets.
-		if test.cfg.NoStaticRemoteKey {
-			assertUnset(lnwire.StaticRemoteKeyOptional)
-		}
 		if test.cfg.NoAnchors {
 			assertUnset(lnwire.ScriptEnforcedLeaseRequired)
 			assertUnset(lnwire.ScriptEnforcedLeaseOptional)
@@ -113,9 +104,7 @@ func testManager(t *testing.T, test managerTest) {
 
 	assertSet(lnwire.DataLossProtectRequired)
 	assertSet(lnwire.TLVOnionPayloadRequired)
-	if !test.cfg.NoStaticRemoteKey {
-		assertSet(lnwire.StaticRemoteKeyOptional)
-	}
+	assertSet(lnwire.StaticRemoteKeyRequired)
 }
 
 // TestUpdateFeatureSets tests validation of the update of various features in

funding/commitment_type_negotiation_test.go

@@ -31,7 +31,7 @@ func TestCommitmentTypeNegotiation(t *testing.T) {
 				lnwire.AnchorsZeroFeeHtlcTxRequired,
 			),
 			localFeatures: lnwire.NewRawFeatureVector(
-				lnwire.StaticRemoteKeyOptional,
+				lnwire.StaticRemoteKeyRequired,
 				lnwire.AnchorsZeroFeeHtlcTxOptional,
 				lnwire.ExplicitChannelTypeOptional,
 			),
@@ -50,7 +50,7 @@ func TestCommitmentTypeNegotiation(t *testing.T) {
 				lnwire.AnchorsZeroFeeHtlcTxRequired,
 			),
 			localFeatures: lnwire.NewRawFeatureVector(
-				lnwire.StaticRemoteKeyOptional,
+				lnwire.StaticRemoteKeyRequired,
 				lnwire.AnchorsZeroFeeHtlcTxOptional,
 				lnwire.ExplicitChannelTypeOptional,
 			),
@@ -70,7 +70,7 @@ func TestCommitmentTypeNegotiation(t *testing.T) {
 			),
 			localFeatures: lnwire.NewRawFeatureVector(
 				lnwire.ZeroConfOptional,
-				lnwire.StaticRemoteKeyOptional,
+				lnwire.StaticRemoteKeyRequired,
 				lnwire.AnchorsZeroFeeHtlcTxOptional,
 				lnwire.ScriptEnforcedLeaseOptional,
 				lnwire.ExplicitChannelTypeOptional,
@@ -103,7 +103,7 @@ func TestCommitmentTypeNegotiation(t *testing.T) {
 			),
 			localFeatures: lnwire.NewRawFeatureVector(
 				lnwire.ZeroConfOptional,
-				lnwire.StaticRemoteKeyOptional,
+				lnwire.StaticRemoteKeyRequired,
 				lnwire.AnchorsZeroFeeHtlcTxOptional,
 				lnwire.ExplicitChannelTypeOptional,
 			),
@@ -134,7 +134,7 @@ func TestCommitmentTypeNegotiation(t *testing.T) {
 			),
 			localFeatures: lnwire.NewRawFeatureVector(
 				lnwire.ScidAliasOptional,
-				lnwire.StaticRemoteKeyOptional,
+				lnwire.StaticRemoteKeyRequired,
 				lnwire.AnchorsZeroFeeHtlcTxOptional,
 				lnwire.ScriptEnforcedLeaseOptional,
 				lnwire.ExplicitChannelTypeOptional,
@@ -167,7 +167,7 @@ func TestCommitmentTypeNegotiation(t *testing.T) {
 			),
 			localFeatures: lnwire.NewRawFeatureVector(
 				lnwire.ScidAliasOptional,
-				lnwire.StaticRemoteKeyOptional,
+				lnwire.StaticRemoteKeyRequired,
 				lnwire.AnchorsZeroFeeHtlcTxOptional,
 				lnwire.ExplicitChannelTypeOptional,
 			),
@@ -195,7 +195,7 @@ func TestCommitmentTypeNegotiation(t *testing.T) {
 				lnwire.AnchorsZeroFeeHtlcTxRequired,
 			),
 			localFeatures: lnwire.NewRawFeatureVector(
-				lnwire.StaticRemoteKeyOptional,
+				lnwire.StaticRemoteKeyRequired,
 				lnwire.AnchorsZeroFeeHtlcTxOptional,
 				lnwire.ExplicitChannelTypeOptional,
 			),
@@ -219,7 +219,7 @@ func TestCommitmentTypeNegotiation(t *testing.T) {
 				lnwire.StaticRemoteKeyRequired,
 			),
 			localFeatures: lnwire.NewRawFeatureVector(
-				lnwire.StaticRemoteKeyOptional,
+				lnwire.StaticRemoteKeyRequired,
 				lnwire.AnchorsZeroFeeHtlcTxOptional,
 				lnwire.ExplicitChannelTypeOptional,
 			),
@@ -240,7 +240,7 @@ func TestCommitmentTypeNegotiation(t *testing.T) {
 			name:            "explicit legacy",
 			channelFeatures: lnwire.NewRawFeatureVector(),
 			localFeatures: lnwire.NewRawFeatureVector(
-				lnwire.StaticRemoteKeyOptional,
+				lnwire.StaticRemoteKeyRequired,
 				lnwire.AnchorsZeroFeeHtlcTxOptional,
 				lnwire.ExplicitChannelTypeOptional,
 			),
@@ -262,7 +262,7 @@ func TestCommitmentTypeNegotiation(t *testing.T) {
 			name:            "default explicit anchors",
 			channelFeatures: nil,
 			localFeatures: lnwire.NewRawFeatureVector(
-				lnwire.StaticRemoteKeyOptional,
+				lnwire.StaticRemoteKeyRequired,
 				lnwire.AnchorsZeroFeeHtlcTxOptional,
 				lnwire.ExplicitChannelTypeOptional,
 			),
@@ -284,7 +284,7 @@ func TestCommitmentTypeNegotiation(t *testing.T) {
 			name:            "implicit tweakless",
 			channelFeatures: nil,
 			localFeatures: lnwire.NewRawFeatureVector(
-				lnwire.StaticRemoteKeyOptional,
+				lnwire.StaticRemoteKeyRequired,
 				lnwire.AnchorsZeroFeeHtlcTxOptional,
 			),
 			remoteFeatures: lnwire.NewRawFeatureVector(

itest/lnd_channel_force_close_test.go

@@ -245,7 +245,6 @@ func testChannelForceClosure(ht *lntest.HarnessTest) {
 	// We'll test the scenario for some of the commitment types, to ensure
 	// outputs can be swept.
 	commitTypes := []lnrpc.CommitmentType{
-		lnrpc.CommitmentType_LEGACY,
 		lnrpc.CommitmentType_ANCHORS,
 		lnrpc.CommitmentType_SIMPLE_TAPROOT,
 	}

itest/lnd_funding_test.go

@@ -32,7 +32,6 @@ func testBasicChannelFunding(ht *lntest.HarnessTest) {
 	// Run through the test with combinations of all the different
 	// commitment types.
 	allTypes := []lnrpc.CommitmentType{
-		lnrpc.CommitmentType_LEGACY,
 		lnrpc.CommitmentType_STATIC_REMOTE_KEY,
 		lnrpc.CommitmentType_ANCHORS,
 		lnrpc.CommitmentType_SIMPLE_TAPROOT,

itest/lnd_multi-hop_test.go

@@ -30,10 +30,6 @@ var commitWithZeroConf = []struct {
 	commitType lnrpc.CommitmentType
 	zeroConf   bool
 }{
-	{
-		commitType: lnrpc.CommitmentType_LEGACY,
-		zeroConf:   false,
-	},
 	{
 		commitType: lnrpc.CommitmentType_ANCHORS,
 		zeroConf:   false,

itest/lnd_payment_test.go

@@ -26,7 +26,6 @@ func testSendDirectPayment(ht *lntest.HarnessTest) {
 
 	// Create a list of commitment types we want to test.
 	commitTyes := []lnrpc.CommitmentType{
-		lnrpc.CommitmentType_LEGACY,
 		lnrpc.CommitmentType_ANCHORS,
 		lnrpc.CommitmentType_SIMPLE_TAPROOT,
 	}

itest/lnd_revocation_test.go

@@ -195,7 +195,6 @@ func breachRetributionTestCase(ht *lntest.HarnessTest,
 // the mempool.
 func testRevokedCloseRetribution(ht *lntest.HarnessTest) {
 	for _, commitType := range []lnrpc.CommitmentType{
-		lnrpc.CommitmentType_LEGACY,
 		lnrpc.CommitmentType_SIMPLE_TAPROOT,
 	} {
 		testName := fmt.Sprintf("%v", commitType.String())
@@ -378,7 +377,6 @@ func revokedCloseRetributionZeroValueRemoteOutputCase(ht *lntest.HarnessTest,
 // commitment output has zero-value.
 func testRevokedCloseRetributionZeroValueRemoteOutput(ht *lntest.HarnessTest) {
 	for _, commitType := range []lnrpc.CommitmentType{
-		lnrpc.CommitmentType_LEGACY,
 		lnrpc.CommitmentType_SIMPLE_TAPROOT,
 	} {
 		testName := fmt.Sprintf("%v", commitType.String())
@@ -700,7 +698,6 @@ func revokedCloseRetributionRemoteHodlCase(ht *lntest.HarnessTest,
 // remote party breaches before settling extended HTLCs.
 func testRevokedCloseRetributionRemoteHodl(ht *lntest.HarnessTest) {
 	for _, commitType := range []lnrpc.CommitmentType{
-		lnrpc.CommitmentType_LEGACY,
 		lnrpc.CommitmentType_SIMPLE_TAPROOT,
 	} {
 		testName := fmt.Sprintf("%v", commitType.String())

lncfg/protocol.go

@@ -8,11 +8,6 @@ package lncfg
 //
 //nolint:lll
 type ProtocolOptions struct {
-	// LegacyProtocol is a sub-config that houses all the legacy protocol
-	// options.  These are mostly used for integration tests as most modern
-	// nodes should always run with them on by default.
-	LegacyProtocol `group:"legacy" namespace:"legacy"`
-
 	// ExperimentalProtocol is a sub-config that houses any experimental
 	// protocol features that also require a build-tag to activate.
 	ExperimentalProtocol

server.go

@@ -531,7 +531,6 @@ func newServer(cfg *Config, listenAddrs []net.Addr,
 
 	//nolint:lll
 	featureMgr, err := feature.NewManager(feature.Config{
-		NoStaticRemoteKey:        cfg.ProtocolOptions.NoStaticRemoteKey(),
 		NoAnchors:                cfg.ProtocolOptions.NoAnchorCommitments(),
 		NoWumbo:                  !cfg.ProtocolOptions.Wumbo(),
 		NoScriptEnforcementLease: cfg.ProtocolOptions.NoScriptEnforcementLease(),