aljaz/lnd-manageJ
1
0
Fork 0
mirror of https://github.com/aljazceru/lnd-manageJ.git synced 2026-01-27 09:54:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix fee computation

Browse Source 
- compute fees per hop
- fees for first hop are not paid
- show fees for first hop
This commit is contained in:
Carsten Otto
2022-04-22 23:07:29 +02:00
parent 3ee45fdd38
commit e5949c9d5f
15 changed files with 350 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
web/src/main/java/de/cotto/lndmanagej/controller/dto/MultiPathPaymentDto.java
View File

@@ -4,14 +4,14 @@ import de.cotto.lndmanagej.pickhardtpayments.model.MultiPathPayment;
import de.cotto.lndmanagej.pickhardtpayments.model.Route;
import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;
public record MultiPathPaymentDto(
String amountSat,
double probability,
String feesMilliSat,
String feesWithFirstHopMilliSat,
long feeRate,
long feeRateWithFirstHop,
List<RouteDto> routes
) {
public static MultiPathPaymentDto fromModel(MultiPathPayment multiPathPayment) {
@@ -19,12 +19,14 @@ public record MultiPathPaymentDto(
String.valueOf(multiPathPayment.amount().satoshis()),
multiPathPayment.probability(),
String.valueOf(multiPathPayment.fees().milliSatoshis()),
String.valueOf(multiPathPayment.feesWithFirstHop().milliSatoshis()),
multiPathPayment.getFeeRate(),
multiPathPayment.getFeeRateWithFirstHop(),
getRoutes(multiPathPayment.routes())
);
}
private static List<RouteDto> getRoutes(Set<Route> routes) {
return routes.stream().map(RouteDto::fromModel).collect(Collectors.toList());
private static List<RouteDto> getRoutes(List<Route> routes) {
return routes.stream().map(RouteDto::fromModel).toList();
}
}

8
web/src/main/java/de/cotto/lndmanagej/controller/dto/RouteDto.java
View File

@@ -11,7 +11,9 @@ public record RouteDto(
List<ChannelId> channelIds,
double probability,
String feesMilliSat,
long feeRate
String feesWithFirstHopMilliSat,
long feeRate,
long feeRateWithFirstHop
) {
public static RouteDto fromModel(Route route) {
return new RouteDto(
@@ -19,7 +21,9 @@ public record RouteDto(
route.edges().stream().map(Edge::channelId).toList(),
route.getProbability(),
String.valueOf(route.fees().milliSatoshis()),
route.getFeeRate()
String.valueOf(route.feesWithFirstHop().milliSatoshis()),
route.getFeeRate(),
route.getFeeRateWithFirstHop()
);
}