subdaemons: pass back and forth the htlc points.

Openingd sets it to the same as the payment point for the remote side.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>

channeld/channel.c

@@ -2023,6 +2023,7 @@ static void init_channel(struct peer *peer)
 				   &funding_pubkey[REMOTE],
 				   &points[REMOTE].revocation,
 				   &points[REMOTE].payment,
+				   &points[REMOTE].htlc,
 				   &points[REMOTE].delayed_payment,
 				   &peer->remote_per_commit,
 				   &peer->old_remote_per_commit,
@@ -2057,8 +2058,6 @@ static void init_channel(struct peer *peer)
 				   &funding_signed))
 		master_badmsg(WIRE_CHANNEL_INIT, msg);
 
-	points[REMOTE].htlc = points[REMOTE].payment;
-
 	status_trace("init %s: remote_per_commit = %s, old_remote_per_commit = %s"
 		     " next_idx_local = %"PRIu64
 		     " next_idx_remote = %"PRIu64

channeld/channel_wire.csv

@@ -16,9 +16,10 @@ channel_init,,feerate_per_kw,u32
 channel_init,,first_commit_sig,secp256k1_ecdsa_signature
 channel_init,,crypto_state,struct crypto_state
 channel_init,,remote_fundingkey,struct pubkey
-channel_init,,revocation_basepoint,struct pubkey
-channel_init,,payment_basepoint,struct pubkey
-channel_init,,delayed_payment_basepoint,struct pubkey
+channel_init,,remote_revocation_basepoint,struct pubkey
+channel_init,,remote_payment_basepoint,struct pubkey
+channel_init,,remote_htlc_basepoint,struct pubkey
+channel_init,,remote_delayed_payment_basepoint,struct pubkey
 channel_init,,remote_per_commit,struct pubkey
 channel_init,,old_remote_per_commit,struct pubkey
 channel_init,,funder,enum side