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

Merge pull request #2205 from valentinewallace/better-sync-info

Browse Source 
lnwallet/btcwallet: return best header timestamp while wallet is resc…
This commit is contained in:
Olaoluwa Osuntokun 2018-11-21 23:06:25 -08:00 committed by GitHub
commit 712fc3ebed
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lnwallet/btcwallet/btcwallet.go
View File

@ -714,11 +714,6 @@ func (b *BtcWallet) SubscribeTransactions() (lnwallet.TransactionSubscription, e
// //
// This is a part of the WalletController interface. // This is a part of the WalletController interface.
func (b *BtcWallet) IsSynced() (bool, int64, error) { func (b *BtcWallet) IsSynced() (bool, int64, error) {
// First, we'll ensure the wallet is not currently undergoing a rescan.
if !b.wallet.ChainSynced() {
return false, 0, nil
}
// Grab the best chain state the wallet is currently aware of. // Grab the best chain state the wallet is currently aware of.
syncState := b.wallet.Manager.SyncedTo() syncState := b.wallet.Manager.SyncedTo()
@ -735,7 +730,7 @@ func (b *BtcWallet) IsSynced() (bool, int64, error) {
// If the wallet hasn't yet fully synced to the node's best chain tip, // If the wallet hasn't yet fully synced to the node's best chain tip,
// then we're not yet fully synced. // then we're not yet fully synced.
if syncState.Height < bestHeight { if syncState.Height < bestHeight || !b.wallet.ChainSynced() {
return false, bestTimestamp, nil return false, bestTimestamp, nil
} }