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

contractcourt/channel_arbitrator: mark channel commitment broadcasted instead of closed after broadcast

Browse Source
This commit is contained in:
Johan T. Halseth 2018-04-03 14:05:07 +02:00
parent 854e73b8e0
commit 70e8087731
No known key found for this signature in database
GPG Key ID: 15BAADA29DA20D26
1 changed files with 8 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
contractcourt/channel_arbitrator.go
View File

@ -11,7 +11,6 @@ import (
"github.com/lightningnetwork/lnd/lnwallet" "github.com/lightningnetwork/lnd/lnwallet"
"github.com/lightningnetwork/lnd/lnwire" "github.com/lightningnetwork/lnd/lnwire"
"github.com/roasbeef/btcd/wire" "github.com/roasbeef/btcd/wire"
"github.com/roasbeef/btcutil"
) )
const ( const (
@ -90,6 +89,10 @@ type ChannelArbitratorConfig struct {
// eventually resolve all outputs on chain. // eventually resolve all outputs on chain.
ForceCloseChan func() (*lnwallet.LocalForceCloseSummary, error) ForceCloseChan func() (*lnwallet.LocalForceCloseSummary, error)
// MarkCommitmentBroadcasted should mark the channel as the commitment
// being broadcast, and we are waiting for the commitment to confirm.
MarkCommitmentBroadcasted func() error
// CloseChannel is a function closure that marks a channel under watch // CloseChannel is a function closure that marks a channel under watch
// as "closing". In this phase, we will no longer accept any updates to // as "closing". In this phase, we will no longer accept any updates to
// the channel as the commitment transaction has been broadcast, and // the channel as the commitment transaction has been broadcast, and
@ -467,21 +470,10 @@ func (c *ChannelArbitrator) stateStep(triggerHeight uint32,
} }
} }
contractRes := ContractResolutions{ if err := c.cfg.MarkCommitmentBroadcasted(); err != nil {
CommitHash: closeTx.TxHash(), log.Errorf("ChannelArbitrator(%v): unable to "+
CommitResolution: closeSummary.CommitResolution, "mark commitment broadcasted: %v",
HtlcResolutions: *closeSummary.HtlcResolutions, c.cfg.ChanPoint, err)
}
// Now that the transaction has been broadcast, we can mark
// that it has been closed to outside sub-systems.
err = c.markContractClosed(
closeTx, closeSummary.ChanSnapshot, &contractRes,
bestHeight,
)
if err != nil {
log.Errorf("unable to close contract: %v", err)
return StateError, closeTx, err
} }
// We go to the StateCommitmentBroadcasted state, where we'll // We go to the StateCommitmentBroadcasted state, where we'll
@ -1555,39 +1547,3 @@ func (c *ChannelArbitrator) channelAttendant(bestHeight int32) {
} }
} }
} }
// markContractClosed marks a contract as "pending closed". After this state,
// upon restart, we'll no longer watch for updates to the set of contracts as
// the channel cannot be updated any longer.
func (c *ChannelArbitrator) markContractClosed(closeTx *wire.MsgTx,
chanSnapshot channeldb.ChannelSnapshot,
contractResolution *ContractResolutions,
closeHeight uint32) error {
// TODO(roasbeef): also need height info?
closeInfo := &channeldb.ChannelCloseSummary{
ChanPoint: chanSnapshot.ChannelPoint,
ChainHash: chanSnapshot.ChainHash,
ClosingTXID: closeTx.TxHash(),
RemotePub: &chanSnapshot.RemoteIdentity,
Capacity: chanSnapshot.Capacity,
CloseType: channeldb.ForceClose,
IsPending: true,
ShortChanID: c.cfg.ShortChanID,
CloseHeight: closeHeight,
}
// If our commitment output isn't dust or we have active HTLC's on the
// commitment transaction, then we'll populate the balances on the
// close channel summary.
if contractResolution.CommitResolution != nil {
closeInfo.SettledBalance = chanSnapshot.LocalBalance.ToSatoshis()
closeInfo.TimeLockedBalance = chanSnapshot.LocalBalance.ToSatoshis()
}
for _, htlc := range contractResolution.HtlcResolutions.OutgoingHTLCs {
htlcValue := btcutil.Amount(htlc.SweepSignDesc.Output.Value)
closeInfo.TimeLockedBalance += htlcValue
}
return c.cfg.CloseChannel(closeInfo)
}