mirrors/core-lightning
1
0
Fork 0
mirror of https://github.com/ElementsProject/lightning.git synced 2025-03-26 20:30:59 +01:00
Code Issues Projects Releases Wiki Activity

channeld: Tell channeld the penalty feerate

Browse source 
`channeld` will start creating the penalty transactions in one of the next
commits, so it should know the penalty feerate.
This commit is contained in:
Christian Decker 2020-05-07 10:22:43 +09:30 • committed by Rusty Russell
parent 93eaf3017d
commit acbd583e66
3 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
channeld/channel_wire.csv
View file

@ -18,6 +18,7 @@ msgdata,channel_init,their_config,channel_config,
msgdata,channel_init,fee_states,fee_states, msgdata,channel_init,fee_states,fee_states,
msgdata,channel_init,feerate_min,u32, msgdata,channel_init,feerate_min,u32,
msgdata,channel_init,feerate_max,u32, msgdata,channel_init,feerate_max,u32,
msgdata,channel_init,feerate_penalty,u32,
msgdata,channel_init,first_commit_sig,bitcoin_signature, msgdata,channel_init,first_commit_sig,bitcoin_signature,
msgdata,channel_init,per_peer_state,per_peer_state, msgdata,channel_init,per_peer_state,per_peer_state,
msgdata,channel_init,remote_fundingkey,pubkey, msgdata,channel_init,remote_fundingkey,pubkey,
@ -178,6 +179,7 @@ msgtype,channel_feerates,1027
msgdata,channel_feerates,feerate,u32, msgdata,channel_feerates,feerate,u32,
msgdata,channel_feerates,min_feerate,u32, msgdata,channel_feerates,min_feerate,u32,
msgdata,channel_feerates,max_feerate,u32, msgdata,channel_feerates,max_feerate,u32,
msgdata,channel_feerates,penalty_feerate,u32,
# master -> channeld: do you have a memleak? # master -> channeld: do you have a memleak?
msgtype,channel_dev_memleak,1033 msgtype,channel_dev_memleak,1033

1 #include <common/cryptomsg.h>
18 msgdata,channel_init,feerate_min,u32,
19 msgdata,channel_init,feerate_max,u32,
20 msgdata,channel_init,first_commit_sig,bitcoin_signature, msgdata,channel_init,feerate_penalty,u32,
21 msgdata,channel_init,first_commit_sig,bitcoin_signature,
22 msgdata,channel_init,per_peer_state,per_peer_state,
23 msgdata,channel_init,remote_fundingkey,pubkey,
24 msgdata,channel_init,remote_basepoints,basepoints,
179 # Ask channeld to send a error message. Used in forgetting channel case. msgdata,channel_got_announcement,remote_ann_bitcoin_sig,secp256k1_ecdsa_signature,
180 msgtype,channel_send_error,1008 # Ask channeld to send a error message. Used in forgetting channel case.
181 msgdata,channel_send_error,reason,wirestring, msgtype,channel_send_error,1008
182 msgdata,channel_send_error,reason,wirestring,
183 # Tell master channeld has sent the error message.
184 msgtype,channel_send_error_reply,1108
185 # Tell lightningd we got a onion message (for us, or to fwd)

10
channeld/channeld.c
View file

@ -84,6 +84,9 @@ struct peer {
/* Tolerable amounts for feerate (only relevant for fundee). */ /* Tolerable amounts for feerate (only relevant for fundee). */
u32 feerate_min, feerate_max; u32 feerate_min, feerate_max;
/* Feerate to be used when creating penalty transactions. */
u32 feerate_penalty;
/* Local next per-commit point. */ /* Local next per-commit point. */
struct pubkey next_local_per_commit; struct pubkey next_local_per_commit;
@ -2816,7 +2819,8 @@ static void handle_feerates(struct peer *peer, const u8 *inmsg)
if (!fromwire_channel_feerates(inmsg, &feerate, if (!fromwire_channel_feerates(inmsg, &feerate,
&peer->feerate_min, &peer->feerate_min,
&peer->feerate_max)) &peer->feerate_max,
&peer->feerate_penalty))
master_badmsg(WIRE_CHANNEL_FEERATES, inmsg); master_badmsg(WIRE_CHANNEL_FEERATES, inmsg);
/* BOLT #2: /* BOLT #2:
@ -3110,7 +3114,9 @@ static void init_channel(struct peer *peer)
&minimum_depth, &minimum_depth,
&conf[LOCAL], &conf[REMOTE], &conf[LOCAL], &conf[REMOTE],
&fee_states, &fee_states,
&peer->feerate_min, &peer->feerate_max, &peer->feerate_min,
&peer->feerate_max,
&peer->feerate_penalty,
&peer->their_commit_sig, &peer->their_commit_sig,
&peer->pps, &peer->pps,
&funding_pubkey[REMOTE], &funding_pubkey[REMOTE],

7
lightningd/channel_control.c
View file

@ -38,7 +38,8 @@ static void update_feerates(struct lightningd *ld, struct channel *channel)
msg = towire_channel_feerates(NULL, feerate, msg = towire_channel_feerates(NULL, feerate,
feerate_min(ld, NULL), feerate_min(ld, NULL),
feerate_max(ld, NULL)); feerate_max(ld, NULL),
try_get_feerate(ld->topology, FEERATE_PENALTY));
subd_send_msg(channel->owner, take(msg)); subd_send_msg(channel->owner, take(msg));
} }
@ -480,6 +481,7 @@ void peer_start_channeld(struct channel *channel,
channel->channel_info.fee_states, channel->channel_info.fee_states,
feerate_min(ld, NULL), feerate_min(ld, NULL),
feerate_max(ld, NULL), feerate_max(ld, NULL),
try_get_feerate(ld->topology, FEERATE_PENALTY),
&channel->last_sig, &channel->last_sig,
pps, pps,
&channel->channel_info.remote_fundingkey, &channel->channel_info.remote_fundingkey,
@ -819,7 +821,8 @@ static struct command_result *json_dev_feerate(struct command *cmd,
msg = towire_channel_feerates(NULL, *feerate, msg = towire_channel_feerates(NULL, *feerate,
feerate_min(cmd->ld, NULL), feerate_min(cmd->ld, NULL),
feerate_max(cmd->ld, NULL)); feerate_max(cmd->ld, NULL),
try_get_feerate(cmd->ld->topology, FEERATE_PENALTY));
subd_send_msg(channel->owner, take(msg)); subd_send_msg(channel->owner, take(msg));
response = json_stream_success(cmd); response = json_stream_success(cmd);