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

Jump to bottom

Share code #717

Merged
merged 1 commit into from
Oct 17, 2024
Merged

Share code #717

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
78 changes: 34 additions & 44 deletions src/commonMain/kotlin/fr/acinq/lightning/payment/OutgoingPaymentHandler.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import fr.acinq.lightning.wire.UnknownNextPeer

class OutgoingPaymentHandler(val nodeParams: NodeParams, val walletParams: WalletParams, val db: OutgoingPaymentsDb) {

interface SendPaymentResult
interface SendPaymentResult: ProcessFailureResult
interface ProcessFailureResult
interface ProcessFulfillResult

Expand Down Expand Up @@ -71,6 +71,37 @@ class OutgoingPaymentHandler(val nodeParams: NodeParams, val walletParams: Walle

private fun getPaymentAttempt(childId: UUID): PaymentAttempt? = childToPaymentId[childId]?.let { pending[it] }

private suspend fun sendPaymentInternal(request: PayInvoice, failures: List<Either<ChannelException, FailureMessage>>, channels: Map<ByteVector32, ChannelState>, currentBlockHeight: Int): SendPaymentResult {
val logger = MDCLogger(logger, staticMdc = request.mdc())
val attemptNumber = failures.size
val trampolineFees = (request.trampolineFeesOverride ?: walletParams.trampolineFees)[attemptNumber]
logger.info { "trying payment with fee_base=${trampolineFees.feeBase}, fee_proportional=${trampolineFees.feeProportional}" }
val trampolineAmount = request.amount + trampolineFees.calculateFees(request.amount)
return when (val result = selectChannel(trampolineAmount, channels)) {
is Either.Left -> {
logger.warning { "payment failed: ${result.value}" }
if (attemptNumber == 0) {
db.addOutgoingPayment(LightningOutgoingPayment(request.paymentId, request.amount, request.recipient, request.paymentDetails))
}
db.completeOutgoingPaymentOffchain(request.paymentId, result.value)
removeFromState(request.paymentId)
Failure(request, OutgoingPaymentFailure(result.value, failures))
}
is Either.Right -> {
val hop = NodeHop(walletParams.trampolineNode.id, request.recipient, trampolineFees.cltvExpiryDelta, trampolineFees.calculateFees(request.amount))
val (childPayment, sharedSecrets, cmd) = createOutgoingPayment(request, result.value, hop, currentBlockHeight)
if (attemptNumber == 0) {
db.addOutgoingPayment(LightningOutgoingPayment(request.paymentId, request.amount, request.recipient, request.paymentDetails, listOf(childPayment), LightningOutgoingPayment.Status.Pending))
} else {
db.addOutgoingLightningParts(request.paymentId, listOf(childPayment))
}
val payment = PaymentAttempt(request, attemptNumber, childPayment, sharedSecrets, failures)
pending[payment.request.paymentId] = payment
Progress(payment.request, payment.fees, listOf(cmd))
}
}
}

suspend fun sendPayment(request: PayInvoice, channels: Map<ByteVector32, ChannelState>, currentBlockHeight: Int): SendPaymentResult {
val logger = MDCLogger(logger, staticMdc = request.mdc())
logger.info { "sending ${request.amount} to ${request.recipient}" }
Expand All @@ -90,24 +121,7 @@ class OutgoingPaymentHandler(val nodeParams: NodeParams, val walletParams: Walle
logger.error { "invoice has already been paid" }
return Failure(request, FinalFailure.AlreadyPaid.toPaymentFailure())
}
val trampolineFees = (request.trampolineFeesOverride ?: walletParams.trampolineFees).first()
val trampolineAmount = request.amount + trampolineFees.calculateFees(request.amount)
return when (val result = selectChannel(trampolineAmount, channels)) {
is Either.Left -> {
logger.warning { "payment failed: ${result.value}" }
db.addOutgoingPayment(LightningOutgoingPayment(request.paymentId, request.amount, request.recipient, request.paymentDetails))
db.completeOutgoingPaymentOffchain(request.paymentId, result.value)
Failure(request, result.value.toPaymentFailure())
}
is Either.Right -> {
val hop = NodeHop(walletParams.trampolineNode.id, request.recipient, trampolineFees.cltvExpiryDelta, trampolineFees.calculateFees(request.amount))
val (childPayment, sharedSecrets, cmd) = createOutgoingPayment(request, result.value, hop, currentBlockHeight)
val payment = PaymentAttempt(request, 0, childPayment, sharedSecrets, listOf())
db.addOutgoingPayment(LightningOutgoingPayment(request.paymentId, request.amount, request.recipient, request.paymentDetails, listOf(childPayment), LightningOutgoingPayment.Status.Pending))
pending[request.paymentId] = payment
Progress(request, payment.fees, listOf(cmd))
}
}
return sendPaymentInternal(request, listOf(), channels, currentBlockHeight)
}

/**
Expand Down Expand Up @@ -182,31 +196,7 @@ class OutgoingPaymentHandler(val nodeParams: NodeParams, val walletParams: Walle
Failure(payment.request, OutgoingPaymentFailure(finalError, payment.failures + failure))
} else {
// The trampoline node is asking us to retry the payment with more fees or a larger expiry delta.
val nextFees = trampolineFees[payment.attemptNumber + 1]
logger.info { "retrying payment with higher fees (base=${nextFees.feeBase}, proportional=${nextFees.feeProportional})..." }
val trampolineAmount = payment.request.amount + nextFees.calculateFees(payment.request.amount)
when (val result = selectChannel(trampolineAmount, channels)) {
is Either.Left -> {
logger.warning { "payment failed: ${result.value}" }
db.completeOutgoingPaymentOffchain(payment.request.paymentId, result.value)
removeFromState(payment.request.paymentId)
Failure(payment.request, OutgoingPaymentFailure(result.value, payment.failures + failure))
}
is Either.Right -> {
val hop = NodeHop(walletParams.trampolineNode.id, payment.request.recipient, nextFees.cltvExpiryDelta, nextFees.calculateFees(payment.request.amount))
val (childPayment, sharedSecrets, cmd) = createOutgoingPayment(payment.request, result.value, hop, currentBlockHeight)
db.addOutgoingLightningParts(payment.request.paymentId, listOf(childPayment))
val payment1 = PaymentAttempt(
request = payment.request,
attemptNumber = payment.attemptNumber + 1,
pending = childPayment,
sharedSecrets = sharedSecrets,
failures = payment.failures + failure
)
pending[payment1.request.paymentId] = payment1
Progress(payment1.request, payment1.fees, listOf(cmd))
}
}
sendPaymentInternal(payment.request, payment.failures + failure, channels, currentBlockHeight)
}
}

Expand Down