Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix HTLC fulfill race condition in integration spec #1666

Merged
merged 2 commits into from
Jan 19, 2021
Merged

Fix HTLC fulfill race condition in integration spec #1666

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7357756
Fix HTLC fulfill race condition in integration spec
t-bast Jan 7, 2021
079920b
Add closing test for unsigned fulfill
t-bast Jan 7, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 24 additions & 2 deletions eclair-core/src/test/scala/fr/acinq/eclair/channel/states/h/ClosingStateSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -503,7 +503,7 @@ class ClosingStateSpec extends TestKitBaseClass with FixtureAnyFunSuiteLike with
// actual test starts here
channelUpdateListener.expectMsgType[LocalChannelDown]
assert(closingState.htlcSuccessTxs.isEmpty && closingState.htlcTimeoutTxs.isEmpty && closingState.claimHtlcDelayedTxs.isEmpty)
// when the commit tx is signed, alice knows that the htlc she sent right before the unilateral close will never reach the chain
// when the commit tx is confirmed, alice knows that the htlc she sent right before the unilateral close will never reach the chain
alice ! WatchEventConfirmed(BITCOIN_TX_CONFIRMED(aliceCommitTx), 0, 0, aliceCommitTx)
// so she fails it
val origin = alice.stateData.asInstanceOf[DATA_CLOSING].commitments.originChannels(htlc.id)
Expand All @@ -513,9 +513,31 @@ class ClosingStateSpec extends TestKitBaseClass with FixtureAnyFunSuiteLike with
relayerA.expectNoMsg(100 millis)
}

test("recv BITCOIN_TX_CONFIRMED (local commit with fulfill only signed by local)") { f =>
import f._
// bob sends an htlc
val (r, htlc) = addHtlc(110000000 msat, bob, alice, bob2alice, alice2bob)
crossSign(bob, alice, bob2alice, alice2bob)
relayerA.expectMsgType[RelayForward]
val aliceCommitTx = alice.stateData.asInstanceOf[DATA_NORMAL].commitments.localCommit.publishableTxs.commitTx.tx
assert(aliceCommitTx.txOut.size === 3) // 2 main outputs + 1 htlc

// alice fulfills the HTLC but bob doesn't receive the signature
alice ! CMD_FULFILL_HTLC(htlc.id, r, commit = true)
alice2bob.expectMsgType[UpdateFulfillHtlc]
alice2bob.forward(bob)
alice2bob.expectMsgType[CommitSig]
// note that bob doesn't receive the new sig!
// then we make alice unilaterally close the channel
val closingState = localClose(alice, alice2blockchain)
assert(closingState.commitTx === aliceCommitTx)
assert(closingState.htlcTimeoutTxs.isEmpty)
assert(closingState.htlcSuccessTxs.size === 1)
assert(closingState.claimHtlcDelayedTxs.size === 1)
}

test("recv BITCOIN_TX_CONFIRMED (remote commit with htlcs only signed by local in next remote commit)") { f =>
import f._
val sender = TestProbe()
val listener = TestProbe()
system.eventStream.subscribe(listener.ref, classOf[PaymentSettlingOnChain])
val bobCommitTx = bob.stateData.asInstanceOf[DATA_NORMAL].commitments.localCommit.publishableTxs.commitTx.tx
Expand Down
7 changes: 7 additions & 0 deletions eclair-core/src/test/scala/fr/acinq/eclair/integration/ChannelIntegrationSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -655,6 +655,13 @@ class AnchorOutputChannelIntegrationSpec extends ChannelIntegrationSpec {
val ps = sender.expectMsgType[PaymentSent](60 seconds)
assert(ps.id == paymentId)

// we make sure the htlc has been removed from F's commitment before we force-close
awaitCond({
sender.send(nodes("F").register, Register.Forward(sender.ref, channelId, CMD_GETSTATEDATA(ActorRef.noSender)))
val stateDataF = sender.expectMsgType[RES_GETSTATEDATA[DATA_NORMAL]].data
stateDataF.commitments.localCommit.spec.htlcs.isEmpty
}, max = 20 seconds, interval = 1 second)

sender.send(nodes("F").register, Register.Forward(sender.ref, channelId, CMD_GETSTATEDATA(ActorRef.noSender)))
val stateDataF = sender.expectMsgType[RES_GETSTATEDATA[DATA_NORMAL]].data
val commitmentIndex = stateDataF.commitments.localCommit.index
Expand Down