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

chancloser: initiator always sends the first CloseSigned msg

Browse Source 
In this commit, we update the chan closer state machine to be fully
spec compliant. A recent change was made to the spec to enforce a
strict ordering such that, the negotiation is well formed. To enact
this change, we’ll ensure that before the closeFeeNegotiation phase,
the *initiator* is always the one that sends the CloseSigned message
first.
This commit is contained in:
Olaoluwa Osuntokun 2018-02-08 19:43:03 -08:00
parent 2e090ee2ab
commit d1c12202ca
No known key found for this signature in database
GPG Key ID: 964EA263DD637C21
1 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
chancloser.go
View File

@ -302,8 +302,8 @@ func (c *channelCloser) ProcessCloseMsg(msg lnwire.Message) ([]lnwire.Message, b
peerLog.Infof("ChannelPoint(%v): Responding to shutdown", peerLog.Infof("ChannelPoint(%v): Responding to shutdown",
c.chanPoint) c.chanPoint)
msgsToSend := make([]lnwire.Message, 2) msgsToSend := make([]lnwire.Message, 0, 2)
msgsToSend[0] = localShutdown msgsToSend = append(msgsToSend, localShutdown)
// After the other party receives this message, we'll actually // After the other party receives this message, we'll actually
// start the final stage of the closure process: fee // start the final stage of the closure process: fee
@ -312,12 +312,14 @@ func (c *channelCloser) ProcessCloseMsg(msg lnwire.Message) ([]lnwire.Message, b
c.state = closeFeeNegotiation c.state = closeFeeNegotiation
// We'll also craft our initial close proposal in order to keep // We'll also craft our initial close proposal in order to keep
// the negotiation moving. // the negotiation moving, but only if we're the negotiator.
if c.cfg.channel.IsInitiator() {
closeSigned, err := c.proposeCloseSigned(c.idealFeeSat) closeSigned, err := c.proposeCloseSigned(c.idealFeeSat)
if err != nil { if err != nil {
return nil, false, err return nil, false, err
} }
msgsToSend[1] = closeSigned msgsToSend = append(msgsToSend, closeSigned)
}
// We'll return both sent of messages to sent to the remote // We'll return both sent of messages to sent to the remote
// party to kick off the fee negotiation process. // party to kick off the fee negotiation process.
@ -348,13 +350,19 @@ func (c *channelCloser) ProcessCloseMsg(msg lnwire.Message) ([]lnwire.Message, b
"entering fee negotiation", c.chanPoint) "entering fee negotiation", c.chanPoint)
// Starting with our ideal fee rate, we'll create an initial // Starting with our ideal fee rate, we'll create an initial
// closing proposal. // closing proposal, but only if we're the initiator, as
// otherwise, the other party will send their first proposal
// first.
if c.cfg.channel.IsInitiator() {
closeSigned, err := c.proposeCloseSigned(c.idealFeeSat) closeSigned, err := c.proposeCloseSigned(c.idealFeeSat)
if err != nil { if err != nil {
return nil, false, err return nil, false, err
} }
return []lnwire.Message{closeSigned}, false, nil return []lnwire.Message{closeSigned}, false, nil
}
return nil, false, nil
// If we're receiving a message while we're in the fee negotiation // If we're receiving a message while we're in the fee negotiation
// phase, then this indicates the remote party is responding a closed // phase, then this indicates the remote party is responding a closed