Repository: lightningnetwork/lnd
Pull request #8723 (2024-05-03 13:01:03)

add inbound fees channel updates to notifications
Adds inbound fees to notifications, used in the `SubscribeChannelGraph`

coderabbitai[bot]: <!-- This is an auto-generated comment: summarize by coderabbit.ai -->
<!-- This is an auto-generated comment: skip review by coderabbit.ai -->

> [!IMPORTANT]
> ## Auto Review Skipped
> 
> Auto reviews are disabled on this repository.
> 
> Please check the settings in the CodeRabbit UI or the `.coderabbit.yaml` file in this repository. To trigger a single review, invoke the `@coderabbitai review` command.
> 
> You can disable this status message by setting the `reviews.review_status` to `false` in the CodeRabbit configuration file.

<!-- end of auto-generated comment: skip review by coderabbit.ai --><!-- tips_start -->

---

Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

<details>
<summary>Share</summary>

- [X](https://twitter.com/intent/tweet?text=I%20just%20used%20%40coderabbitai%20for%20my%20code%20review%2C%20and%20it%27s%20fantastic%21%20It%27s%20free%20for%20OSS%20and%20offers%20a%20free%20trial%20for%20the%20proprietary%20code.%20Check%20it%20out%3A&url=https%3A//coderabbit.ai)
- [Mastodon](https://mastodon.social/share?text=I%20just%20used%20%40coderabbitai%20for%20my%20code%20review%2C%20and%20it%27s%20fantastic%21%20It%27s%20free%20for%20OSS%20and%20offers%20a%20free%20trial%20for%20the%20proprietary%20code.%20Check%20it%20out%3A%20https%3A%2F%2Fcoderabbit.ai)
- [Reddit](https://www.reddit.com/submit?title=Great%20tool%20for%20code%20review%20-%20CodeRabbit&text=I%20just%20used%20CodeRabbit%20for%20my%20code%20review%2C%20and%20it%27s%20fantastic%21%20It%27s%20free%20for%20OSS%20and%20offers%20a%20free%20trial%20for%20proprietary%20code.%20Check%20it%20out%3A%20https%3A//coderabbit.ai)
- [LinkedIn](https://www.linkedin.com/sharing/share-offsite/?url=https%3A%2F%2Fcoderabbit.ai&mini=true&title=Great%20tool%20for%20code%20review%20-%20CodeRabbit&summary=I%20just%20used%20CodeRabbit%20for%20my%20code%20review%2C%20and%20it%27s%20fantastic%21%20It%27s%20free%20for%20OSS%20and%20offers%20a%20free%20trial%20for%20proprietary%20code)

</details>

<details>
<summary>Tips</summary>

### Chat

There are 3 ways to chat with [CodeRabbit](https://coderabbit.ai):

- Review comments: Directly reply to a review comment made by CodeRabbit. Example:
	- `I pushed a fix in commit <commit_id>.`
	- `Generate unit testing code for this file.`
	- `Open a follow-up GitHub issue for this discussion.`
- Files and specific lines of code (under the "Files changed" tab): Tag `@coderabbitai` in a new review comment at the desired location with your query. Examples:
	- `@coderabbitai generate unit testing code for this file.`
	-	`@coderabbitai modularize this function.`
- PR comments: Tag `@coderabbitai` in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
	- `@coderabbitai generate interesting stats about this repository and render them as a table.`
	- `@coderabbitai show all the console.log statements in this repository.`
	- `@coderabbitai read src/utils.ts and generate unit testing code.`
	- `@coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.`

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

### CodeRabbit Commands (invoked as PR comments)

- `@coderabbitai pause` to pause the reviews on a PR.
- `@coderabbitai resume` to resume the paused reviews.
- `@coderabbitai review` to trigger a review. This is useful when automatic reviews are disabled for the repository.
- `@coderabbitai resolve` resolve all the CodeRabbit review comments.
- `@coderabbitai help` to get help.


Additionally, you can add `@coderabbitai ignore` anywhere in the PR description to prevent this PR from being reviewed.

### CodeRabbit Configration File (`.coderabbit.yaml`)

- You can programmatically configure CodeRabbit by adding a `.coderabbit.yaml` file to the root of your repository.
- Please see the [configuration documentation](https://docs.coderabbit.ai/guides/configure-coderabbit) for more information.
- If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: `# yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json`

### Documentation and Community

- Visit our [Documentation](https://coderabbit.ai/docs) for detailed information on how to use CodeRabbit.
- Join our [Discord Community](https://discord.com/invite/GsXnASn26c) to get help, request features, and share feedback.
- Follow us on [X/Twitter](https://twitter.com/coderabbitai) for updates and announcements.

</details>

<!-- tips_end -->
bufo24: I got it working, and noticed that [here](https://github.com/bufo24/lnd/blob/3e022a4d9cdadf25d2a292e558973fccf0ff6efd/discovery/gossiper.go#L2934) inbound fees are also not added, is this needed?
Roasbeef: Tests don't build: 
```
Error: routing/notifications_test.go:90:3: unknown field InboundFeeBaseMSat in struct literal of type models.ChannelEdgePolicy
Error: routing/notifications_test.go:91:3: unknown field InboundFeePPM in struct literal of type models.ChannelEdgePolicy
Error: routing/notifications_test.go:516:17: edgeUpdate.InboundBaseFee undefined (type *ChannelEdgeUpdate has no field or method InboundBaseFee)
Error: routing/notifications_test.go:516:43: edgeAnn.InboundFeeBaseMSat undefined (type *models.ChannelEdgePolicy has no field or method InboundFeeBaseMSat)
Error: routing/notifications_test.go:519:13: edgeAnn.InboundFeeBaseMSat undefined (type *models.ChannelEdgePolicy has no field or method InboundFeeBaseMSat)
Error: routing/notifications_test.go:520:16: edgeUpdate.InboundBaseFee undefined (type *ChannelEdgeUpdate has no field or method InboundBaseFee)
Error: routing/notifications_test.go:522:17: edgeUpdate.InboundFeeRate undefined (type *ChannelEdgeUpdate has no field or method InboundFeeRate)
Error: routing/notifications_test.go:522:43: edgeAnn.InboundFeePPM undefined (type *models.ChannelEdgePolicy has no field or method InboundFeePPM)
Error: routing/notifications_test.go:524:36: edgeAnn.InboundFeePPM undefined (type *models.ChannelEdgePolicy has no field or method InboundFeePPM)
Error: routing/notifications_test.go:525:16: edgeUpdate.InboundFeeRate undefined (type *ChannelEdgeUpdate has no field or method InboundFeeRate)
Error: routing/notifications_test.go:525:16: too many errors
``` 
bufo24: Those tests cases should be resolved in my latest commit.
I am not super familiar with Go, what's the best way to resolve these long lines? Which causes the linter to fail
bufo24: Lint issues resolved and release notes updated. Some integration tests are failing, but are not related to my changes it seems 🤔 


Patch:
diff --git a/chainreg/chainregistry.go b/chainreg/chainregistry.go
index 37e72fdee..8b562e87a 100644
--- a/chainreg/chainregistry.go
+++ b/chainreg/chainregistry.go
@@ -77,13 +77,9 @@ type Config struct {
 	// ActiveNetParams details the current chain we are on.
 	ActiveNetParams BitcoinNetParams
 
-	// Deprecated: Use Fee.URL. FeeURL defines the URL for fee estimation
-	// we will use. This field is optional.
-	FeeURL string
-
-	// Fee defines settings for the web fee estimator. This field is
+	// FeeURL defines the URL for fee estimation we will use. This field is
 	// optional.
-	Fee *lncfg.Fee
+	FeeURL string
 
 	// Dialer is a function closure that will be used to establish outbound
 	// TCP connections to Bitcoin peers in the event of a pruned block being
@@ -247,16 +243,6 @@ func NewPartialChainControl(cfg *Config) (*PartialChainControl, func(), error) {
 			"cache: %v", err)
 	}
 
-	// Map the deprecated feeurl flag to fee.url.
-	if cfg.FeeURL != "" {
-		if cfg.Fee.URL != "" {
-			return nil, nil, errors.New("fee.url and " +
-				"feeurl are mutually exclusive")
-		}
-
-		cfg.Fee.URL = cfg.FeeURL
-	}
-
 	// If spv mode is active, then we'll be using a distinct set of
 	// chainControl interfaces that interface directly with the p2p network
 	// of the selected chain.
@@ -275,6 +261,18 @@ func NewPartialChainControl(cfg *Config) (*PartialChainControl, func(), error) {
 			return nil, nil, err
 		}
 
+		// Map the deprecated neutrino feeurl flag to the general fee
+		// url.
+		if cfg.NeutrinoMode.FeeURL != "" {
+			if cfg.FeeURL != "" {
+				return nil, nil, errors.New("feeurl and " +
+					"neutrino.feeurl are mutually " +
+					"exclusive")
+			}
+
+			cfg.FeeURL = cfg.NeutrinoMode.FeeURL
+		}
+
 		cc.ChainSource = chain.NewNeutrinoClient(
 			cfg.ActiveNetParams.Params, cfg.NeutrinoCS,
 		)
@@ -696,34 +694,27 @@ func NewPartialChainControl(cfg *Config) (*PartialChainControl, func(), error) {
 	// If the fee URL isn't set, and the user is running mainnet, then
 	// we'll return an error to instruct them to set a proper fee
 	// estimator.
-	case cfg.Fee.URL == "" && cfg.Bitcoin.MainNet &&
+	case cfg.FeeURL == "" && cfg.Bitcoin.MainNet &&
 		cfg.Bitcoin.Node == "neutrino":
 
-		return nil, nil, fmt.Errorf("--fee.url parameter required " +
+		return nil, nil, fmt.Errorf("--feeurl parameter required " +
 			"when running neutrino on mainnet")
 
 	// Override default fee estimator if an external service is specified.
-	case cfg.Fee.URL != "":
+	case cfg.FeeURL != "":
 		// Do not cache fees on regtest to make it easier to execute
 		// manual or automated test cases.
 		cacheFees := !cfg.Bitcoin.RegTest
 
-		log.Infof("Using external fee estimator %v: cached=%v: "+
-			"min update timeout=%v, max update timeout=%v",
-			cfg.Fee.URL, cacheFees, cfg.Fee.MinUpdateTimeout,
-			cfg.Fee.MaxUpdateTimeout)
+		log.Infof("Using external fee estimator %v: cached=%v",
+			cfg.FeeURL, cacheFees)
 
-		cc.FeeEstimator, err = chainfee.NewWebAPIEstimator(
+		cc.FeeEstimator = chainfee.NewWebAPIEstimator(
 			chainfee.SparseConfFeeSource{
-				URL: cfg.Fee.URL,
+				URL: cfg.FeeURL,
 			},
 			!cacheFees,
-			cfg.Fee.MinUpdateTimeout,
-			cfg.Fee.MaxUpdateTimeout,
 		)
-		if err != nil {
-			return nil, nil, err
-		}
 	}
 
 	ccCleanup := func() {
diff --git a/cmd/lncli/cmd_payments.go b/cmd/lncli/cmd_payments.go
index a554b9dec..4288b0f01 100644
--- a/cmd/lncli/cmd_payments.go
+++ b/cmd/lncli/cmd_payments.go
@@ -886,7 +886,6 @@ func payInvoice(ctx *cli.Context) error {
 		PaymentRequest:    stripPrefix(payReq),
 		Amt:               ctx.Int64("amt"),
 		DestCustomRecords: make(map[uint64][]byte),
-		Amp:               ctx.Bool(ampFlag.Name),
 	}
 
 	return sendPaymentRequest(ctx, req)
diff --git a/config.go b/config.go
index a8b609deb..6c8df62dd 100644
--- a/config.go
+++ b/config.go
@@ -350,7 +350,7 @@ type Config struct {
 	MaxPendingChannels int    `long:"maxpendingchannels" description:"The maximum number of incoming pending channels permitted per peer."`
 	BackupFilePath     string `long:"backupfilepath" description:"The target location of the channel backup file"`
 
-	FeeURL string `long:"feeurl" description:"DEPRECATED: Use 'fee.url' option. Optional URL for external fee estimation. If no URL is specified, the method for fee estimation will depend on the chosen backend and network. Must be set for neutrino on mainnet." hidden:"true"`
+	FeeURL string `long:"feeurl" description:"Optional URL for external fee estimation. If no URL is specified, the method for fee estimation will depend on the chosen backend and network. Must be set for neutrino on mainnet."`
 
 	Bitcoin      *lncfg.Chain    `group:"Bitcoin" namespace:"bitcoin"`
 	BtcdMode     *lncfg.Btcd     `group:"btcd" namespace:"btcd"`
@@ -442,8 +442,6 @@ type Config struct {
 
 	DustThreshold uint64 `long:"dust-threshold" description:"Sets the dust sum threshold in satoshis for a channel after which dust HTLC's will be failed."`
 
-	Fee *lncfg.Fee `group:"fee" namespace:"fee"`
-
 	Invoices *lncfg.Invoices `group:"invoices" namespace:"invoices"`
 
 	Routing *lncfg.Routing `group:"routing" namespace:"routing"`
@@ -584,12 +582,6 @@ func DefaultConfig() Config {
 		MinBackoff:         defaultMinBackoff,
 		MaxBackoff:         defaultMaxBackoff,
 		ConnectionTimeout:  tor.DefaultConnTimeout,
-
-		Fee: &lncfg.Fee{
-			MinUpdateTimeout: lncfg.DefaultMinUpdateTimeout,
-			MaxUpdateTimeout: lncfg.DefaultMaxUpdateTimeout,
-		},
-
 		SubRPCServers: &subRPCServerConfigs{
 			SignRPC:   &signrpc.Config{},
 			RouterRPC: routerrpc.DefaultConfig(),
diff --git a/config_builder.go b/config_builder.go
index 49a0b6c50..895f7e4ad 100644
--- a/config_builder.go
+++ b/config_builder.go
@@ -550,11 +550,6 @@ func (d *DefaultWalletImpl) BuildWalletConfig(ctx context.Context,
 		NeutrinoCS:                  neutrinoCS,
 		ActiveNetParams:             d.cfg.ActiveNetParams,
 		FeeURL:                      d.cfg.FeeURL,
-		Fee: &lncfg.Fee{
-			URL:              d.cfg.Fee.URL,
-			MinUpdateTimeout: d.cfg.Fee.MinUpdateTimeout,
-			MaxUpdateTimeout: d.cfg.Fee.MaxUpdateTimeout,
-		},
 		Dialer: func(addr string) (net.Conn, error) {
 			return d.cfg.net.Dial(
 				"tcp", addr, d.cfg.ConnectionTimeout,
diff --git a/docs/release-notes/release-notes-0.18.0.md b/docs/release-notes/release-notes-0.18.0.md
index ca048b84f..12b685662 100644
--- a/docs/release-notes/release-notes-0.18.0.md
+++ b/docs/release-notes/release-notes-0.18.0.md
@@ -209,17 +209,6 @@
   its bitcoin peers' `feefilter` values into
   account](https://github.com/lightningnetwork/lnd/pull/8418).
 
-* Web fee estimator settings have been moved into a new `fee` config group.
-  A new `fee.url` option has been added within this group that replaces the old
-  `feeurl` option, which is now deprecated. Additionally, [two new config values,
-  fee.min-update-timeout and fee.max-update-timeout](https://github.com/lightningnetwork/lnd/pull/8484)
-  are added to allow users to specify the minimum and maximum time between fee
-  updates from the web fee estimator. The default values are 5 minutes and 20
-  minutes respectively. These values are used to prevent the fee estimator from
-  being queried too frequently. This replaces previously hardcoded values that
-  were set to the same values as the new defaults. The previously deprecated
-  `neutrino.feeurl` option has been removed.
-
 * [Preparatory work](https://github.com/lightningnetwork/lnd/pull/8159) for 
   forwarding of blinded routes was added, along with [support](https://github.com/lightningnetwork/lnd/pull/8160)
   for forwarding blinded payments and [error handling](https://github.com/lightningnetwork/lnd/pull/8485).
@@ -312,6 +301,9 @@
   maintain a healthy connection to the network by checking the number of
   outbound peers if they are below 6.
 
+* [Add inbound fees](https://github.com/lightningnetwork/lnd/pull/8723) to 
+  `subscribeChannelGraph`.
+
 ### Logging
 * [Add the htlc amount](https://github.com/lightningnetwork/lnd/pull/8156) to
   contract court logs in case of timed-out HTLCs in order to easily spot dust
@@ -444,9 +436,6 @@
   logged](https://github.com/lightningnetwork/lnd/pull/8693) when no values are
   specified.
 
-* Removed deprecated `neutrino.feeurl` option. Please use the newer `fee.url`
-  option instead.
-
 ## Performance Improvements
 
 * Watchtower client DB migration to massively [improve the start-up 
@@ -547,6 +536,7 @@
 * BitcoinerCoderBob
 * bitromortac
 * bota87
+* Bufo
 * Calvin Zachman
 * Carla Kirk-Cohen
 * cristiantroy
@@ -583,7 +573,6 @@
 * testwill
 * Thabokani
 * threewebcode
-* Tom Kirkpatrick
 * Turtle
 * twofaktor
 * vuittont60
diff --git a/htlcswitch/link.go b/htlcswitch/link.go
index c0c828f83..ed3151728 100644
--- a/htlcswitch/link.go
+++ b/htlcswitch/link.go
@@ -202,15 +202,15 @@ type ChannelLinkConfig struct {
 	// receiving node is persistent.
 	UnsafeReplay bool
 
-	// MinUpdateTimeout represents the minimum interval in which a link
+	// MinFeeUpdateTimeout represents the minimum interval in which a link
 	// will propose to update its commitment fee rate. A random timeout will
-	// be selected between this and MaxUpdateTimeout.
-	MinUpdateTimeout time.Duration
+	// be selected between this and MaxFeeUpdateTimeout.
+	MinFeeUpdateTimeout time.Duration
 
-	// MaxUpdateTimeout represents the maximum interval in which a link
+	// MaxFeeUpdateTimeout represents the maximum interval in which a link
 	// will propose to update its commitment fee rate. A random timeout will
-	// be selected between this and MinUpdateTimeout.
-	MaxUpdateTimeout time.Duration
+	// be selected between this and MinFeeUpdateTimeout.
+	MaxFeeUpdateTimeout time.Duration
 
 	// OutgoingCltvRejectDelta defines the number of blocks before expiry of
 	// an htlc where we don't offer an htlc anymore. This should be at least
@@ -1558,8 +1558,8 @@ func getResolutionFailure(resolution *invoices.HtlcFailResolution,
 // within the link's configuration that will be used to determine when the link
 // should propose an update to its commitment fee rate.
 func (l *channelLink) randomFeeUpdateTimeout() time.Duration {
-	lower := int64(l.cfg.MinUpdateTimeout)
-	upper := int64(l.cfg.MaxUpdateTimeout)
+	lower := int64(l.cfg.MinFeeUpdateTimeout)
+	upper := int64(l.cfg.MaxFeeUpdateTimeout)
 	return time.Duration(prand.Int63n(upper-lower) + lower)
 }
 
diff --git a/lncfg/fee.go b/lncfg/fee.go
deleted file mode 100644
index 200ae9e81..000000000
--- a/lncfg/fee.go
+++ /dev/null
@@ -1,20 +0,0 @@
-package lncfg
-
-import "time"
-
-// DefaultMinUpdateTimeout represents the minimum interval in which a
-// WebAPIEstimator will request fresh fees from its API.
-const DefaultMinUpdateTimeout = 5 * time.Minute
-
-// DefaultMaxUpdateTimeout represents the maximum interval in which a
-// WebAPIEstimator will request fresh fees from its API.
-const DefaultMaxUpdateTimeout = 20 * time.Minute
-
-// Fee holds the configuration options for fee estimation.
-//
-//nolint:lll
-type Fee struct {
-	URL              string        `long:"url" description:"Optional URL for external fee estimation. If no URL is specified, the method for fee estimation will depend on the chosen backend and network. Must be set for neutrino on mainnet."`
-	MinUpdateTimeout time.Duration `long:"min-update-timeout" description:"The minimum interval in which fees will be updated from the specified fee URL."`
-	MaxUpdateTimeout time.Duration `long:"max-update-timeout" description:"The maximum interval in which fees will be updated from the specified fee URL."`
-}
diff --git a/lncfg/neutrino.go b/lncfg/neutrino.go
index e46c292dc..09a66312a 100644
--- a/lncfg/neutrino.go
+++ b/lncfg/neutrino.go
@@ -12,6 +12,7 @@ type Neutrino struct {
 	MaxPeers           int           `long:"maxpeers" description:"Max number of inbound and outbound peers"`
 	BanDuration        time.Duration `long:"banduration" description:"How long to ban misbehaving peers.  Valid time units are {s, m, h}.  Minimum 1 second"`
 	BanThreshold       uint32        `long:"banthreshold" description:"Maximum allowed ban score before disconnecting and banning misbehaving peers."`
+	FeeURL             string        `long:"feeurl" description:"DEPRECATED: Use top level 'feeurl' option. Optional URL for fee estimation. If a URL is not specified, static fees will be used for estimation." hidden:"true"`
 	AssertFilterHeader string        `long:"assertfilterheader" description:"Optional filter header in height:hash format to assert the state of neutrino's filter header chain on startup. If the assertion does not hold, then the filter header chain will be re-synced from the genesis block."`
 	UserAgentName      string        `long:"useragentname" description:"Used to help identify ourselves to other bitcoin peers"`
 	UserAgentVersion   string        `long:"useragentversion" description:"Used to help identify ourselves to other bitcoin peers"`
diff --git a/lnwallet/chainfee/estimator.go b/lnwallet/chainfee/estimator.go
index 0ce9ae9b8..76c235d1b 100644
--- a/lnwallet/chainfee/estimator.go
+++ b/lnwallet/chainfee/estimator.go
@@ -28,6 +28,14 @@ const (
 	// less than this will result in an error.
 	minBlockTarget uint32 = 1
 
+	// minFeeUpdateTimeout represents the minimum interval in which a
+	// WebAPIEstimator will request fresh fees from its API.
+	minFeeUpdateTimeout = 5 * time.Minute
+
+	// maxFeeUpdateTimeout represents the maximum interval in which a
+	// WebAPIEstimator will request fresh fees from its API.
+	maxFeeUpdateTimeout = 20 * time.Minute
+
 	// WebAPIConnectionTimeout specifies the timeout value for connecting
 	// to the api source.
 	WebAPIConnectionTimeout = 5 * time.Second
@@ -731,43 +739,19 @@ type WebAPIEstimator struct {
 	// estimates.
 	noCache bool
 
-	// minFeeUpdateTimeout represents the minimum interval in which the
-	// web estimator will request fresh fees from its API.
-	minFeeUpdateTimeout time.Duration
-
-	// minFeeUpdateTimeout represents the maximum interval in which the
-	// web estimator will request fresh fees from its API.
-	maxFeeUpdateTimeout time.Duration
-
 	quit chan struct{}
 	wg   sync.WaitGroup
 }
 
 // NewWebAPIEstimator creates a new WebAPIEstimator from a given URL and a
 // fallback default fee. The fees are updated whenever a new block is mined.
-func NewWebAPIEstimator(api WebAPIFeeSource, noCache bool,
-	minFeeUpdateTimeout time.Duration,
-	maxFeeUpdateTimeout time.Duration) (*WebAPIEstimator, error) {
-
-	if minFeeUpdateTimeout == 0 || maxFeeUpdateTimeout == 0 {
-		return nil, fmt.Errorf("minFeeUpdateTimeout and " +
-			"maxFeeUpdateTimeout must be greater than 0")
-	}
-
-	if minFeeUpdateTimeout >= maxFeeUpdateTimeout {
-		return nil, fmt.Errorf("minFeeUpdateTimeout target of %v "+
-			"cannot be greater than maxFeeUpdateTimeout of %v",
-			minFeeUpdateTimeout, maxFeeUpdateTimeout)
-	}
-
+func NewWebAPIEstimator(api WebAPIFeeSource, noCache bool) *WebAPIEstimator {
 	return &WebAPIEstimator{
-		apiSource:           api,
-		feeByBlockTarget:    make(map[uint32]uint32),
-		noCache:             noCache,
-		quit:                make(chan struct{}),
-		minFeeUpdateTimeout: minFeeUpdateTimeout,
-		maxFeeUpdateTimeout: maxFeeUpdateTimeout,
-	}, nil
+		apiSource:        api,
+		feeByBlockTarget: make(map[uint32]uint32),
+		noCache:          noCache,
+		quit:             make(chan struct{}),
+	}
 }
 
 // EstimateFeePerKW takes in a target for the number of blocks until an initial
@@ -825,12 +809,7 @@ func (w *WebAPIEstimator) Start() error {
 	w.started.Do(func() {
 		log.Infof("Starting web API fee estimator")
 
-		feeUpdateTimeout := w.randomFeeUpdateTimeout()
-
-		log.Infof("Web API fee estimator using update timeout of %v",
-			feeUpdateTimeout)
-
-		w.updateFeeTicker = time.NewTicker(feeUpdateTimeout)
+		w.updateFeeTicker = time.NewTicker(w.randomFeeUpdateTimeout())
 		w.updateFeeEstimates()
 
 		w.wg.Add(1)
@@ -873,11 +852,9 @@ func (w *WebAPIEstimator) RelayFeePerKW() SatPerKWeight {
 // and maxFeeUpdateTimeout that will be used to determine how often the Estimator
 // should retrieve fresh fees from its API.
 func (w *WebAPIEstimator) randomFeeUpdateTimeout() time.Duration {
-	lower := int64(w.minFeeUpdateTimeout)
-	upper := int64(w.maxFeeUpdateTimeout)
-	return time.Duration(
-		prand.Int63n(upper-lower) + lower, //nolint:gosec
-	).Round(time.Second)
+	lower := int64(minFeeUpdateTimeout)
+	upper := int64(maxFeeUpdateTimeout)
+	return time.Duration(prand.Int63n(upper-lower) + lower)
 }
 
 // getCachedFee takes a conf target and returns the cached fee rate. When the
diff --git a/peer/brontide.go b/peer/brontide.go
index 1fa6c1311..984a52809 100644
--- a/peer/brontide.go
+++ b/peer/brontide.go
@@ -1146,8 +1146,8 @@ func (p *Brontide) addLink(chanPoint *wire.OutPoint,
 		),
 		BatchSize:               p.cfg.ChannelCommitBatchSize,
 		UnsafeReplay:            p.cfg.UnsafeReplay,
-		MinUpdateTimeout:        htlcswitch.DefaultMinLinkFeeUpdateTimeout,
-		MaxUpdateTimeout:        htlcswitch.DefaultMaxLinkFeeUpdateTimeout,
+		MinFeeUpdateTimeout:     htlcswitch.DefaultMinLinkFeeUpdateTimeout,
+		MaxFeeUpdateTimeout:     htlcswitch.DefaultMaxLinkFeeUpdateTimeout,
 		OutgoingCltvRejectDelta: p.cfg.OutgoingCltvRejectDelta,
 		TowerClient:             p.cfg.TowerClient,
 		MaxOutgoingCltvExpiry:   p.cfg.MaxOutgoingCltvExpiry,
diff --git a/routing/notifications.go b/routing/notifications.go
index 9d6c4b51f..3afbb1533 100644
--- a/routing/notifications.go
+++ b/routing/notifications.go
@@ -301,6 +301,11 @@ type ChannelEdgeUpdate struct {
 	// Disabled, if true, signals that the channel is unavailable to relay
 	// payments.
 	Disabled bool
+
+	// ExtraOpaqueData is the set of data that was appended to this message
+	// to fill out the full maximum transport message size. These fields can
+	// be used to specify optional data such as custom TLV fields.
+	ExtraOpaqueData lnwire.ExtraOpaqueData
 }
 
 // appendTopologyChange appends the passed update message to the passed
@@ -379,6 +384,7 @@ func addToTopologyChange(graph *channeldb.ChannelGraph, update *TopologyChange,
 			AdvertisingNode: aNode,
 			ConnectingNode:  cNode,
 			Disabled:        m.ChannelFlags&lnwire.ChanUpdateDisabled != 0,
+			ExtraOpaqueData: m.ExtraOpaqueData,
 		}
 
 		// TODO(roasbeef): add bit to toggle
diff --git a/rpcserver.go b/rpcserver.go
index e4e8f50ee..1e9f0be08 100644
--- a/rpcserver.go
+++ b/rpcserver.go
@@ -6691,6 +6691,14 @@ func marshallTopologyChange(topChange *routing.TopologyChange) *lnrpc.GraphTopol
 
 	channelUpdates := make([]*lnrpc.ChannelEdgeUpdate, len(topChange.ChannelEdgeUpdates))
 	for i, channelUpdate := range topChange.ChannelEdgeUpdates {
+
+		customRecords := marshalExtraOpaqueData(
+			channelUpdate.ExtraOpaqueData,
+		)
+		inboundFee := extractInboundFeeSafe(
+			channelUpdate.ExtraOpaqueData,
+		)
+
 		channelUpdates[i] = &lnrpc.ChannelEdgeUpdate{
 			ChanId: channelUpdate.ChanID,
 			ChanPoint: &lnrpc.ChannelPoint{
@@ -6701,12 +6709,25 @@ func marshallTopologyChange(topChange *routing.TopologyChange) *lnrpc.GraphTopol
 			},
 			Capacity: int64(channelUpdate.Capacity),
 			RoutingPolicy: &lnrpc.RoutingPolicy{
-				TimeLockDelta:    uint32(channelUpdate.TimeLockDelta),
-				MinHtlc:          int64(channelUpdate.MinHTLC),
-				MaxHtlcMsat:      uint64(channelUpdate.MaxHTLC),
-				FeeBaseMsat:      int64(channelUpdate.BaseFee),
-				FeeRateMilliMsat: int64(channelUpdate.FeeRate),
-				Disabled:         channelUpdate.Disabled,
+				TimeLockDelta: uint32(
+					channelUpdate.TimeLockDelta,
+				),
+				MinHtlc: int64(
+					channelUpdate.MinHTLC,
+				),
+				MaxHtlcMsat: uint64(
+					channelUpdate.MaxHTLC,
+				),
+				FeeBaseMsat: int64(
+					channelUpdate.BaseFee,
+				),
+				FeeRateMilliMsat: int64(
+					channelUpdate.FeeRate,
+				),
+				Disabled:                channelUpdate.Disabled,
+				InboundFeeBaseMsat:      inboundFee.BaseFee,
+				InboundFeeRateMilliMsat: inboundFee.FeeRate,
+				CustomRecords:           customRecords,
 			},
 			AdvertisingNode: encodeKey(channelUpdate.AdvertisingNode),
 			ConnectingNode:  encodeKey(channelUpdate.ConnectingNode),
diff --git a/sample-lnd.conf b/sample-lnd.conf
index 2783c58fd..d6bc83d4b 100644
--- a/sample-lnd.conf
+++ b/sample-lnd.conf
@@ -305,9 +305,9 @@
 ; The default value below is 20 MB (1024 * 1024 * 20)
 ; blockcachesize=20971520
 
-; DEPRECATED: Use 'fee.url' option. Optional URL for external fee estimation.
-; If no URL is specified, the method for fee estimation will depend on the
-; chosen backend and network. Must be set for neutrino on mainnet.
+; Optional URL for external fee estimation. If no URL is specified, the method
+; for fee estimation will depend on the chosen backend and network. Must be set
+; for neutrino on mainnet.
 ; Default:
 ;   feeurl=
 ; Example:
@@ -530,24 +530,6 @@
 ; the headers of an HTTP request.
 ; http-header-timeout=5s
 
-
-[fee]
-
-; Optional URL for external fee estimation. If no URL is specified, the method
-; for fee estimation will depend on the chosen backend and network. Must be set
-; for neutrino on mainnet.
-; Default:
-;   fee.url=
-; Example:
-;   fee.url=https://nodes.lightning.computer/fees/v1/btc-fee-estimates.json
-
-; The minimum interval in which fees will be updated from the specified fee URL.
-; fee.min-update-timeout=5m
-
-; The maximum interval in which fees will be updated from the specified fee URL.
-; fee.max-update-timeout=20m
-
-
 [prometheus]
 
 ; If true, lnd will start the Prometheus exporter. Prometheus flags are
@@ -820,6 +802,10 @@
 ; NOTE: This value is currently unused.
 ; neutrino.banthreshold=
 
+; DEPRECATED: Use top level 'feeurl' option. Optional URL for fee estimation. If
+; a URL is not specified, static fees will be used for estimation.
+; neutrino.feeurl=
+
 ; Optional filter header in height:hash format to assert the state of neutrino's
 ; filter header chain on startup. If the assertion does not hold, then the
 ; filter header chain will be re-synced from the genesis block.


Test patch:
diff --git a/htlcswitch/link_test.go b/htlcswitch/link_test.go
index 6963bf708..4db22d173 100644
--- a/htlcswitch/link_test.go
+++ b/htlcswitch/link_test.go
@@ -2220,11 +2220,11 @@ func newSingleLinkTestHarness(t *testing.T, chanAmt,
 		BatchTicker:          bticker,
 		FwdPkgGCTicker:       ticker.NewForce(15 * time.Second),
 		PendingCommitTicker:  ticker.New(time.Minute),
-		// Make the BatchSize and Min/MaxUpdateTimeout large enough
+		// Make the BatchSize and Min/MaxFeeUpdateTimeout large enough
 		// to not trigger commit updates automatically during tests.
 		BatchSize:               10000,
-		MinUpdateTimeout:        30 * time.Minute,
-		MaxUpdateTimeout:        40 * time.Minute,
+		MinFeeUpdateTimeout:     30 * time.Minute,
+		MaxFeeUpdateTimeout:     40 * time.Minute,
 		MaxOutgoingCltvExpiry:   DefaultMaxOutgoingCltvExpiry,
 		MaxFeeAllocation:        DefaultMaxLinkFeeAllocation,
 		NotifyActiveLink:        func(wire.OutPoint) {},
@@ -4881,11 +4881,11 @@ func (h *persistentLinkHarness) restartLink(
 		BatchTicker:          bticker,
 		FwdPkgGCTicker:       ticker.New(5 * time.Second),
 		PendingCommitTicker:  ticker.New(time.Minute),
-		// Make the BatchSize and Min/MaxUpdateTimeout large enough
+		// Make the BatchSize and Min/MaxFeeUpdateTimeout large enough
 		// to not trigger commit updates automatically during tests.
-		BatchSize:        10000,
-		MinUpdateTimeout: 30 * time.Minute,
-		MaxUpdateTimeout: 40 * time.Minute,
+		BatchSize:           10000,
+		MinFeeUpdateTimeout: 30 * time.Minute,
+		MaxFeeUpdateTimeout: 40 * time.Minute,
 		// Set any hodl flags requested for the new link.
 		HodlMask:                hodl.MaskFromFlags(hodlFlags...),
 		MaxOutgoingCltvExpiry:   DefaultMaxOutgoingCltvExpiry,
diff --git a/htlcswitch/test_utils.go b/htlcswitch/test_utils.go
index 9a72197ec..0c98fa4fe 100644
--- a/htlcswitch/test_utils.go
+++ b/htlcswitch/test_utils.go
@@ -1155,8 +1155,8 @@ func (h *hopNetwork) createChannelLink(server, peer *mockServer,
 			BatchTicker:             ticker.NewForce(testBatchTimeout),
 			FwdPkgGCTicker:          ticker.NewForce(fwdPkgTimeout),
 			PendingCommitTicker:     ticker.New(2 * time.Minute),
-			MinUpdateTimeout:        minFeeUpdateTimeout,
-			MaxUpdateTimeout:        maxFeeUpdateTimeout,
+			MinFeeUpdateTimeout:     minFeeUpdateTimeout,
+			MaxFeeUpdateTimeout:     maxFeeUpdateTimeout,
 			OnChannelFailure:        func(lnwire.ChannelID, lnwire.ShortChannelID, LinkFailureError) {},
 			OutgoingCltvRejectDelta: 3,
 			MaxOutgoingCltvExpiry:   DefaultMaxOutgoingCltvExpiry,
diff --git a/invoices/invoiceregistry_test.go b/invoices/invoiceregistry_test.go
index 4a76d58aa..b0c019522 100644
--- a/invoices/invoiceregistry_test.go
+++ b/invoices/invoiceregistry_test.go
@@ -6,7 +6,6 @@ import (
 	"database/sql"
 	"fmt"
 	"math"
-	"sync"
 	"testing"
 	"testing/quick"
 	"time"
@@ -24,12 +23,6 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
-// sqliteConstructorMu is used to ensure that only one thread can call the
-// sqldb.NewTestSqliteDB constructor at a time. This is a temporary workaround
-// that can be removed once this race condition in the sqlite repo is resolved:
-// https://gitlab.com/cznic/sqlite/-/issues/180
-var sqliteConstructorMu sync.Mutex
-
 // TestInvoiceRegistry is a master test which encompasses all tests using an
 // InvoiceDB instance. The purpose of this test is to be able to run all tests
 // with a custom DB instance, so that we can test the same logic with different
@@ -137,9 +130,7 @@ func TestInvoiceRegistry(t *testing.T) {
 
 		var db *sqldb.BaseDB
 		if sqlite {
-			sqliteConstructorMu.Lock()
 			db = sqldb.NewTestSqliteDB(t).BaseDB
-			sqliteConstructorMu.Unlock()
 		} else {
 			db = sqldb.NewTestPostgresDB(t, pgFixture).BaseDB
 		}
diff --git a/invoices/invoices_test.go b/invoices/invoices_test.go
index 71da38571..c9e204571 100644
--- a/invoices/invoices_test.go
+++ b/invoices/invoices_test.go
@@ -234,9 +234,7 @@ func TestInvoices(t *testing.T) {
 	makeSQLDB := func(t *testing.T, sqlite bool) invpkg.InvoiceDB {
 		var db *sqldb.BaseDB
 		if sqlite {
-			sqliteConstructorMu.Lock()
 			db = sqldb.NewTestSqliteDB(t).BaseDB
-			sqliteConstructorMu.Unlock()
 		} else {
 			db = sqldb.NewTestPostgresDB(t, pgFixture).BaseDB
 		}
diff --git a/lntest/fee_service.go b/lntest/fee_service.go
index cee9ae0ab..d96bd7588 100644
--- a/lntest/fee_service.go
+++ b/lntest/fee_service.go
@@ -17,7 +17,7 @@ import (
 
 // WebFeeService defines an interface that's used to provide fee estimation
 // service used in the integration tests. It must provide an URL so that a lnd
-// node can be started with the flag `--fee.url` and uses the customized fee
+// node can be started with the flag `--feeurl` and uses the customized fee
 // estimator.
 type WebFeeService interface {
 	// Start starts the service.
diff --git a/lntest/node/config.go b/lntest/node/config.go
index de1ea92ec..d0de2fdd4 100644
--- a/lntest/node/config.go
+++ b/lntest/node/config.go
@@ -279,7 +279,7 @@ func (cfg *BaseNodeConfig) GenArgs() []string {
 	}
 
 	if cfg.FeeURL != "" {
-		args = append(args, "--fee.url="+cfg.FeeURL)
+		args = append(args, "--feeurl="+cfg.FeeURL)
 	}
 
 	// Put extra args in the end so the args can be overwritten.
diff --git a/lnwallet/chainfee/estimator_test.go b/lnwallet/chainfee/estimator_test.go
index 51ab5bf29..fc16c9b12 100644
--- a/lnwallet/chainfee/estimator_test.go
+++ b/lnwallet/chainfee/estimator_test.go
@@ -4,7 +4,6 @@ import (
 	"bytes"
 	"encoding/json"
 	"testing"
-	"time"
 
 	"github.com/btcsuite/btcd/btcutil"
 	"github.com/stretchr/testify/require"
@@ -143,9 +142,6 @@ func TestWebAPIFeeEstimator(t *testing.T) {
 		// Fee rates are in sat/kb.
 		minFeeRate uint32 = 2000 // 500 sat/kw
 		maxFeeRate uint32 = 4000 // 1000 sat/kw
-
-		minFeeUpdateTimeout = 5 * time.Minute
-		maxFeeUpdateTimeout = 20 * time.Minute
 	)
 
 	testCases := []struct {
@@ -203,9 +199,7 @@ func TestWebAPIFeeEstimator(t *testing.T) {
 	feeSource := &mockFeeSource{}
 	feeSource.On("GetFeeMap").Return(feeRateResp, nil)
 
-	estimator, _ := NewWebAPIEstimator(
-		feeSource, false, minFeeUpdateTimeout, maxFeeUpdateTimeout,
-	)
+	estimator := NewWebAPIEstimator(feeSource, false)
 
 	// Test that requesting a fee when no fees have been cached won't fail.
 	feeRate, err := estimator.EstimateFeePerKW(5)
@@ -253,15 +247,10 @@ func TestGetCachedFee(t *testing.T) {
 
 		minFeeRate uint32 = 100
 		maxFeeRate uint32 = 1000
-
-		minFeeUpdateTimeout = 5 * time.Minute
-		maxFeeUpdateTimeout = 20 * time.Minute
 	)
 
 	// Create a dummy estimator without WebAPIFeeSource.
-	estimator, _ := NewWebAPIEstimator(
-		nil, false, minFeeUpdateTimeout, maxFeeUpdateTimeout,
-	)
+	estimator := NewWebAPIEstimator(nil, false)
 
 	// When the cache is empty, an error should be returned.
 	cachedFee, err := estimator.getCachedFee(minTarget)
@@ -326,38 +315,3 @@ func TestGetCachedFee(t *testing.T) {
 		})
 	}
 }
-
-func TestRandomFeeUpdateTimeout(t *testing.T) {
-	t.Parallel()
-
-	var (
-		minFeeUpdateTimeout = 1 * time.Minute
-		maxFeeUpdateTimeout = 2 * time.Minute
-	)
-
-	estimator, _ := NewWebAPIEstimator(
-		nil, false, minFeeUpdateTimeout, maxFeeUpdateTimeout,
-	)
-
-	for i := 0; i < 1000; i++ {
-		timeout := estimator.randomFeeUpdateTimeout()
-
-		require.GreaterOrEqual(t, timeout, minFeeUpdateTimeout)
-		require.LessOrEqual(t, timeout, maxFeeUpdateTimeout)
-	}
-}
-
-func TestInvalidFeeUpdateTimeout(t *testing.T) {
-	t.Parallel()
-
-	var (
-		minFeeUpdateTimeout = 2 * time.Minute
-		maxFeeUpdateTimeout = 1 * time.Minute
-	)
-
-	_, err := NewWebAPIEstimator(
-		nil, false, minFeeUpdateTimeout, maxFeeUpdateTimeout,
-	)
-	require.Error(t, err, "NewWebAPIEstimator should return an error "+
-		"when minFeeUpdateTimeout > maxFeeUpdateTimeout")
-}
diff --git a/routing/notifications_test.go b/routing/notifications_test.go
index 48b0a2766..4e095649b 100644
--- a/routing/notifications_test.go
+++ b/routing/notifications_test.go
@@ -75,7 +75,18 @@ func createTestNode() (*channeldb.LightningNode, error) {
 }
 
 func randEdgePolicy(chanID *lnwire.ShortChannelID,
-	node *channeldb.LightningNode) *models.ChannelEdgePolicy {
+	node *channeldb.LightningNode) (*models.ChannelEdgePolicy, error) {
+
+	InboundFee := models.InboundFee{
+		Base: prand.Int31() * -1,
+		Rate: prand.Int31() * -1,
+	}
+	inboundFee := InboundFee.ToWire()
+
+	var extraOpaqueData lnwire.ExtraOpaqueData
+	if err := extraOpaqueData.PackRecords(&inboundFee); err != nil {
+		return nil, err
+	}
 
 	return &models.ChannelEdgePolicy{
 		SigBytes:                  testSig.Serialize(),
@@ -87,7 +98,8 @@ func randEdgePolicy(chanID *lnwire.ShortChannelID,
 		FeeBaseMSat:               lnwire.MilliSatoshi(prand.Int31()),
 		FeeProportionalMillionths: lnwire.MilliSatoshi(prand.Int31()),
 		ToNode:                    node.PubKeyBytes,
-	}
+		ExtraOpaqueData:           extraOpaqueData,
+	}, nil
 }
 
 func createChannelEdge(ctx *testCtx, bitcoinKey1, bitcoinKey2 []byte,
@@ -457,9 +469,12 @@ func TestEdgeUpdateNotification(t *testing.T) {
 
 	// Create random policy edges that are stemmed to the channel id
 	// created above.
-	edge1 := randEdgePolicy(chanID, node1)
+	edge1, err := randEdgePolicy(chanID, node1)
+	require.NoError(t, err, "unable to create a random chan policy")
 	edge1.ChannelFlags = 0
-	edge2 := randEdgePolicy(chanID, node2)
+
+	edge2, err := randEdgePolicy(chanID, node2)
+	require.NoError(t, err, "unable to create a random chan policy")
 	edge2.ChannelFlags = 1
 
 	if err := ctx.router.UpdateEdge(edge1); err != nil {
@@ -511,6 +526,9 @@ func TestEdgeUpdateNotification(t *testing.T) {
 				"expected %v, got %v", edgeAnn.TimeLockDelta,
 				edgeUpdate.TimeLockDelta)
 		}
+		require.Equal(
+			t, edgeAnn.ExtraOpaqueData, edgeUpdate.ExtraOpaqueData,
+		)
 	}
 
 	// Create lookup map for notifications we are intending to receive. Entries