mirrors/lnd
1
0
Fork 0
mirror of https://github.com/lightningnetwork/lnd.git synced 2025-02-23 14:40:30 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #6124 from C-Otto/force-close-logging

Browse source 
contractcourt: use "info" log level for messages leading to force-closes
This commit is contained in:
Oliver Gugger 2022-01-05 09:52:23 +01:00 • committed by GitHub
commit 39c6236054
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
contractcourt/channel_arbitrator.go
View file

@ -1523,7 +1523,7 @@ func (c *ChannelArbitrator) checkCommitChainActions(height uint32,
) )
if toChain { if toChain {
log.Debugf("ChannelArbitrator(%v): go to chain for "+ log.Infof("ChannelArbitrator(%v): go to chain for "+
"outgoing htlc %x: timeout=%v, "+ "outgoing htlc %x: timeout=%v, "+
"blocks_until_expiry=%v, broadcast_delta=%v", "blocks_until_expiry=%v, broadcast_delta=%v",
c.cfg.ChanPoint, htlc.RHash[:], c.cfg.ChanPoint, htlc.RHash[:],
@ -1554,7 +1554,7 @@ func (c *ChannelArbitrator) checkCommitChainActions(height uint32,
) )
if toChain { if toChain {
log.Debugf("ChannelArbitrator(%v): go to chain for "+ log.Infof("ChannelArbitrator(%v): go to chain for "+
"incoming htlc %x: timeout=%v, "+ "incoming htlc %x: timeout=%v, "+
"blocks_until_expiry=%v, broadcast_delta=%v", "blocks_until_expiry=%v, broadcast_delta=%v",
c.cfg.ChanPoint, htlc.RHash[:], c.cfg.ChanPoint, htlc.RHash[:],
@ -1815,7 +1815,7 @@ func (c *ChannelArbitrator) checkRemoteChainActions(
return nil, err return nil, err
} }
// With this actions computed, we'll now check the diff of the HTLCs on // With these actions computed, we'll now check the diff of the HTLCs on
// the commitments, and cancel back any that are on the pending but not // the commitments, and cancel back any that are on the pending but not
// the non-pending. // the non-pending.
remoteDiffActions := c.checkRemoteDiffActions( remoteDiffActions := c.checkRemoteDiffActions(
@ -1863,7 +1863,7 @@ func (c *ChannelArbitrator) checkRemoteDiffActions(height uint32,
actionMap[HtlcFailNowAction], htlc, actionMap[HtlcFailNowAction], htlc,
) )
log.Tracef("ChannelArbitrator(%v): immediately failing "+ log.Infof("ChannelArbitrator(%v): immediately failing "+
"htlc=%x from remote commitment", "htlc=%x from remote commitment",
c.cfg.ChanPoint, htlc.RHash[:]) c.cfg.ChanPoint, htlc.RHash[:])
} }
@ -1886,7 +1886,7 @@ func (c *ChannelArbitrator) constructChainActions(confCommitSet *CommitSet,
return c.log.FetchChainActions() return c.log.FetchChainActions()
} }
// Otherwise we have the full commitment set written to disk, and can // Otherwise, we have the full commitment set written to disk, and can
// proceed as normal. // proceed as normal.
htlcSets := confCommitSet.toActiveHTLCSets() htlcSets := confCommitSet.toActiveHTLCSets()
switch *confCommitSet.ConfCommitKey { switch *confCommitSet.ConfCommitKey {
@ -1917,7 +1917,7 @@ func (c *ChannelArbitrator) constructChainActions(confCommitSet *CommitSet,
return nil, fmt.Errorf("unable to locate chain actions") return nil, fmt.Errorf("unable to locate chain actions")
} }
// prepContractResolutions is called either int he case that we decide we need // prepContractResolutions is called either in the case that we decide we need
// to go to chain, or the remote party goes to chain. Given a set of actions we // to go to chain, or the remote party goes to chain. Given a set of actions we
// need to take for each HTLC, this method will return a set of contract // need to take for each HTLC, this method will return a set of contract
// resolvers that will resolve the contracts on-chain if needed, and also a set // resolvers that will resolve the contracts on-chain if needed, and also a set

2
docs/release-notes/release-notes-0.15.0.md
View file

@ -48,6 +48,7 @@
## Documentation ## Documentation
* Improved instructions on [how to build lnd for mobile](https://github.com/lightningnetwork/lnd/pull/6085). * Improved instructions on [how to build lnd for mobile](https://github.com/lightningnetwork/lnd/pull/6085).
* [Log force-close related messages on "info" level](https://github.com/lightningnetwork/lnd/pull/6124).
## Code Health ## Code Health
@ -58,6 +59,7 @@
# Contributors (Alphabetical Order) # Contributors (Alphabetical Order)
* Andreas Schjønhaug * Andreas Schjønhaug
* Carsten Otto
* Daniel McNally * Daniel McNally
* ErikEk * ErikEk
* Joost Jager * Joost Jager