aljaz/lnd-manageJ
1
0
Fork 0
mirror of https://github.com/aljazceru/lnd-manageJ.git synced 2026-01-23 16:04:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

keep very unattractive liquidity information for unusable channels

Browse Source 
instead of forgetting everything, including the information about how "bad" the channel is
This commit is contained in:
Carsten Otto
2022-05-13 23:00:17 +02:00
parent 4f082d6f4a
commit e6b1c53c68
3 changed files with 21 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
backend/src/main/java/de/cotto/lndmanagej/service/LiquidityBoundsService.java
View File

@@ -77,7 +77,6 @@ public class LiquidityBoundsService {
public void markAsMoved(Pubkey source, Pubkey target, Coins amount) {
update(source, target, amount, LiquidityBounds::withMovedCoins);
}
public void markAsAvailable(Pubkey source, Pubkey target, Coins amount) {

2
backend/src/main/java/de/cotto/lndmanagej/service/LiquidityInformationUpdater.java
View File

@@ -60,7 +60,7 @@ public class LiquidityInformationUpdater implements PaymentListener {
case TEMPORARY_CHANNEL_FAILURE ->
markAvailableAndUnavailable(paymentAttemptHops, failureSourceIndex, PaymentAttemptHop::amount);
case UNKNOWN_NEXT_PEER, CHANNEL_DISABLED, FEE_INSUFFICIENT ->
markAvailableAndUnavailable(paymentAttemptHops, failureSourceIndex, hop -> Coins.ofSatoshis(1));
markAvailableAndUnavailable(paymentAttemptHops, failureSourceIndex, hop -> Coins.ofSatoshis(2));
case MPP_TIMEOUT, INCORRECT_OR_UNKNOWN_PAYMENT_DETAILS ->
markAllAvailable(paymentAttemptHops, failureSourceIndex);
default -> logger.warn("Unknown failure code {}", failureCode);

32
backend/src/test/java/de/cotto/lndmanagej/service/LiquidityInformationUpdaterTest.java
View File

@@ -179,12 +179,12 @@ class LiquidityInformationUpdaterTest {
@Nested
class UnknownNextPeer {
private final Coins oneSatoshi = Coins.ofSatoshis(1);
private final Coins twoSatoshis = Coins.ofSatoshis(2); // see ChannelDisabled
@Test
void from_sending_node() {
liquidityInformationUpdater.failure(hopsWithChannelIdsAndPubkeys, UNKNOWN_NEXT_PEER, 0);
verify(liquidityBoundsService).markAsUnavailable(PUBKEY, PUBKEY_2, oneSatoshi);
verify(liquidityBoundsService).markAsUnavailable(PUBKEY, PUBKEY_2, twoSatoshis);
verifyRemovesInFlightForAllHops();
verifyNoMoreInteractions(liquidityBoundsService);
}
@@ -193,7 +193,7 @@ class LiquidityInformationUpdaterTest {
void after_first_hop() {
liquidityInformationUpdater.failure(hopsWithChannelIdsAndPubkeys, UNKNOWN_NEXT_PEER, 1);
verify(liquidityBoundsService).markAsAvailable(PUBKEY, PUBKEY_2, Coins.ofSatoshis(100));
verify(liquidityBoundsService).markAsUnavailable(PUBKEY_2, PUBKEY_3, oneSatoshi);
verify(liquidityBoundsService).markAsUnavailable(PUBKEY_2, PUBKEY_3, twoSatoshis);
verifyRemovesInFlightForAllHops();
verifyNoMoreInteractions(liquidityBoundsService);
}
@@ -203,7 +203,7 @@ class LiquidityInformationUpdaterTest {
liquidityInformationUpdater.failure(hopsWithChannelIdsAndPubkeys, UNKNOWN_NEXT_PEER, 2);
verify(liquidityBoundsService).markAsAvailable(PUBKEY, PUBKEY_2, Coins.ofSatoshis(100));
verify(liquidityBoundsService).markAsAvailable(PUBKEY_2, PUBKEY_3, Coins.ofSatoshis(90));
verify(liquidityBoundsService).markAsUnavailable(PUBKEY_3, PUBKEY_4, oneSatoshi);
verify(liquidityBoundsService).markAsUnavailable(PUBKEY_3, PUBKEY_4, twoSatoshis);
verifyRemovesInFlightForAllHops();
}
@@ -221,7 +221,7 @@ class LiquidityInformationUpdaterTest {
liquidityInformationUpdater.failure(hopsWithChannelIds, UNKNOWN_NEXT_PEER, 2);
verify(liquidityBoundsService).markAsAvailable(PUBKEY, PUBKEY_2, Coins.ofSatoshis(100));
verify(liquidityBoundsService).markAsAvailable(PUBKEY_2, PUBKEY_3, Coins.ofSatoshis(90));
verify(liquidityBoundsService).markAsUnavailable(PUBKEY_3, PUBKEY_4, oneSatoshi);
verify(liquidityBoundsService).markAsUnavailable(PUBKEY_3, PUBKEY_4, twoSatoshis);
verifyRemovesInFlightForAllHops();
}
@@ -234,12 +234,18 @@ class LiquidityInformationUpdaterTest {
@Nested
class ChannelDisabled {
private final Coins oneSatoshi = Coins.ofSatoshis(1);
/*
* Set upper bound to non-zero amount (2sat unavailable => 1sat upper bound) so that the liquidity information
* for this channel is kept for a while. If we reset the upper bound to 0, this effectively resets the upper
* bound to the channel capacity - which might cause the algorithm to attempt to route through the disabled
* channel again.
*/
private final Coins twoSatoshis = Coins.ofSatoshis(2);
@Test
void from_sending_node() {
liquidityInformationUpdater.failure(hopsWithChannelIdsAndPubkeys, CHANNEL_DISABLED, 0);
verify(liquidityBoundsService).markAsUnavailable(PUBKEY, PUBKEY_2, oneSatoshi);
verify(liquidityBoundsService).markAsUnavailable(PUBKEY, PUBKEY_2, twoSatoshis);
verifyRemovesInFlightForAllHops();
verifyNoMoreInteractions(liquidityBoundsService);
}
@@ -248,7 +254,7 @@ class LiquidityInformationUpdaterTest {
void after_first_hop() {
liquidityInformationUpdater.failure(hopsWithChannelIdsAndPubkeys, CHANNEL_DISABLED, 1);
verify(liquidityBoundsService).markAsAvailable(PUBKEY, PUBKEY_2, Coins.ofSatoshis(100));
verify(liquidityBoundsService).markAsUnavailable(PUBKEY_2, PUBKEY_3, oneSatoshi);
verify(liquidityBoundsService).markAsUnavailable(PUBKEY_2, PUBKEY_3, twoSatoshis);
verifyRemovesInFlightForAllHops();
verifyNoMoreInteractions(liquidityBoundsService);
}
@@ -258,7 +264,7 @@ class LiquidityInformationUpdaterTest {
liquidityInformationUpdater.failure(hopsWithChannelIdsAndPubkeys, CHANNEL_DISABLED, 2);
verify(liquidityBoundsService).markAsAvailable(PUBKEY, PUBKEY_2, Coins.ofSatoshis(100));
verify(liquidityBoundsService).markAsAvailable(PUBKEY_2, PUBKEY_3, Coins.ofSatoshis(90));
verify(liquidityBoundsService).markAsUnavailable(PUBKEY_3, PUBKEY_4, oneSatoshi);
verify(liquidityBoundsService).markAsUnavailable(PUBKEY_3, PUBKEY_4, twoSatoshis);
verifyRemovesInFlightForAllHops();
}
@@ -276,7 +282,7 @@ class LiquidityInformationUpdaterTest {
liquidityInformationUpdater.failure(hopsWithChannelIds, CHANNEL_DISABLED, 2);
verify(liquidityBoundsService).markAsAvailable(PUBKEY, PUBKEY_2, Coins.ofSatoshis(100));
verify(liquidityBoundsService).markAsAvailable(PUBKEY_2, PUBKEY_3, Coins.ofSatoshis(90));
verify(liquidityBoundsService).markAsUnavailable(PUBKEY_3, PUBKEY_4, oneSatoshi);
verify(liquidityBoundsService).markAsUnavailable(PUBKEY_3, PUBKEY_4, twoSatoshis);
verifyRemovesInFlightForAllHops();
}
@@ -401,10 +407,12 @@ class LiquidityInformationUpdaterTest {
@Test
void feeInsufficient_is_treated_as_channel_failure() {
liquidityInformationUpdater.failure(hopsWithChannelIds, FEE_INSUFFICIENT, 2);
verifyRemovesInFlightForAllHops();
verify(liquidityBoundsService).markAsAvailable(PUBKEY, PUBKEY_2, Coins.ofSatoshis(100));
verify(liquidityBoundsService).markAsAvailable(PUBKEY_2, PUBKEY_3, Coins.ofSatoshis(90));
verify(liquidityBoundsService).markAsUnavailable(PUBKEY_3, PUBKEY_4, Coins.ofSatoshis(1));
verifyRemovesInFlightForAllHops();
// see ChannelDisabled
verify(liquidityBoundsService).markAsUnavailable(PUBKEY_3, PUBKEY_4, Coins.ofSatoshis(2));
}
@Test