watchtower/multi: define AltruistSessions feature bit as 0/1

watchtower/wtclient/session_negotiator.go

@@ -112,7 +112,7 @@ var _ SessionNegotiator = (*sessionNegotiator)(nil)
 // newSessionNegotiator initializes a fresh sessionNegotiator instance.
 func newSessionNegotiator(cfg *NegotiatorConfig) *sessionNegotiator {
 	localInit := wtwire.NewInitMessage(
-		lnwire.NewRawFeatureVector(wtwire.WtSessionsRequired),
+		lnwire.NewRawFeatureVector(wtwire.AltruistSessionsRequired),
 		cfg.ChainHash,
 	)
 

watchtower/wtclient/session_queue.go

@@ -109,7 +109,7 @@ type sessionQueue struct {
 // newSessionQueue intiializes a fresh sessionQueue.
 func newSessionQueue(cfg *sessionQueueConfig) *sessionQueue {
 	localInit := wtwire.NewInitMessage(
-		lnwire.NewRawFeatureVector(wtwire.WtSessionsRequired),
+		lnwire.NewRawFeatureVector(wtwire.AltruistSessionsRequired),
 		cfg.ChainHash,
 	)
 

watchtower/wtserver/server.go

@@ -92,7 +92,7 @@ type Server struct {
 // sessions and send state updates.
 func New(cfg *Config) (*Server, error) {
 	localInit := wtwire.NewInitMessage(
-		lnwire.NewRawFeatureVector(wtwire.WtSessionsOptional),
+		lnwire.NewRawFeatureVector(wtwire.AltruistSessionsOptional),
 		cfg.ChainHash,
 	)
 

watchtower/wtwire/features.go

@@ -5,18 +5,18 @@ import "github.com/lightningnetwork/lnd/lnwire"
 // FeatureNames holds a mapping from each feature bit understood by this
 // implementation to its common name.
 var FeatureNames = map[lnwire.FeatureBit]string{
-	WtSessionsRequired: "wt-sessions",
+	AltruistSessionsRequired: "altruist-sessions",
-	WtSessionsOptional: "wt-sessions",
+	AltruistSessionsOptional: "altruist-sessions",
 }
 
 const (
-	// WtSessionsRequired specifies that the advertising node requires the
+	// AltruistSessionsRequired specifies that the advertising node requires
-	// remote party to understand the protocol for creating and updating
+	// the remote party to understand the protocol for creating and updating
 	// watchtower sessions.
-	WtSessionsRequired lnwire.FeatureBit = 8
+	AltruistSessionsRequired lnwire.FeatureBit = 0
 
-	// WtSessionsOptional specifies that the advertising node can support
+	// AltruistSessionsOptional specifies that the advertising node can
-	// a remote party who understand the protocol for creating and updating
+	// support a remote party who understand the protocol for creating and
-	// watchtower sessions.
+	// updating watchtower sessions.
-	WtSessionsOptional lnwire.FeatureBit = 9
+	AltruistSessionsOptional lnwire.FeatureBit = 1
 )

watchtower/wtwire/init_test.go

@@ -26,37 +26,37 @@ type checkRemoteInitTest struct {
 var checkRemoteInitTests = []checkRemoteInitTest{
 	{
 		name:      "same chain, local-optional remote-required",
-		lFeatures: lnwire.NewRawFeatureVector(wtwire.WtSessionsOptional),
+		lFeatures: lnwire.NewRawFeatureVector(wtwire.AltruistSessionsOptional),
 		lHash:     testnetChainHash,
-		rFeatures: lnwire.NewRawFeatureVector(wtwire.WtSessionsRequired),
+		rFeatures: lnwire.NewRawFeatureVector(wtwire.AltruistSessionsRequired),
 		rHash:     testnetChainHash,
 	},
 	{
 		name:      "same chain, local-required remote-optional",
-		lFeatures: lnwire.NewRawFeatureVector(wtwire.WtSessionsRequired),
+		lFeatures: lnwire.NewRawFeatureVector(wtwire.AltruistSessionsRequired),
 		lHash:     testnetChainHash,
-		rFeatures: lnwire.NewRawFeatureVector(wtwire.WtSessionsOptional),
+		rFeatures: lnwire.NewRawFeatureVector(wtwire.AltruistSessionsOptional),
 		rHash:     testnetChainHash,
 	},
 	{
 		name:      "different chain, local-optional remote-required",
-		lFeatures: lnwire.NewRawFeatureVector(wtwire.WtSessionsOptional),
+		lFeatures: lnwire.NewRawFeatureVector(wtwire.AltruistSessionsOptional),
 		lHash:     testnetChainHash,
-		rFeatures: lnwire.NewRawFeatureVector(wtwire.WtSessionsRequired),
+		rFeatures: lnwire.NewRawFeatureVector(wtwire.AltruistSessionsRequired),
 		rHash:     mainnetChainHash,
 		expErr:    wtwire.NewErrUnknownChainHash(mainnetChainHash),
 	},
 	{
 		name:      "different chain, local-required remote-optional",
-		lFeatures: lnwire.NewRawFeatureVector(wtwire.WtSessionsOptional),
+		lFeatures: lnwire.NewRawFeatureVector(wtwire.AltruistSessionsOptional),
 		lHash:     testnetChainHash,
-		rFeatures: lnwire.NewRawFeatureVector(wtwire.WtSessionsRequired),
+		rFeatures: lnwire.NewRawFeatureVector(wtwire.AltruistSessionsRequired),
 		rHash:     mainnetChainHash,
 		expErr:    wtwire.NewErrUnknownChainHash(mainnetChainHash),
 	},
 	{
 		name:      "same chain, remote-unknown-required",
-		lFeatures: lnwire.NewRawFeatureVector(wtwire.WtSessionsOptional),
+		lFeatures: lnwire.NewRawFeatureVector(wtwire.AltruistSessionsOptional),
 		lHash:     testnetChainHash,
 		rFeatures: lnwire.NewRawFeatureVector(lnwire.GossipQueriesRequired),
 		rHash:     testnetChainHash,