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

lnwallet: fix dust limit checks and toChannelDelta() handling of dust

Browse Source
This commit is contained in:
Christopher Jämthagen 2017-01-20 14:39:15 +01:00 committed by Olaoluwa Osuntokun
parent 05a90df67a
commit 2222df21f3
1 changed files with 47 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
lnwallet/channel.go
View File

@ -92,7 +92,9 @@ const (
// payments requested by the wallet/daemon. // payments requested by the wallet/daemon.
type PaymentHash [32]byte type PaymentHash [32]byte
// updateType is the exact type of an entry within the shared HTLC log. const maxUint16 uint16 = ^uint16(0)
// UpdateType is the exact type of an entry within the shared HTLC log.
type updateType uint8 type updateType uint8
const ( const (
@ -185,6 +187,11 @@ type PaymentDescriptor struct {
ourPkScript []byte ourPkScript []byte
theirPkScript []byte theirPkScript []byte
theirPrevPkScript []byte theirPrevPkScript []byte
// isDust[Local|Remote] denotes if this HTLC is below the dust limit in
// locally or remotely.
isDustLocal bool
isDustRemote bool
} }
// commitment represents a commitment to a new state within an active channel. // commitment represents a commitment to a new state within an active channel.
@ -286,7 +293,16 @@ func (c *commitment) toChannelDelta(ourCommit bool) (*channeldb.ChannelDelta, er
return idx, nil return idx, nil
} }
var index uint16
var err error
for _, htlc := range c.outgoingHTLCs { for _, htlc := range c.outgoingHTLCs {
if (ourCommit && htlc.isDustLocal) ||
(!ourCommit && htlc.isDustRemote) {
index = maxUint16
} else if index, err = locateOutputIndex(htlc); err != nil {
return nil, err
}
h := &channeldb.HTLC{ h := &channeldb.HTLC{
Incoming: false, Incoming: false,
Amt: htlc.Amount, Amt: htlc.Amount,
@ -298,6 +314,13 @@ func (c *commitment) toChannelDelta(ourCommit bool) (*channeldb.ChannelDelta, er
delta.Htlcs = append(delta.Htlcs, h) delta.Htlcs = append(delta.Htlcs, h)
} }
for _, htlc := range c.incomingHTLCs { for _, htlc := range c.incomingHTLCs {
if (ourCommit && htlc.isDustLocal) ||
(!ourCommit && htlc.isDustRemote) {
index = maxUint16
} else if index, err = locateOutputIndex(htlc); err != nil {
return nil, err
}
h := &channeldb.HTLC{ h := &channeldb.HTLC{
Incoming: true, Incoming: true,
Amt: htlc.Amount, Amt: htlc.Amount,
@ -1014,6 +1037,8 @@ func (lc *LightningChannel) restoreStateLogs() error {
EntryType: Add, EntryType: Add,
addCommitHeightRemote: pastHeight, addCommitHeightRemote: pastHeight,
addCommitHeightLocal: pastHeight, addCommitHeightLocal: pastHeight,
isDustLocal: htlc.Amt < lc.channelState.OurDustLimit,
isDustRemote: htlc.Amt < lc.channelState.TheirDustLimit,
} }
if !htlc.Incoming { if !htlc.Incoming {
@ -1144,8 +1169,12 @@ func (lc *LightningChannel) fetchCommitmentView(remoteChain bool,
if err != nil { if err != nil {
return nil, err return nil, err
} }
//var isDust bool
//if ourCommitTx {
//isDust =
for _, htlc := range filteredHTLCView.ourUpdates { for _, htlc := range filteredHTLCView.ourUpdates {
if htlc.Amount < dustLimit { if (ourCommitTx && htlc.isDustLocal) ||
(!ourCommitTx && htlc.isDustRemote) {
continue continue
} }
@ -1156,7 +1185,8 @@ func (lc *LightningChannel) fetchCommitmentView(remoteChain bool,
} }
} }
for _, htlc := range filteredHTLCView.theirUpdates { for _, htlc := range filteredHTLCView.theirUpdates {
if htlc.Amount < dustLimit { if (ourCommitTx && htlc.isDustLocal) ||
(!ourCommitTx && htlc.isDustRemote) {
continue continue
} }
@ -1879,6 +1909,8 @@ func (lc *LightningChannel) AddHTLC(htlc *lnwire.UpdateAddHTLC) (uint64, error)
Timeout: htlc.Expiry, Timeout: htlc.Expiry,
Amount: htlc.Amount, Amount: htlc.Amount,
Index: lc.localUpdateLog.logIndex, Index: lc.localUpdateLog.logIndex,
isDustLocal: htlc.Amount < lc.channelState.OurDustLimit,
isDustRemote: htlc.Amount < lc.channelState.TheirDustLimit,
} }
lc.localUpdateLog.appendUpdate(pd) lc.localUpdateLog.appendUpdate(pd)
@ -1904,6 +1936,8 @@ func (lc *LightningChannel) ReceiveHTLC(htlc *lnwire.UpdateAddHTLC) (uint64, err
Timeout: htlc.Expiry, Timeout: htlc.Expiry,
Amount: htlc.Amount, Amount: htlc.Amount,
Index: lc.remoteUpdateLog.logIndex, Index: lc.remoteUpdateLog.logIndex,
isDustLocal: htlc.Amount < lc.channelState.OurDustLimit,
isDustRemote: htlc.Amount < lc.channelState.TheirDustLimit,
} }
lc.remoteUpdateLog.appendUpdate(pd) lc.remoteUpdateLog.appendUpdate(pd)