aljaz/lightning
1
0
Fork 0
mirror of https://github.com/aljazceru/lightning.git synced 2025-12-20 07:34:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

pay: Abort the payment if destination is unreachable

Browse Source 
We were not aborting if we had routehints, even though all routehints
may have been filtered out.

Changelog-Fixed: pay: `pay` will now abort early if the destination is not reachable directly nor via routehints.
This commit is contained in:
Christian Decker
2021-02-26 14:56:25 +01:00
committed by Rusty Russell
parent cb21a5384b
commit ea92466025
2 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
plugins/libplugin-pay.c
View File

@@ -2625,6 +2625,17 @@ static struct command_result *routehint_getroute_result(struct command *cmd,
/* FIXME: ***DO*** we need to add this extra routehint? /* FIXME: ***DO*** we need to add this extra routehint?
* Once we run out of routehints the default system will * Once we run out of routehints the default system will
* just attempt directly routing to the destination anyway. */ * just attempt directly routing to the destination anyway. */
} else if (tal_count(d->routehints) == 0) {
/* If we don't have any routehints and the destination
* isn't reachable, then there is no point in
* continuing. */
payment_abort(
p,
"Destination %s is not reachable directly and "
"all routehints were unusable.",
type_to_string(tmpctx, struct node_id, p->destination));
return command_still_pending(cmd);
} }
routehint_pre_getroute(d, p); routehint_pre_getroute(d, p);

9
tests/test_pay.py
View File

@@ -1723,7 +1723,7 @@ def test_pay_routeboost(node_factory, bitcoind, compat):
l3, l4, l5 = node_factory.line_graph(3, announce_channels=False, wait_for_announce=False) l3, l4, l5 = node_factory.line_graph(3, announce_channels=False, wait_for_announce=False)
# This should a "could not find a route" because that's true. # This should a "could not find a route" because that's true.
error = r'Ran out of routes' error = r'Destination [a-f0-9]{66} is not reachable directly and all routehints were unusable'
with pytest.raises(RpcError, match=error): with pytest.raises(RpcError, match=error):
l1.rpc.pay(l5.rpc.invoice(10**8, 'test_retry', 'test_retry')['bolt11']) l1.rpc.pay(l5.rpc.invoice(10**8, 'test_retry', 'test_retry')['bolt11'])
@@ -4219,10 +4219,15 @@ def test_unreachable_routehint(node_factory, bitcoind):
l2.connect(l3) l2.connect(l3)
wait_for(lambda: len(l1.rpc.listnodes(entrypoint)['nodes']) == 1) wait_for(lambda: len(l1.rpc.listnodes(entrypoint)['nodes']) == 1)
with pytest.raises(RpcError): with pytest.raises(RpcError, match=r'Destination [a-f0-9]{66} is not reachable') as excinfo:
l1.rpc.pay(invoice) l1.rpc.pay(invoice)
assert(l1.daemon.is_in_log( assert(l1.daemon.is_in_log(
r"Removed routehint 0 because entrypoint {entrypoint} is unreachable.".format( r"Removed routehint 0 because entrypoint {entrypoint} is unreachable.".format(
entrypoint=entrypoint entrypoint=entrypoint
) )
)) ))
# Since we aborted once we realized the destination is unreachable
# both directly, and via the routehints we should now just have a
# single attempt.
assert(len(excinfo.value.error['attempts']) == 1)