Merge pull request #920 from halseth/dustlimit-remote-fix
HTLC number mismatch fixes
This commit is contained in:
Olaoluwa Osuntokun
GitHub
commit
daf542cf89
@ -2540,7 +2540,7 @@ func genRemoteHtlcSigJobs(keyRing *CommitmentKeyRing,
|
||||
remoteCommitView *commitment) ([]signJob, chan struct{}, error) {
|
||||
|
||||
txHash := remoteCommitView.txn.TxHash()
|
||||
dustLimit := localChanCfg.DustLimit
|
||||
dustLimit := remoteChanCfg.DustLimit
|
||||
feePerKw := remoteCommitView.feePerKw
|
||||
|
||||
// With the keys generated, we'll make a slice with enough capacity to
|
||||
@ -3465,12 +3465,6 @@ func genHtlcSigValidationJobs(localCommitmentView *commitment,
|
||||
keyRing *CommitmentKeyRing, htlcSigs []lnwire.Sig,
|
||||
localChanCfg, remoteChanCfg *channeldb.ChannelConfig) ([]verifyJob, error) {
|
||||
|
||||
// If this new commitment state doesn't have any HTLC's that are to be
|
||||
// signed, then we'll return a nil slice.
|
||||
if len(htlcSigs) == 0 {
|
||||
return nil, nil
|
||||
}
|
||||
|
||||
txHash := localCommitmentView.txn.TxHash()
|
||||
feePerKw := localCommitmentView.feePerKw
|
||||
|
||||
@ -3532,6 +3526,12 @@ func genHtlcSigValidationJobs(localCommitmentView *commitment,
|
||||
return sigHash, nil
|
||||
}
|
||||
|
||||
// Make sure there are more signatures left.
|
||||
if i >= len(htlcSigs) {
|
||||
return nil, fmt.Errorf("not enough HTLC " +
|
||||
"signatures.")
|
||||
}
|
||||
|
||||
// With the sighash generated, we'll also store the
|
||||
// signature so it can be written to disk if this state
|
||||
// is valid.
|
||||
@ -3578,6 +3578,12 @@ func genHtlcSigValidationJobs(localCommitmentView *commitment,
|
||||
return sigHash, nil
|
||||
}
|
||||
|
||||
// Make sure there are more signatures left.
|
||||
if i >= len(htlcSigs) {
|
||||
return nil, fmt.Errorf("not enough HTLC " +
|
||||
"signatures.")
|
||||
}
|
||||
|
||||
// With the sighash generated, we'll also store the
|
||||
// signature so it can be written to disk if this state
|
||||
// is valid.
|
||||
@ -3600,6 +3606,13 @@ func genHtlcSigValidationJobs(localCommitmentView *commitment,
|
||||
i++
|
||||
}
|
||||
|
||||
// If we received a number of HTLC signatures that doesn't match our
|
||||
// commitment, we'll return an error now.
|
||||
if len(htlcSigs) != i {
|
||||
return nil, fmt.Errorf("number of htlc sig mismatch. "+
|
||||
"Expected %v sigs, got %v", i, len(htlcSigs))
|
||||
}
|
||||
|
||||
return verifyJobs, nil
|
||||
}
|
||||
|
||||
|
||||
@ -1461,6 +1461,177 @@ func TestHTLCDustLimit(t *testing.T) {
|
||||
}
|
||||
}
|
||||
|
||||
// TestHTLCSigNumber tests that a received commitment is only accepted if it
|
||||
// comes with the exact number of valid HTLC signatures.
|
||||
func TestHTLCSigNumber(t *testing.T) {
|
||||
t.Parallel()
|
||||
|
||||
// createChanWithHTLC is a helper method that sets ut two channels, and
|
||||
// adds HTLCs with the passed values to the channels.
|
||||
createChanWithHTLC := func(htlcValues ...btcutil.Amount) (
|
||||
*LightningChannel, *LightningChannel, func()) {
|
||||
|
||||
// Create a test channel funded evenly with Alice having 5 BTC,
|
||||
// and Bob having 5 BTC. Alice's dustlimit is 200 sat, while
|
||||
// Bob has 1300 sat.
|
||||
aliceChannel, bobChannel, cleanUp, err := createTestChannels(3)
|
||||
if err != nil {
|
||||
t.Fatalf("unable to create test channels: %v", err)
|
||||
}
|
||||
|
||||
for i, htlcSat := range htlcValues {
|
||||
htlcMsat := lnwire.NewMSatFromSatoshis(htlcSat)
|
||||
htlc, _ := createHTLC(i, htlcMsat)
|
||||
_, err := aliceChannel.AddHTLC(htlc, nil)
|
||||
if err != nil {
|
||||
t.Fatalf("alice unable to add htlc: %v", err)
|
||||
}
|
||||
_, err = bobChannel.ReceiveHTLC(htlc)
|
||||
if err != nil {
|
||||
t.Fatalf("bob unable to receive htlc: %v", err)
|
||||
}
|
||||
}
|
||||
|
||||
return aliceChannel, bobChannel, cleanUp
|
||||
}
|
||||
|
||||
// Calculate two values that will be below and above Bob's dust limit.
|
||||
estimator := &StaticFeeEstimator{24}
|
||||
feePerVSize, err := estimator.EstimateFeePerVSize(1)
|
||||
if err != nil {
|
||||
t.Fatalf("unable to get fee: %v", err)
|
||||
}
|
||||
feePerKw := feePerVSize.FeePerKWeight()
|
||||
|
||||
belowDust := btcutil.Amount(500) + htlcTimeoutFee(feePerKw)
|
||||
aboveDust := btcutil.Amount(1400) + htlcSuccessFee(feePerKw)
|
||||
|
||||
// ===================================================================
|
||||
// Test that Bob will reject a commitment if Alice doesn't send enough
|
||||
// HTLC signatures.
|
||||
// ===================================================================
|
||||
aliceChannel, bobChannel, cleanUp := createChanWithHTLC(aboveDust,
|
||||
aboveDust)
|
||||
defer cleanUp()
|
||||
|
||||
aliceSig, aliceHtlcSigs, err := aliceChannel.SignNextCommitment()
|
||||
if err != nil {
|
||||
t.Fatalf("Error signing next commitment: %v", err)
|
||||
}
|
||||
|
||||
if len(aliceHtlcSigs) != 2 {
|
||||
t.Fatalf("expected 2 htlc sig, instead got %v",
|
||||
len(aliceHtlcSigs))
|
||||
}
|
||||
|
||||
// Now discard one signature from the htlcSig slice. Bob should reject
|
||||
// the commitment because of this.
|
||||
err = bobChannel.ReceiveNewCommitment(aliceSig, aliceHtlcSigs[1:])
|
||||
if err == nil {
|
||||
t.Fatalf("Expected Bob to reject signatures")
|
||||
}
|
||||
|
||||
// ===================================================================
|
||||
// Test that Bob will reject a commitment if Alice doesn't send any
|
||||
// HTLC signatures.
|
||||
// ===================================================================
|
||||
aliceChannel, bobChannel, cleanUp = createChanWithHTLC(aboveDust)
|
||||
defer cleanUp()
|
||||
|
||||
aliceSig, aliceHtlcSigs, err = aliceChannel.SignNextCommitment()
|
||||
if err != nil {
|
||||
t.Fatalf("Error signing next commitment: %v", err)
|
||||
}
|
||||
|
||||
if len(aliceHtlcSigs) != 1 {
|
||||
t.Fatalf("expected 1 htlc sig, instead got %v",
|
||||
len(aliceHtlcSigs))
|
||||
}
|
||||
|
||||
// Now just give Bob an empty htlcSig slice. He should reject the
|
||||
// commitment because of this.
|
||||
err = bobChannel.ReceiveNewCommitment(aliceSig, []lnwire.Sig{})
|
||||
if err == nil {
|
||||
t.Fatalf("Expected Bob to reject signatures")
|
||||
}
|
||||
|
||||
// ==============================================================
|
||||
// Test that sigs are not returned for HTLCs below dust limit.
|
||||
// ==============================================================
|
||||
aliceChannel, bobChannel, cleanUp = createChanWithHTLC(belowDust)
|
||||
defer cleanUp()
|
||||
|
||||
aliceSig, aliceHtlcSigs, err = aliceChannel.SignNextCommitment()
|
||||
if err != nil {
|
||||
t.Fatalf("Error signing next commitment: %v", err)
|
||||
}
|
||||
|
||||
// Since the HTLC is below Bob's dust limit, Alice won't need to send
|
||||
// any signatures for this HTLC.
|
||||
if len(aliceHtlcSigs) != 0 {
|
||||
t.Fatalf("expected no htlc sigs, instead got %v",
|
||||
len(aliceHtlcSigs))
|
||||
}
|
||||
|
||||
err = bobChannel.ReceiveNewCommitment(aliceSig, aliceHtlcSigs)
|
||||
if err != nil {
|
||||
t.Fatalf("Bob failed receiving commitment: %v", err)
|
||||
}
|
||||
|
||||
// ================================================================
|
||||
// Test that sigs are correctly returned for HTLCs above dust limit.
|
||||
// ================================================================
|
||||
aliceChannel, bobChannel, cleanUp = createChanWithHTLC(aboveDust)
|
||||
defer cleanUp()
|
||||
|
||||
aliceSig, aliceHtlcSigs, err = aliceChannel.SignNextCommitment()
|
||||
if err != nil {
|
||||
t.Fatalf("Error signing next commitment: %v", err)
|
||||
}
|
||||
|
||||
// Since the HTLC is above Bob's dust limit, Alice should send a
|
||||
// signature for this HTLC.
|
||||
if len(aliceHtlcSigs) != 1 {
|
||||
t.Fatalf("expected 1 htlc sig, instead got %v",
|
||||
len(aliceHtlcSigs))
|
||||
}
|
||||
|
||||
err = bobChannel.ReceiveNewCommitment(aliceSig, aliceHtlcSigs)
|
||||
if err != nil {
|
||||
t.Fatalf("Bob failed receiving commitment: %v", err)
|
||||
}
|
||||
|
||||
// ====================================================================
|
||||
// Test that Bob will not validate a received commitment if Alice sends
|
||||
// signatures for HTLCs below the dust limit.
|
||||
// ====================================================================
|
||||
aliceChannel, bobChannel, cleanUp = createChanWithHTLC(belowDust,
|
||||
aboveDust)
|
||||
defer cleanUp()
|
||||
|
||||
// Alice should produce only one signature, since one HTLC is below
|
||||
// dust.
|
||||
aliceSig, aliceHtlcSigs, err = aliceChannel.SignNextCommitment()
|
||||
if err != nil {
|
||||
t.Fatalf("Error signing next commitment: %v", err)
|
||||
}
|
||||
|
||||
if len(aliceHtlcSigs) != 1 {
|
||||
t.Fatalf("expected 1 htlc sig, instead got %v",
|
||||
len(aliceHtlcSigs))
|
||||
}
|
||||
|
||||
// Add an extra signature.
|
||||
aliceHtlcSigs = append(aliceHtlcSigs, aliceHtlcSigs[0])
|
||||
|
||||
// Bob should reject these signatures since they don't match the number
|
||||
// of HTLCs above dust.
|
||||
err = bobChannel.ReceiveNewCommitment(aliceSig, aliceHtlcSigs)
|
||||
if err == nil {
|
||||
t.Fatalf("Expected Bob to reject signatures")
|
||||
}
|
||||
}
|
||||
|
||||
// TestChannelBalanceDustLimit tests the condition when the remaining balance
|
||||
// for one of the channel participants is so small as to be considered dust. In
|
||||
// this case, the output for that participant is removed and all funds (minus
|
||||
|
||||
Loading…
Reference in New Issue
Block a user