akovalenko/lnd.xprv
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #5404 from Roasbeef/revert-no-router-fetch

Browse Source 
Revert "routing: no backend call to fetch best block"
This commit is contained in:
Olaoluwa Osuntokun 2021-06-22 17:31:28 -07:00 committed by GitHub
commit 29d0b6491e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
docs/release-notes/release-notes-0.13.1.md
View File

@ -37,5 +37,12 @@ The [`monitoring` build tag is now on by
default](https://github.com/lightningnetwork/lnd/pull/5399) for all routine default](https://github.com/lightningnetwork/lnd/pull/5399) for all routine
builds. builds.
## Bug Fixes
An optimization intended to speed up the payment critical path by
eliminating an extra RPC call [has been
reverted](https://github.com/lightningnetwork/lnd/pull/5404) as it
introduced a regression that would cause payment failure due to mismatching
heights.
# Contributors (Alphabetical Order) # Contributors (Alphabetical Order)

21
routing/router.go
View File

@ -10,7 +10,6 @@ import (
"time" "time"
"github.com/btcsuite/btcd/btcec" "github.com/btcsuite/btcd/btcec"
"github.com/btcsuite/btcd/chaincfg/chainhash"
"github.com/btcsuite/btcd/wire" "github.com/btcsuite/btcd/wire"
"github.com/btcsuite/btcutil" "github.com/btcsuite/btcutil"
"github.com/davecgh/go-spew/spew" "github.com/davecgh/go-spew/spew"
@ -489,7 +488,6 @@ func (r *ChannelRouter) Start() error {
if err != nil { if err != nil {
return err return err
} }
r.bestHeight = uint32(bestHeight)
// If the graph has never been pruned, or hasn't fully been created yet, // If the graph has never been pruned, or hasn't fully been created yet,
// then we don't treat this as an explicit error. // then we don't treat this as an explicit error.
@ -565,7 +563,7 @@ func (r *ChannelRouter) Start() error {
// The graph pruning might have taken a while and there could be // The graph pruning might have taken a while and there could be
// new blocks available. // new blocks available.
bestHash, bestHeight, err = r.cfg.Chain.GetBestBlock() _, bestHeight, err = r.cfg.Chain.GetBestBlock()
if err != nil { if err != nil {
return err return err
} }
@ -574,7 +572,7 @@ func (r *ChannelRouter) Start() error {
// Before we begin normal operation of the router, we first need // Before we begin normal operation of the router, we first need
// to synchronize the channel graph to the latest state of the // to synchronize the channel graph to the latest state of the
// UTXO set. // UTXO set.
if err := r.syncGraphWithChain(bestHash, bestHeight); err != nil { if err := r.syncGraphWithChain(); err != nil {
return err return err
} }
@ -706,11 +704,15 @@ func (r *ChannelRouter) Stop() error {
// the latest UTXO set state. This process involves pruning from the channel // the latest UTXO set state. This process involves pruning from the channel
// graph any channels which have been closed by spending their funding output // graph any channels which have been closed by spending their funding output
// since we've been down. // since we've been down.
func (r *ChannelRouter) syncGraphWithChain(bestHash *chainhash.Hash, func (r *ChannelRouter) syncGraphWithChain() error {
bestHeight int32) error {
// First, we'll need to check to see if we're already in sync with the // First, we'll need to check to see if we're already in sync with the
// latest state of the UTXO set. // latest state of the UTXO set.
bestHash, bestHeight, err := r.cfg.Chain.GetBestBlock()
if err != nil {
return err
}
r.bestHeight = uint32(bestHeight)
pruneHash, pruneHeight, err := r.cfg.Graph.PruneTip() pruneHash, pruneHeight, err := r.cfg.Graph.PruneTip()
if err != nil { if err != nil {
switch { switch {
@ -2200,7 +2202,10 @@ func (r *ChannelRouter) sendPayment(
// We'll also fetch the current block height so we can properly // We'll also fetch the current block height so we can properly
// calculate the required HTLC time locks within the route. // calculate the required HTLC time locks within the route.
currentHeight := int32(atomic.LoadUint32(&r.bestHeight)) _, currentHeight, err := r.cfg.Chain.GetBestBlock()
if err != nil {
return [32]byte{}, nil, err
}
// Now set up a paymentLifecycle struct with these params, such that we // Now set up a paymentLifecycle struct with these params, such that we
// can resume the payment from the current state. // can resume the payment from the current state.