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

Merge pull request #1936 from cfromknecht/cnct-sane-txn-reliable-pub

Browse Source 
conctractcourt: check sweep sanity + reliable publication
This commit is contained in:
Olaoluwa Osuntokun 2018-10-24 17:08:38 -07:00 committed by GitHub
commit 15508df96d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 38 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
contractcourt/contract_resolvers.go
View File

@ -171,6 +171,7 @@ func (h *htlcTimeoutResolver) Resolve() (ContractResolver, error) {
if err := h.Checkpoint(h); err != nil { if err := h.Checkpoint(h); err != nil {
log.Errorf("unable to Checkpoint: %v", err) log.Errorf("unable to Checkpoint: %v", err)
return nil, err
} }
} }
@ -481,23 +482,24 @@ func (h *htlcSuccessResolver) Resolve() (ContractResolver, error) {
log.Infof("%T(%x): crafted sweep tx=%v", h, log.Infof("%T(%x): crafted sweep tx=%v", h,
h.payHash[:], spew.Sdump(h.sweepTx)) h.payHash[:], spew.Sdump(h.sweepTx))
// With the sweep transaction confirmed, we'll now // With the sweep transaction signed, we'll now
// Checkpoint our state. // Checkpoint our state.
if err := h.Checkpoint(h); err != nil { if err := h.Checkpoint(h); err != nil {
log.Errorf("unable to Checkpoint: %v", err) log.Errorf("unable to Checkpoint: %v", err)
}
// Finally, we'll broadcast the sweep transaction to
// the network.
//
// TODO(roasbeef): validate first?
if err := h.PublishTx(h.sweepTx); err != nil {
log.Infof("%T(%x): unable to publish tx: %v",
h, h.payHash[:], err)
return nil, err return nil, err
} }
} }
// Regardless of whether an existing transaction was found or newly
// constructed, we'll broadcast the sweep transaction to the
// network.
err := h.PublishTx(h.sweepTx)
if err != nil && err != lnwallet.ErrDoubleSpend {
log.Infof("%T(%x): unable to publish tx: %v",
h, h.payHash[:], err)
return nil, err
}
// With the sweep transaction broadcast, we'll wait for its // With the sweep transaction broadcast, we'll wait for its
// confirmation. // confirmation.
sweepTXID := h.sweepTx.TxHash() sweepTXID := h.sweepTx.TxHash()
@ -535,7 +537,8 @@ func (h *htlcSuccessResolver) Resolve() (ContractResolver, error) {
// the claiming process. // the claiming process.
// //
// TODO(roasbeef): after changing sighashes send to tx bundler // TODO(roasbeef): after changing sighashes send to tx bundler
if err := h.PublishTx(h.htlcResolution.SignedSuccessTx); err != nil { err := h.PublishTx(h.htlcResolution.SignedSuccessTx)
if err != nil && err != lnwallet.ErrDoubleSpend {
return nil, err return nil, err
} }
@ -558,6 +561,7 @@ func (h *htlcSuccessResolver) Resolve() (ContractResolver, error) {
if err := h.Checkpoint(h); err != nil { if err := h.Checkpoint(h); err != nil {
log.Errorf("unable to Checkpoint: %v", err) log.Errorf("unable to Checkpoint: %v", err)
return nil, err
} }
} }
@ -1258,18 +1262,33 @@ func (c *commitSweepResolver) Resolve() (ContractResolver, error) {
log.Infof("%T(%v): sweeping commit output with tx=%v", c, log.Infof("%T(%v): sweeping commit output with tx=%v", c,
c.chanPoint, spew.Sdump(c.sweepTx)) c.chanPoint, spew.Sdump(c.sweepTx))
// Finally, we'll broadcast the sweep transaction to the // With the sweep transaction constructed, we'll now Checkpoint
// network. // our state.
if err := c.PublishTx(c.sweepTx); err != nil { if err := c.Checkpoint(c); err != nil {
log.Errorf("unable to Checkpoint: %v", err)
return nil, err
}
// With the sweep transaction checkpointed, we'll now publish
// the transaction. Upon restart, the resolver will immediately
// take the case below since the sweep tx is checkpointed.
err := c.PublishTx(c.sweepTx)
if err != nil && err != lnwallet.ErrDoubleSpend {
log.Errorf("%T(%v): unable to publish sweep tx: %v", log.Errorf("%T(%v): unable to publish sweep tx: %v",
c, c.chanPoint, err) c, c.chanPoint, err)
return nil, err return nil, err
} }
// With the sweep transaction confirmed, we'll now Checkpoint // If the sweep transaction has been generated, and the remote party
// our state. // broadcast the commit transaction, we'll republish it for reliability
if err := c.Checkpoint(c); err != nil { // to ensure it confirms. The resolver will enter this case after
log.Errorf("unable to Checkpoint: %v", err) // checkpointing in the case above, ensuring we reliably on restarts.
case c.sweepTx != nil && !isLocalCommitTx:
err := c.PublishTx(c.sweepTx)
if err != nil && err != lnwallet.ErrDoubleSpend {
log.Errorf("%T(%v): unable to publish sweep tx: %v",
c, c.chanPoint, err)
return nil, err
} }
// Otherwise, this is our commitment transaction, So we'll obtain the // Otherwise, this is our commitment transaction, So we'll obtain the
@ -1307,6 +1326,7 @@ func (c *commitSweepResolver) Resolve() (ContractResolver, error) {
if err := c.Checkpoint(c); err != nil { if err := c.Checkpoint(c); err != nil {
log.Errorf("unable to Checkpoint: %v", err) log.Errorf("unable to Checkpoint: %v", err)
return nil, err
} }
case <-c.Quit: case <-c.Quit:
return nil, fmt.Errorf("quitting") return nil, fmt.Errorf("quitting")