mirrors/core-lightning
1
0
Fork 0
mirror of https://github.com/ElementsProject/lightning.git synced 2025-01-18 21:35:11 +01:00
Code Issues Projects Releases Wiki Activity

plugins/pay: retry when routehint fails.

Browse Source 
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell 2019-01-15 20:34:07 +10:30 committed by Christian Decker
parent e3f893444d
commit b17c344b71
2 changed files with 109 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
plugins/pay.c
View File

@ -52,6 +52,23 @@ struct pay_command {
static struct command_result *start_pay_attempt(struct command *cmd,
struct pay_command *pc);
/* Is this (erring) channel within the routehint itself? */
static bool channel_in_routehint(const struct route_info *routehint,
const char *buf, const jsmntok_t *scidtok)
{
struct short_channel_id scid;
if (!json_to_short_channel_id(buf, scidtok, &scid))
plugin_err("bad erring_channel '%.*s'",
scidtok->end - scidtok->start, buf + scidtok->start);
for (size_t i = 0; i < tal_count(routehint); i++)
if (short_channel_id_eq(&scid, &routehint[i].short_channel_id))
return true;
return false;
}
static struct command_result *waitsendpay_expired(struct command *cmd,
struct pay_command *pc)
{
@ -99,15 +116,22 @@ static struct command_result *waitsendpay_error(struct command *cmd,
plugin_err("waitsendpay error no erring_direction '%.*s'",
error->end - error->start, buf + error->start);
/* Add erring channel to exclusion list. */
tal_arr_expand(&pc->excludes, tal_fmt(pc->excludes, "%.*s/%c",
scidtok->end - scidtok->start,
buf + scidtok->start,
buf[dirtok->start]));
attempt = &pc->attempts[tal_count(pc->attempts)-1];
attempt->failure = json_strdup(pc->attempts, buf, error);
/* If failure is in routehint part, eliminate that */
if (tal_count(pc->routehints) != 0
&& channel_in_routehint(pc->routehints[0], buf, scidtok)) {
tal_arr_remove(&pc->routehints, 0);
} else {
/* Otherwise, add erring channel to exclusion list. */
tal_arr_expand(&pc->excludes,
tal_fmt(pc->excludes, "%.*s/%c",
scidtok->end - scidtok->start,
buf + scidtok->start,
buf[dirtok->start]));
}
if (time_after(time_now(), pc->stoptime)) {
return waitsendpay_expired(cmd, pc);
}
@ -194,6 +218,14 @@ static const char *join_routehint(const tal_t *ctx,
return ret;
}
/* Try again with the next routehint (or none if that was the last) */
static struct command_result *next_routehint(struct command *cmd,
struct pay_command *pc)
{
tal_arr_remove(&pc->routehints, 0);
return start_pay_attempt(cmd, pc);
}
static struct command_result *getroute_done(struct command *cmd,
const char *buf,
const jsmntok_t *result,
@ -226,12 +258,18 @@ static struct command_result *getroute_done(struct command *cmd,
feepercent = ((double)fee) * 100.0 / ((double) pc->msatoshi);
if (fee > pc->exemptfee && feepercent > pc->maxfeepercent) {
if (tal_count(pc->routehints) != 0)
return next_routehint(cmd, pc);
return command_fail(cmd, PAY_ROUTE_TOO_EXPENSIVE,
"Route wanted fee of %"PRIu64" msatoshis",
fee);
}
if (delay > pc->maxdelay) {
if (tal_count(pc->routehints) != 0)
return next_routehint(cmd, pc);
return command_fail(cmd, PAY_ROUTE_TOO_EXPENSIVE,
"Route wanted delay of %u blocks", delay);
}
@ -253,6 +291,19 @@ static struct command_result *getroute_done(struct command *cmd,
attempt.route,
pc->payment_hash,
json_desc);
}
static struct command_result *getroute_error(struct command *cmd,
const char *buf,
const jsmntok_t *result,
struct pay_command *pc)
{
/* If we were trying to use a routehint, remove and try again. */
if (tal_count(pc->routehints) != 0)
return next_routehint(cmd, pc);
return forward_error(cmd, buf, result, pc);
}
static struct command_result *start_pay_attempt(struct command *cmd,
@ -294,7 +345,7 @@ static struct command_result *start_pay_attempt(struct command *cmd,
}
/* OK, ask for route to destination */
return send_outreq(cmd, "getroute", getroute_done, forward_error, pc,
return send_outreq(cmd, "getroute", getroute_done, getroute_error, pc,
"'id': '%s',"
"'msatoshi': %"PRIu64","
"'cltv': %u,"

62
tests/test_pay.py
View File

@ -1237,18 +1237,58 @@ def test_pay_routeboost(node_factory, bitcoind):
if DEVELOPER:
scid34 = only_one(l3.rpc.listpeers(l4.info['id'])['peers'])['channels'][0]['short_channel_id']
scid45 = only_one(l4.rpc.listpeers(l5.info['id'])['peers'])['channels'][0]['short_channel_id']
route = [{'id': l3.info['id'],
'short_channel_id': scid34,
'fee_base_msat': 1000,
'fee_proportional_millionths': 10,
'cltv_expiry_delta': 6},
{'id': l4.info['id'],
'short_channel_id': scid45,
'fee_base_msat': 1000,
'fee_proportional_millionths': 10,
'cltv_expiry_delta': 6}]
routel3l4l5 = [{'id': l3.info['id'],
'short_channel_id': scid34,
'fee_base_msat': 1000,
'fee_proportional_millionths': 10,
'cltv_expiry_delta': 6},
{'id': l4.info['id'],
'short_channel_id': scid45,
'fee_base_msat': 1000,
'fee_proportional_millionths': 10,
'cltv_expiry_delta': 6}]
inv = l5.rpc.call('invoice', {'msatoshi': 10**5,
'label': 'test_pay_routeboost2',
'description': 'test_pay_routeboost2',
'dev-routes': [route]})
'dev-routes': [routel3l4l5]})
l1.rpc.pay(inv['bolt11'])
# Now test that it falls back correctly to not using routeboost
# if it can't route to the node mentioned
routel4l3 = [{'id': l4.info['id'],
'short_channel_id': scid34,
'fee_base_msat': 1000,
'fee_proportional_millionths': 10,
'cltv_expiry_delta': 6}]
inv = l3.rpc.call('invoice', {'msatoshi': 10**5,
'label': 'test_pay_routeboost3',
'description': 'test_pay_routeboost3',
'dev-routes': [routel4l3]})
l1.rpc.pay(inv['bolt11'])
# Similarly if it can route, but payment fails.
routel2bad = [{'id': l2.info['id'],
'short_channel_id': scid34, # Invalid scid
'fee_base_msat': 1000,
'fee_proportional_millionths': 10,
'cltv_expiry_delta': 6}]
inv = l3.rpc.call('invoice', {'msatoshi': 10**5,
'label': 'test_pay_routeboost4',
'description': 'test_pay_routeboost4',
'dev-routes': [routel2bad]})
l1.rpc.pay(inv['bolt11'])
# Finally, it should fall back to second routehint if first fails.
# (Note, this is not public because it's not 6 deep)
l3.rpc.connect(l5.info['id'], 'localhost', l5.port)
scid35 = l3.fund_channel(l5, 10**6)
routel3l5 = [{'id': l3.info['id'],
'short_channel_id': scid35,
'fee_base_msat': 1000,
'fee_proportional_millionths': 10,
'cltv_expiry_delta': 6}]
inv = l5.rpc.call('invoice', {'msatoshi': 10**5,
'label': 'test_pay_routeboost5',
'description': 'test_pay_routeboost5',
'dev-routes': [routel3l4l5, routel3l5]})
l1.rpc.pay(inv['bolt11'])