diff --git a/watchtower/wtclient/session_negotiator.go b/watchtower/wtclient/session_negotiator.go index e3d58c1f1..9f92ee0a6 100644 --- a/watchtower/wtclient/session_negotiator.go +++ b/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, ) diff --git a/watchtower/wtclient/session_queue.go b/watchtower/wtclient/session_queue.go index 92d81ef4e..a279176a7 100644 --- a/watchtower/wtclient/session_queue.go +++ b/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, ) diff --git a/watchtower/wtserver/server.go b/watchtower/wtserver/server.go index d4ee88741..3b5cbc6be 100644 --- a/watchtower/wtserver/server.go +++ b/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, ) diff --git a/watchtower/wtwire/features.go b/watchtower/wtwire/features.go index e407c96e2..7ba298e0a 100644 --- a/watchtower/wtwire/features.go +++ b/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", - WtSessionsOptional: "wt-sessions", + AltruistSessionsRequired: "altruist-sessions", + AltruistSessionsOptional: "altruist-sessions", } const ( - // WtSessionsRequired specifies that the advertising node requires the - // remote party to understand the protocol for creating and updating + // AltruistSessionsRequired specifies that the advertising node requires + // 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 - // a remote party who understand the protocol for creating and updating - // watchtower sessions. - WtSessionsOptional lnwire.FeatureBit = 9 + // AltruistSessionsOptional specifies that the advertising node can + // support a remote party who understand the protocol for creating and + // updating watchtower sessions. + AltruistSessionsOptional lnwire.FeatureBit = 1 ) diff --git a/watchtower/wtwire/init_test.go b/watchtower/wtwire/init_test.go index 337c1de25..1aee5530b 100644 --- a/watchtower/wtwire/init_test.go +++ b/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,