blindedpath: move blinded path logic to own pkg

config.go

@@ -680,6 +680,8 @@ func DefaultConfig() Config {
 		},
 		Invoices: &lncfg.Invoices{
 			HoldExpiryDelta: lncfg.DefaultHoldInvoiceExpiryDelta,
+		},
+		Routing: &lncfg.Routing{
 			BlindedPaths: lncfg.BlindedPaths{
 				MinNumRealHops:           lncfg.DefaultMinNumRealBlindedPathHops,
 				NumHops:                  lncfg.DefaultNumBlindedPathHops,
@@ -1686,6 +1688,7 @@ func ValidateConfig(cfg Config, interceptor signal.Interceptor, fileParser,
 		cfg.Sweeper,
 		cfg.Htlcswitch,
 		cfg.Invoices,
+		cfg.Routing,
 	)
 	if err != nil {
 		return nil, err

itest/lnd_route_blinding_test.go

@@ -367,8 +367,8 @@ func (b *blindedForwardTest) setupNetwork(ctx context.Context,
 	// Bob to himself.
 	b.dave = b.ht.NewNode("Dave", []string{
 		"--bitcoin.timelockdelta=18",
-		"--invoices.blinding.min-num-real-hops=2",
-		"--invoices.blinding.num-hops=2",
+		"--routing.blinding.min-num-real-hops=2",
+		"--routing.blinding.num-hops=2",
 	})
 
 	b.channels = setupFourHopNetwork(b.ht, b.carol, b.dave)
@@ -625,8 +625,8 @@ func testBlindedRouteInvoices(ht *lntest.HarnessTest) {
 	// Restart Dave with blinded path restrictions that will result in him
 	// creating a blinded path that uses himself as the introduction node.
 	ht.RestartNodeWithExtraArgs(testCase.dave, []string{
-		"--invoices.blinding.min-num-real-hops=0",
-		"--invoices.blinding.num-hops=0",
+		"--routing.blinding.min-num-real-hops=0",
+		"--routing.blinding.num-hops=0",
 	})
 	ht.EnsureConnected(testCase.dave, testCase.carol)
 
@@ -901,8 +901,8 @@ func testMPPToSingleBlindedPath(ht *lntest.HarnessTest) {
 	// Restrict Dave so that he only ever chooses the Carol->Dave path for
 	// a blinded route.
 	dave := ht.NewNode("dave", []string{
-		"--invoices.blinding.min-num-real-hops=1",
-		"--invoices.blinding.num-hops=1",
+		"--routing.blinding.min-num-real-hops=1",
+		"--routing.blinding.num-hops=1",
 	})
 	carol := ht.NewNode("carol", nil)
 	eve := ht.NewNode("eve", nil)
@@ -1098,8 +1098,8 @@ func testBlindedRouteDummyHops(ht *lntest.HarnessTest) {
 	// Configure Dave so that all blinded paths always contain 2 hops and
 	// so that there is no minimum number of real hops.
 	dave := ht.NewNode("dave", []string{
-		"--invoices.blinding.min-num-real-hops=0",
-		"--invoices.blinding.num-hops=2",
+		"--routing.blinding.min-num-real-hops=0",
+		"--routing.blinding.num-hops=2",
 	})
 
 	ht.EnsureConnected(alice, bob)
@@ -1183,8 +1183,8 @@ func testBlindedRouteDummyHops(ht *lntest.HarnessTest) {
 	// of hops to 2 meaning that one dummy hop should be added.
 	ht.RestartNodeWithExtraArgs(carol, nil)
 	ht.RestartNodeWithExtraArgs(dave, []string{
-		"--invoices.blinding.min-num-real-hops=1",
-		"--invoices.blinding.num-hops=2",
+		"--routing.blinding.min-num-real-hops=1",
+		"--routing.blinding.num-hops=2",
 	})
 	ht.EnsureConnected(bob, carol)
 	ht.EnsureConnected(carol, dave)

lncfg/invoices.go

@@ -1,7 +1,5 @@
 package lncfg
 
-import "fmt"
-
 const (
 	// DefaultHoldInvoiceExpiryDelta defines the number of blocks before the
 	// expiry height of a hold invoice's htlc that lnd will automatically
@@ -41,20 +39,6 @@ const (
 //nolint:lll
 type Invoices struct {
 	HoldExpiryDelta uint32 `long:"holdexpirydelta" description:"The number of blocks before a hold invoice's htlc expires that the invoice should be canceled to prevent a force close. Force closes will not be prevented if this value is not greater than DefaultIncomingBroadcastDelta."`
-
-	BlindedPaths BlindedPaths `group:"blinding" namespace:"blinding"`
-}
-
-// BlindedPaths holds the configuration options for blinded paths added to
-// invoices.
-//
-//nolint:lll
-type BlindedPaths struct {
-	MinNumRealHops           uint8   `long:"min-num-real-hops" description:"The minimum number of real hops to include in a blinded path. This doesn't include our node, so if the minimum is 1, then the path will contain at minimum our node along with an introduction node hop. If it is zero then the shortest path will use our node as an introduction node."`
-	NumHops                  uint8   `long:"num-hops" description:"The number of hops to include in a blinded path. This doesn't include our node, so if it is 1, then the path will contain our node along with an introduction node or dummy node hop. If paths shorter than NumHops is found, then they will be padded using dummy hops."`
-	MaxNumPaths              uint8   `long:"max-num-paths" description:"The maximum number of blinded paths to select and add to an invoice."`
-	PolicyIncreaseMultiplier float64 `long:"policy-increase-multiplier" description:"The amount by which to increase certain policy values of hops on a blinded path in order to add a probing buffer."`
-	PolicyDecreaseMultiplier float64 `long:"policy-decrease-multiplier" description:"The amount by which to decrease certain policy values of hops on a blinded path in order to add a probing buffer."`
 }
 
 // Validate checks that the various invoice config options are sane.
@@ -72,23 +56,5 @@ func (i *Invoices) Validate() error {
 			i.HoldExpiryDelta, DefaultIncomingBroadcastDelta)
 	}
 
-	if i.BlindedPaths.MinNumRealHops > i.BlindedPaths.NumHops {
-		return fmt.Errorf("the minimum number of real hops in a " +
-			"blinded path must be smaller than or equal to the " +
-			"number of hops expected to be included in each path")
-	}
-
-	if i.BlindedPaths.PolicyIncreaseMultiplier < 1 {
-		return fmt.Errorf("the blinded route policy increase " +
-			"multiplier must be greater than or equal to 1")
-	}
-
-	if i.BlindedPaths.PolicyDecreaseMultiplier > 1 ||
-		i.BlindedPaths.PolicyDecreaseMultiplier < 0 {
-
-		return fmt.Errorf("the blinded route policy decrease " +
-			"multiplier must be in the range (0,1]")
-	}
-
 	return nil
 }

lncfg/routing.go

@@ -1,10 +1,50 @@
 package lncfg
 
+import "fmt"
+
 // Routing holds the configuration options for routing.
 //
 //nolint:lll
 type Routing struct {
 	AssumeChannelValid bool `long:"assumechanvalid" description:"DEPRECATED: Skip checking channel spentness during graph validation. This speedup comes at the risk of using an unvalidated view of the network for routing. (default: false)" hidden:"true"`
 
 	StrictZombiePruning bool `long:"strictgraphpruning" description:"If true, then the graph will be pruned more aggressively for zombies. In practice this means that edges with a single stale edge will be considered a zombie."`
+
+	BlindedPaths BlindedPaths `group:"blinding" namespace:"blinding"`
+}
+
+// BlindedPaths holds the configuration options for blinded path construction.
+//
+//nolint:lll
+type BlindedPaths struct {
+	MinNumRealHops           uint8   `long:"min-num-real-hops" description:"The minimum number of real hops to include in a blinded path. This doesn't include our node, so if the minimum is 1, then the path will contain at minimum our node along with an introduction node hop. If it is zero then the shortest path will use our node as an introduction node."`
+	NumHops                  uint8   `long:"num-hops" description:"The number of hops to include in a blinded path. This doesn't include our node, so if it is 1, then the path will contain our node along with an introduction node or dummy node hop. If paths shorter than NumHops is found, then they will be padded using dummy hops."`
+	MaxNumPaths              uint8   `long:"max-num-paths" description:"The maximum number of blinded paths to select and add to an invoice."`
+	PolicyIncreaseMultiplier float64 `long:"policy-increase-multiplier" description:"The amount by which to increase certain policy values of hops on a blinded path in order to add a probing buffer."`
+	PolicyDecreaseMultiplier float64 `long:"policy-decrease-multiplier" description:"The amount by which to decrease certain policy values of hops on a blinded path in order to add a probing buffer."`
+}
+
+// Validate checks that the various routing config options are sane.
+//
+// NOTE: this is part of the Validator interface.
+func (r *Routing) Validate() error {
+	if r.BlindedPaths.MinNumRealHops > r.BlindedPaths.NumHops {
+		return fmt.Errorf("the minimum number of real hops in a " +
+			"blinded path must be smaller than or equal to the " +
+			"number of hops expected to be included in each path")
+	}
+
+	if r.BlindedPaths.PolicyIncreaseMultiplier < 1 {
+		return fmt.Errorf("the blinded route policy increase " +
+			"multiplier must be greater than or equal to 1")
+	}
+
+	if r.BlindedPaths.PolicyDecreaseMultiplier > 1 ||
+		r.BlindedPaths.PolicyDecreaseMultiplier < 0 {
+
+		return fmt.Errorf("the blinded route policy decrease " +
+			"multiplier must be in the range (0,1]")
+	}
+
+	return nil
 }