aljaz/lightning
1
0
Fork 0
mirror of https://github.com/aljazceru/lightning.git synced 2026-01-21 06:44:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

lightningd: setchannel can set ignorefeelimits.

Browse Source 
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Changelog-Added: JSON-RPC: `setchannel` adds a new `ignorefeelimits` parameter to allow peer to set arbitrary commitment transaction fees on a per-channel basis.
This commit is contained in:
Rusty Russell
2023-07-21 16:49:22 +09:30
parent f8d50fb690
commit b529e79621
15 changed files with 97 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lightningd/channel_control.c
View File

@@ -24,7 +24,7 @@
#include <lightningd/peer_fd.h>
#include <wally_bip32.h>
static void update_feerates(struct lightningd *ld, const struct channel *channel)
void channel_update_feerates(struct lightningd *ld, const struct channel *channel)
{
u8 *msg;
u32 min_feerate, max_feerate;
@@ -71,7 +71,7 @@ static void try_update_feerates(struct lightningd *ld, struct channel *channel)
if (!channel->owner)
return;
update_feerates(ld, channel);
channel_update_feerates(ld, channel);
}
static void try_update_blockheight(struct lightningd *ld,

2
lightningd/channel_control.h
View File

@@ -43,4 +43,6 @@ void channel_fallen_behind(struct channel *channel, const u8 *msg);
/* Fresh channel_update for this channel. */
void channel_replace_update(struct channel *channel, u8 *update TAKES);
/* Tell channel about new feerates (owner must be channeld!) */
void channel_update_feerates(struct lightningd *ld, const struct channel *channel);
#endif /* LIGHTNING_LIGHTNINGD_CHANNEL_CONTROL_H */

18
lightningd/peer_control.c
View File

@@ -2686,6 +2686,7 @@ static void set_channel_config(struct command *cmd, struct channel *channel,
struct amount_msat *htlc_min,
struct amount_msat *htlc_max,
u32 delaysecs,
bool *ignore_fee_limits,
struct json_stream *response)
{
bool warn_cannot_set_min = false, warn_cannot_set_max = false;
@@ -2733,12 +2734,18 @@ static void set_channel_config(struct command *cmd, struct channel *channel,
} else
channel->htlc_maximum_msat = *htlc_max;
}
if (ignore_fee_limits)
channel->ignore_fee_limits = *ignore_fee_limits;
/* tell channeld to make a send_channel_update */
if (channel->owner && streq(channel->owner->name, "channeld"))
if (channel->owner && streq(channel->owner->name, "channeld")) {
subd_send_msg(channel->owner,
take(towire_channeld_config_channel(NULL, base, ppm,
htlc_min, htlc_max)));
/* Tell it about the new acceptable feerates */
if (ignore_fee_limits)
channel_update_feerates(cmd->ld, channel);
}
/* save values to database */
wallet_channel_save(cmd->ld->wallet, channel);
@@ -2764,6 +2771,7 @@ static void set_channel_config(struct command *cmd, struct channel *channel,
json_add_amount_msat(response,
"maximum_htlc_out_msat",
channel->htlc_maximum_msat);
json_add_bool(response, "ignore_fee_limits", channel->ignore_fee_limits);
if (warn_cannot_set_max)
json_add_string(response, "warning_htlcmax_too_high",
"Set maximum_htlc_out_msat to maximum possible in channel");
@@ -2780,6 +2788,7 @@ static struct command_result *json_setchannel(struct command *cmd,
struct channel **channels;
u32 *base, *ppm, *delaysecs;
struct amount_msat *htlc_min, *htlc_max;
bool *ignore_fee_limits;
/* Parse the JSON command */
if (!param(cmd, buffer, params,
@@ -2789,6 +2798,7 @@ static struct command_result *json_setchannel(struct command *cmd,
p_opt("htlcmin", param_msat, &htlc_min),
p_opt("htlcmax", param_msat, &htlc_max),
p_opt_def("enforcedelay", param_number, &delaysecs, 600),
p_opt("ignorefeelimits", param_bool, &ignore_fee_limits),
NULL))
return command_param_failed();
@@ -2818,7 +2828,8 @@ static struct command_result *json_setchannel(struct command *cmd,
continue;
set_channel_config(cmd, channel, base, ppm,
htlc_min, htlc_max,
*delaysecs, response);
*delaysecs, ignore_fee_limits,
response);
}
}
/* single peer should be updated */
@@ -2826,7 +2837,8 @@ static struct command_result *json_setchannel(struct command *cmd,
for (size_t i = 0; i < tal_count(channels); i++) {
set_channel_config(cmd, channels[i], base, ppm,
htlc_min, htlc_max,
*delaysecs, response);
*delaysecs, ignore_fee_limits,
response);
}
}

3
lightningd/test/run-invoice-select-inchan.c
View File

@@ -124,6 +124,9 @@ const char **channel_type_name(const tal_t *ctx UNNEEDED, const struct channel_t
/* Generated stub for channel_unsaved_close_conn */
void channel_unsaved_close_conn(struct channel *channel UNNEEDED, const char *why UNNEEDED)
{ fprintf(stderr, "channel_unsaved_close_conn called!\n"); abort(); }
/* Generated stub for channel_update_feerates */
void channel_update_feerates(struct lightningd *ld UNNEEDED, const struct channel *channel UNNEEDED)
{ fprintf(stderr, "channel_update_feerates called!\n"); abort(); }
/* Generated stub for channel_update_reserve */
void channel_update_reserve(struct channel *channel UNNEEDED,
struct channel_config *their_config UNNEEDED,