highperfocused/lnd
1
0
Fork 0
mirror of https://github.com/lightningnetwork/lnd.git synced 2025-07-28 05:42:37 +02:00
Code Issues Packages Projects Releases Wiki Activity

chainntnfs/txconfnotifier: commit conf hints before notifying

Browse Source
This commit is contained in:
Conner Fromknecht
2018-08-24 17:58:02 -07:00
parent 7dceac92d2
commit 91b0e9cae5
1 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
chainntnfs/txconfnotifier.go
View File

@@ -452,6 +452,19 @@ func (tcn *TxConfNotifier) DisconnectTip(blockHeight uint32) error {
tcn.currentHeight-- tcn.currentHeight--
tcn.reorgDepth++ tcn.reorgDepth++
// Rewind the height hint for all watched transactions.
var txs []chainhash.Hash
for tx := range tcn.confNotifications {
txs = append(txs, tx)
}
err := tcn.hintCache.CommitConfirmHint(tcn.currentHeight, txs...)
if err != nil {
Log.Errorf("Unable to update confirm hint to %d for %v: %v",
tcn.currentHeight, txs, err)
return err
}
// We'll go through all of our watched transactions and attempt to drain // We'll go through all of our watched transactions and attempt to drain
// their notification channels to ensure sending notifications to the // their notification channels to ensure sending notifications to the
// clients is always non-blocking. // clients is always non-blocking.
@@ -515,20 +528,6 @@ func (tcn *TxConfNotifier) DisconnectTip(blockHeight uint32) error {
} }
} }
// Rewind the height hint for all watched transactions.
var txs []chainhash.Hash
for tx := range tcn.confNotifications {
txs = append(txs, tx)
}
err := tcn.hintCache.CommitConfirmHint(tcn.currentHeight, txs...)
if err != nil {
// The error is not fatal, so we should not return an error to
// the caller.
Log.Errorf("Unable to update confirm hint to %d for %v: %v",
tcn.currentHeight, txs, err)
}
// Finally, we can remove the transactions we're currently watching that // Finally, we can remove the transactions we're currently watching that
// were included in this block height. // were included in this block height.
delete(tcn.txsByInitialHeight, blockHeight) delete(tcn.txsByInitialHeight, blockHeight)