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

lnwallet: return error from toChannelDelta() if htlc output is not found

Browse Source
This commit is contained in:
Christopher Jämthagen 2017-01-20 13:20:02 +01:00 committed by Olaoluwa Osuntokun
parent 9083007ece
commit 05a90df67a
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lnwallet/channel.go
View File

@ -260,8 +260,9 @@ func (c *commitment) toChannelDelta(ourCommit bool) (*channeldb.ChannelDelta, er
// purposes, we create a small helper function to locate the output
// index of a particular HTLC within the current commitment
// transaction.
locateOutputIndex := func(p *PaymentDescriptor) uint16 {
locateOutputIndex := func(p *PaymentDescriptor) (uint16, error) {
var idx uint16
var found bool
pkScript := p.theirPrevPkScript
if ourCommit {
@ -272,13 +273,17 @@ func (c *commitment) toChannelDelta(ourCommit bool) (*channeldb.ChannelDelta, er
if contains(dups[p.RHash], uint16(i)) {
continue
}
found = true
idx = uint16(i)
dups[p.RHash] = append(dups[p.RHash], idx)
break
}
}
return idx
if !found {
return 0, fmt.Errorf("could not find a matching output for the HTLC " +
"in the commitment transaction")
}
return idx, nil
}
for _, htlc := range c.outgoingHTLCs {
@ -288,7 +293,7 @@ func (c *commitment) toChannelDelta(ourCommit bool) (*channeldb.ChannelDelta, er
RHash: htlc.RHash,
RefundTimeout: htlc.Timeout,
RevocationDelay: 0,
OutputIndex: locateOutputIndex(htlc),
OutputIndex: index,
}
delta.Htlcs = append(delta.Htlcs, h)
}
@ -299,7 +304,7 @@ func (c *commitment) toChannelDelta(ourCommit bool) (*channeldb.ChannelDelta, er
RHash: htlc.RHash,
RefundTimeout: htlc.Timeout,
RevocationDelay: 0,
OutputIndex: locateOutputIndex(htlc),
OutputIndex: index,
}
delta.Htlcs = append(delta.Htlcs, h)
}