openingd: don't hand redundant feature flags.

Openingd can query them itself (as dualopend already does).  And move
the two feature args next to each other on the wire.

Signed-off-by: Rusty Russell <[email protected]>

Author: rustyrussell

lightningd/opening_control.c

@@ -962,6 +962,7 @@ void peer_start_openingd(struct peer *peer, struct per_peer_state *pps)
 	msg = towire_openingd_init(NULL,
 				  chainparams,
 				  peer->ld->our_features,
+				  peer->their_features,
 				  &uc->our_config,
 				  max_to_self_delay,
 				  min_effective_htlc_capacity,
@@ -970,13 +971,6 @@ void peer_start_openingd(struct peer *peer, struct per_peer_state *pps)
 				  uc->minimum_depth,
 				  feerate_min(peer->ld, NULL),
 				  feerate_max(peer->ld, NULL),
-				  peer->their_features,
-				  feature_negotiated(peer->ld->our_features,
-						     peer->their_features,
-						     OPT_STATIC_REMOTEKEY),
-				  feature_negotiated(peer->ld->our_features,
-						     peer->their_features,
-						     OPT_ANCHOR_OUTPUTS),
 				  IFDEV(peer->ld->dev_force_tmp_channel_id, NULL),
 				  IFDEV(peer->ld->dev_fast_gossip, false));
 	subd_send_msg(uc->open_daemon, take(msg));

openingd/openingd.c

@@ -114,9 +114,6 @@ struct state {
 	 * as initial channels never have HTLCs. */
 	struct channel *channel;
 
-	bool option_static_remotekey;
-	bool option_anchor_outputs;
-
 	struct feature_set *our_features;
 };
 
@@ -466,7 +463,9 @@ static u8 *funder_channel_start(struct state *state, u8 channel_flags)
 				 &state->remoteconf,
 				 &state->localconf,
 				 true,
-				 state->option_anchor_outputs,
+				 feature_negotiated(state->our_features,
+						    state->their_features,
+						    OPT_ANCHOR_OUTPUTS),
 				 &err_reason)) {
 		negotiation_failed(state, true, "%s", err_reason);
 		return NULL;
@@ -531,8 +530,12 @@ static bool funder_finalize_channel_setup(struct state *state,
 					     &state->their_points,
 					     &state->our_funding_pubkey,
 					     &state->their_funding_pubkey,
-					     state->option_static_remotekey,
-					     state->option_anchor_outputs,
+					     feature_negotiated(state->our_features,
+								state->their_features,
+								OPT_STATIC_REMOTEKEY),
+					     feature_negotiated(state->our_features,
+								state->their_features,
+								OPT_ANCHOR_OUTPUTS),
 					     /* Opener is local */
 					     LOCAL);
 	/* We were supposed to do enough checks above, but just in case,
@@ -908,7 +911,9 @@ static u8 *fundee_channel(struct state *state, const u8 *open_channel_msg)
 				 &state->remoteconf,
 				 &state->localconf,
 				 false,
-				 state->option_anchor_outputs,
+				 feature_negotiated(state->our_features,
+						    state->their_features,
+						    OPT_ANCHOR_OUTPUTS),
 				 &err_reason)) {
 		negotiation_failed(state, false, "%s", err_reason);
 		return NULL;
@@ -1021,8 +1026,12 @@ static u8 *fundee_channel(struct state *state, const u8 *open_channel_msg)
 					     &state->our_points, &theirs,
 					     &state->our_funding_pubkey,
 					     &their_funding_pubkey,
-					     state->option_static_remotekey,
-					     state->option_anchor_outputs,
+					     feature_negotiated(state->our_features,
+								state->their_features,
+								OPT_STATIC_REMOTEKEY),
+					     feature_negotiated(state->our_features,
+								state->their_features,
+								OPT_ANCHOR_OUTPUTS),
 					     REMOTE);
 	/* We don't expect this to fail, but it does do some additional
 	 * internal sanity checks. */
@@ -1353,6 +1362,7 @@ int main(int argc, char *argv[])
 	if (!fromwire_openingd_init(state, msg,
 				   &chainparams,
 				   &state->our_features,
+				   &state->their_features,
 				   &state->localconf,
 				   &state->max_to_self_delay,
 				   &state->min_effective_htlc_capacity,
@@ -1361,9 +1371,6 @@ int main(int argc, char *argv[])
 				   &state->our_funding_pubkey,
 				   &state->minimum_depth,
 				   &state->min_feerate, &state->max_feerate,
-				   &state->their_features,
-				   &state->option_static_remotekey,
-				   &state->option_anchor_outputs,
 				   &force_tmp_channel_id,
 				   &dev_fast_gossip))
 		master_badmsg(WIRE_OPENINGD_INIT, msg);

openingd/openingd_wire.csv

@@ -10,6 +10,8 @@ msgtype,openingd_init,6000
 # Which network are we configured for?
 msgdata,openingd_init,chainparams,chainparams,
 msgdata,openingd_init,our_features,feature_set,
+msgdata,openingd_init,their_init_features_len,u16,
+msgdata,openingd_init,their_init_features,u8,their_init_features_len
 # Base configuration we'll offer (channel reserve will vary with amount)
 msgdata,openingd_init,our_config,channel_config,
 # Minimum/maximum configuration values we'll accept
@@ -22,10 +24,6 @@ msgdata,openingd_init,our_funding_pubkey,pubkey,
 msgdata,openingd_init,minimum_depth,u32,
 msgdata,openingd_init,min_feerate,u32,
 msgdata,openingd_init,max_feerate,u32,
-msgdata,openingd_init,lfeatures_len,u16,
-msgdata,openingd_init,lfeatures,u8,lfeatures_len
-msgdata,openingd_init,option_static_remotekey,bool,
-msgdata,openingd_init,option_anchor_outputs,bool,
 msgdata,openingd_init,dev_temporary_channel_id,?byte,32
 msgdata,openingd_init,dev_fast_gossip,bool,