From 0fc6bd8e12a0d539c80c4215c6a0a9903ef55bff Mon Sep 17 00:00:00 2001 From: Carsten Otto Date: Fri, 31 Dec 2021 16:18:19 +0100 Subject: [PATCH 1/3] contractcourt: fix typos [skip ci] --- contractcourt/channel_arbitrator.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/contractcourt/channel_arbitrator.go b/contractcourt/channel_arbitrator.go index ff29e6966..90be9f21a 100644 --- a/contractcourt/channel_arbitrator.go +++ b/contractcourt/channel_arbitrator.go @@ -1815,7 +1815,7 @@ func (c *ChannelArbitrator) checkRemoteChainActions( 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 non-pending. remoteDiffActions := c.checkRemoteDiffActions( @@ -1886,7 +1886,7 @@ func (c *ChannelArbitrator) constructChainActions(confCommitSet *CommitSet, 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. htlcSets := confCommitSet.toActiveHTLCSets() switch *confCommitSet.ConfCommitKey { @@ -1917,7 +1917,7 @@ func (c *ChannelArbitrator) constructChainActions(confCommitSet *CommitSet, 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 // 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 From 0d36734167a4d48064dadc4b510e711b195393e9 Mon Sep 17 00:00:00 2001 From: Carsten Otto Date: Fri, 31 Dec 2021 16:20:02 +0100 Subject: [PATCH 2/3] contractcourt: use "info" log level for messages leading to force-closes [skip ci] --- contractcourt/channel_arbitrator.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/contractcourt/channel_arbitrator.go b/contractcourt/channel_arbitrator.go index 90be9f21a..cc4c83ba6 100644 --- a/contractcourt/channel_arbitrator.go +++ b/contractcourt/channel_arbitrator.go @@ -1523,7 +1523,7 @@ func (c *ChannelArbitrator) checkCommitChainActions(height uint32, ) if toChain { - log.Debugf("ChannelArbitrator(%v): go to chain for "+ + log.Infof("ChannelArbitrator(%v): go to chain for "+ "outgoing htlc %x: timeout=%v, "+ "blocks_until_expiry=%v, broadcast_delta=%v", c.cfg.ChanPoint, htlc.RHash[:], @@ -1554,7 +1554,7 @@ func (c *ChannelArbitrator) checkCommitChainActions(height uint32, ) if toChain { - log.Debugf("ChannelArbitrator(%v): go to chain for "+ + log.Infof("ChannelArbitrator(%v): go to chain for "+ "incoming htlc %x: timeout=%v, "+ "blocks_until_expiry=%v, broadcast_delta=%v", c.cfg.ChanPoint, htlc.RHash[:], @@ -1863,7 +1863,7 @@ func (c *ChannelArbitrator) checkRemoteDiffActions(height uint32, actionMap[HtlcFailNowAction], htlc, ) - log.Tracef("ChannelArbitrator(%v): immediately failing "+ + log.Infof("ChannelArbitrator(%v): immediately failing "+ "htlc=%x from remote commitment", c.cfg.ChanPoint, htlc.RHash[:]) } From 118ef31792e1f99b1b5f4c4090a243f5462d2ee2 Mon Sep 17 00:00:00 2001 From: Carsten Otto Date: Fri, 31 Dec 2021 16:49:18 +0100 Subject: [PATCH 3/3] docs: add release notes [skip ci] --- docs/release-notes/release-notes-0.15.0.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/release-notes/release-notes-0.15.0.md b/docs/release-notes/release-notes-0.15.0.md index 6d6b209b3..4fcc63ea5 100644 --- a/docs/release-notes/release-notes-0.15.0.md +++ b/docs/release-notes/release-notes-0.15.0.md @@ -29,6 +29,7 @@ ## Documentation * 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 @@ -39,6 +40,7 @@ # Contributors (Alphabetical Order) * Andreas Schjønhaug +* Carsten Otto * Daniel McNally * ErikEk * Torkel Rogstad