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

Add singleton actor AsyncPaymentTriggerer to monitor when the receiver of an async payment reconnects #2491

Merged
merged 9 commits into from
Jan 2, 2023
+404 −62
Merged

Add singleton actor AsyncPaymentTriggerer to monitor when the receiver of an async payment reconnects #2491

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
c5a77f6
Add singleton to trigger forward of async payments when receiver reco…
remyers Nov 11, 2022
13a09f2
Refactor
t-bast Nov 22, 2022
856e220
Change PeerReadyNotifier supervision strategy to `stop`
t-bast Nov 22, 2022
ff18504
Fixed nits from t-bast
remyers Dec 5, 2022
c72c6be
Add a test for if notifier stops unexpectedly
remyers Dec 5, 2022
df11a7b
Make AsyncPaymentTriggerer the entry point for cancels
remyers Dec 29, 2022
0c7b049
Add API for canceling an async payment waiting to be relayed
remyers Dec 29, 2022
4e5511d
Revert "Add API for canceling an async payment waiting to be relayed"
remyers Dec 29, 2022
9619b6e
Respond to review comments from t-bast
remyers Dec 30, 2022
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
Prev Previous commit
Next Next commit
Fixed nits from t-bast
@remyers
remyers committed Dec 22, 2022
commit ff18504f350b0a8fbffd50feef15228caa87a77d
3 changes: 2 additions & 1 deletion eclair-core/src/main/scala/fr/acinq/eclair/payment/relay/AsyncPaymentTriggerer.scala
View file
Original file line number Diff line number Diff line change
@@ -117,8 +117,9 @@ private class AsyncPaymentTriggerer(switchboard: ActorRef[Switchboard.GetPeerInf
case NotifierStopped(remoteNodeId) =>
peers.get(remoteNodeId) match {
case None => Behaviors.same
case Some(peer) => peer.timeout()
case Some(peer) =>
context.log.error(s"PeerReadyNotifier stopped unexpectedly while watching node $remoteNodeId.")
peer.timeout()
watching(peers - remoteNodeId)
}
}
2 changes: 1 addition & 1 deletion eclair-core/src/main/scala/fr/acinq/eclair/payment/relay/NodeRelay.scala
View file
Original file line number Diff line number Diff line change
@@ -101,7 +101,7 @@ object NodeRelay {
context.messageAdapter[MultiPartPaymentFSM.MultiPartPaymentFailed](WrappedMultiPartPaymentFailed)
context.messageAdapter[MultiPartPaymentFSM.MultiPartPaymentSucceeded](WrappedMultiPartPaymentSucceeded)
}.toClassic
val incomingPaymentHandler: ActorRef = context.actorOf(MultiPartPaymentFSM.props(nodeParams, paymentHash, totalAmountIn, mppFsmAdapters))
val incomingPaymentHandler = context.actorOf(MultiPartPaymentFSM.props(nodeParams, paymentHash, totalAmountIn, mppFsmAdapters))
new NodeRelay(nodeParams, parent, register, relayId, paymentHash, nodeRelayPacket.outerPayload.paymentSecret, context, outgoingPaymentFactory, triggerer)
.receiving(Queue.empty, nodeRelayPacket.innerPayload, nodeRelayPacket.nextPacket, incomingPaymentHandler)
}