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

lnwallet: include the origin chanPoint in the ForceCloseSummary

Browse Source 
This commit adds an additional field to the ForceCloseSummary that
allows observers of the channel that sends this struct to track _which_
channel the force close came from.
This commit is contained in:
Olaoluwa Osuntokun 2017-05-04 15:37:03 -07:00
parent 77ae9f560e
commit be583306ab
No known key found for this signature in database
GPG Key ID: 9CC5B105D03521A2
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
lnwallet/channel.go
View File

@ -2273,23 +2273,27 @@ func (lc *LightningChannel) addHTLC(commitTx *wire.MsgTx, ourCommit bool,
// rightfully owned outputs. // rightfully owned outputs.
// TODO(roasbeef): generalize, add HTLC info, etc. // TODO(roasbeef): generalize, add HTLC info, etc.
type ForceCloseSummary struct { type ForceCloseSummary struct {
// ChanPoint is the outpoint that created the channel which has been
// force closed.
ChanPoint wire.OutPoint
// SelfOutpoint is the output created by the above close tx which is
// spendable by us after a relative time delay.
SelfOutpoint wire.OutPoint
// CloseTx is the transaction which closed the channel on-chain. If we // CloseTx is the transaction which closed the channel on-chain. If we
// initiate the force close, then this'll be our latest commitment // initiate the force close, then this'll be our latest commitment
// state. Otherwise, this'll be the state that the remote peer // state. Otherwise, this'll be the state that the remote peer
// broadcasted on-chain. // broadcasted on-chain.
CloseTx *wire.MsgTx CloseTx *wire.MsgTx
// SelfOutpoint is the output created by the above close tx which is // SelfOutputSignDesc is a fully populated sign descriptor capable of
// spendable by us after a relative time delay. // generating a valid signature to sweep the self output.
SelfOutpoint wire.OutPoint SelfOutputSignDesc *SignDescriptor
// SelfOutputMaturity is the relative maturity period before the above // SelfOutputMaturity is the relative maturity period before the above
// output can be claimed. // output can be claimed.
SelfOutputMaturity uint32 SelfOutputMaturity uint32
// SelfOutputSignDesc is a fully populated sign descriptor capable of
// generating a valid signature to sweep the self output.
SelfOutputSignDesc *SignDescriptor
} }
// getSignedCommitTx function take the latest commitment transaction and populate // getSignedCommitTx function take the latest commitment transaction and populate
@ -2408,7 +2412,8 @@ func (lc *LightningChannel) ForceClose() (*ForceCloseSummary, error) {
close(lc.ForceCloseSignal) close(lc.ForceCloseSignal)
return &ForceCloseSummary{ return &ForceCloseSummary{
CloseTx: commitTx, ChanPoint: *lc.channelState.ChanID,
CloseTx: commitTx,
SelfOutpoint: wire.OutPoint{ SelfOutpoint: wire.OutPoint{
Hash: commitTx.TxHash(), Hash: commitTx.TxHash(),
Index: delayIndex, Index: delayIndex,