fixup! channeld: Code to implement splicing

Add raw satoshi access warning stoppers

Author: ddustin

channeld/channeld.c

@@ -1613,8 +1613,8 @@ static void send_commit(struct peer *peer)
 	 *     feerate order.
 	 */
 	for (u32 i = 0; i < tal_count(peer->splice_state.inflights); i++) {
-		s64 funding_diff = (s64)peer->splice_state.inflights[i]->amnt.satoshis
-					- peer->channel->funding_sats.satoshis;
+		s64 funding_diff = (s64)peer->splice_state.inflights[i]->amnt.satoshis /* Raw: splicing */
+					- peer->channel->funding_sats.satoshis; /* Raw: splicing */
 		s64 remote_splice_amnt = funding_diff
 					- peer->splice_state.inflights[i]->splice_amnt;
 
@@ -2074,8 +2074,8 @@ static struct commitsig *handle_peer_commit_sig(struct peer *peer,
 	 * inflight splices. Since consequtive is requred, we recurse for
 	 * each expected message, blocking until all are received. */
 	for (i = 0; i < tal_count(peer->splice_state.inflights); i++) {
-		s64 funding_diff = (s64)peer->splice_state.inflights[i]->amnt.satoshis
-					- peer->channel->funding_sats.satoshis;
+		s64 funding_diff = (s64)peer->splice_state.inflights[i]->amnt.satoshis /* Raw: splicing */
+					- peer->channel->funding_sats.satoshis; /* Raw: splicing */
 		s64 sub_splice_amnt = peer->splice_state.inflights[i]->splice_amnt;
 
 		splice_msg = peer_read(tmpctx, peer->pps);
@@ -3058,10 +3058,10 @@ static int find_channel_funding_input(struct wally_psbt *psbt,
 static void update_view_from_inflights(struct peer *peer)
 {
 	struct inflight **inflights = peer->splice_state.inflights;
-	s64 orig_sats = peer->channel->funding_sats.satoshis;
+	s64 orig_sats = peer->channel->funding_sats.satoshis; /* Raw: splicing */
 
 	for (size_t i = 0; i < tal_count(inflights); i++) {
-		s64 splice_amnt = inflights[i]->amnt.satoshis;
+		s64 splice_amnt = inflights[i]->amnt.satoshis; /* Raw: splicing */
 		s64 funding_diff = splice_amnt - orig_sats;
 		s64 remote_splice_amnt = funding_diff - inflights[i]->splice_amnt;
 

channeld/full_channel.c

@@ -343,11 +343,11 @@ struct bitcoin_tx **channel_splice_txs(const tal_t *ctx,
 	other_side_pay = channel->view[side].owed[!side];
 
 	if (side == LOCAL) {
-		side_pay.millisatoshis += splice_amnt * 1000;
-		other_side_pay.millisatoshis += remote_splice_amnt * 1000;
+		side_pay.millisatoshis += splice_amnt * 1000; /* Raw: splicing */
+		other_side_pay.millisatoshis += remote_splice_amnt * 1000; /* Raw: splicing */
 	} else if (side == REMOTE) {
-		side_pay.millisatoshis += remote_splice_amnt * 1000;
-		other_side_pay.millisatoshis += splice_amnt * 1000;
+		side_pay.millisatoshis += remote_splice_amnt * 1000; /* Raw: splicing */
+		other_side_pay.millisatoshis += splice_amnt * 1000; /* Raw: splicing */
 	}
 
 	txs = tal_arr(ctx, struct bitcoin_tx *, 1);
@@ -394,13 +394,13 @@ static bool get_room_above_reserve(const struct channel *channel,
 	struct amount_msat owed = view->owed[side];
 
 	/* `lowest_splice_amnt` will always be negative or 0 */
-	if (-view->lowest_splice_amnt[side] > owed.millisatoshis) {
+	if (-view->lowest_splice_amnt[side] > owed.millisatoshis) { /* Raw: splicing */
 		status_debug("Relative splice balance invalid");
 		return false;
 	}
 
 	/* `lowest_splice_amnt` is a relative amount */
-	owed.millisatoshis -= -view->lowest_splice_amnt[side];
+	owed.millisatoshis -= -view->lowest_splice_amnt[side]; /* Raw: splicing */
 
 	to_balance(&balance, owed);
 

common/initial_channel.c

@@ -156,25 +156,25 @@ const char *channel_update_funding(struct channel *channel,
 				   struct amount_sat funding_sats,
 				   s64 splice_amnt)
 {
-	s64 funding_diff = (s64)funding_sats.satoshis - (s64)channel->funding_sats.satoshis;
+	s64 funding_diff = (s64)funding_sats.satoshis - (s64)channel->funding_sats.satoshis; /* Raw: splicing */
 	s64 remote_splice_amnt = funding_diff - splice_amnt;
 
 	channel->funding = *funding;
 	channel->funding_sats = funding_sats;
 
-	if (splice_amnt * 1000 + channel->view[LOCAL].owed[LOCAL].millisatoshis < 0)
+	if (splice_amnt * 1000 + channel->view[LOCAL].owed[LOCAL].millisatoshis < 0) /* Raw: splicing */
 		return tal_fmt(tmpctx, "Channel funding update would make local"
 			       " balance negative.");
 
-	channel->view[LOCAL].owed[LOCAL].millisatoshis += splice_amnt * 1000;
-	channel->view[REMOTE].owed[LOCAL].millisatoshis += splice_amnt * 1000;
+	channel->view[LOCAL].owed[LOCAL].millisatoshis += splice_amnt * 1000; /* Raw: splicing */
+	channel->view[REMOTE].owed[LOCAL].millisatoshis += splice_amnt * 1000; /* Raw: splicing */
 
-	if (remote_splice_amnt * 1000 + channel->view[LOCAL].owed[REMOTE].millisatoshis < 0)
+	if (remote_splice_amnt * 1000 + channel->view[LOCAL].owed[REMOTE].millisatoshis < 0) /* Raw: splicing */
 		return tal_fmt(tmpctx, "Channel funding update would make"
 			       " remote balance negative.");
 
-	channel->view[LOCAL].owed[REMOTE].millisatoshis += remote_splice_amnt * 1000;
-	channel->view[REMOTE].owed[REMOTE].millisatoshis += remote_splice_amnt * 1000;
+	channel->view[LOCAL].owed[REMOTE].millisatoshis += remote_splice_amnt * 1000; /* Raw: splicing */
+	channel->view[REMOTE].owed[REMOTE].millisatoshis += remote_splice_amnt * 1000; /* Raw: splicing */
 
 	return NULL;
 }

lightningd/channel_control.c

@@ -797,9 +797,9 @@ static void handle_peer_splice_locked(struct channel *channel, const u8 *msg)
 		return;
 	}
 
-	channel->our_msat.millisatoshis += splice_amnt * 1000;
-	channel->msat_to_us_min.millisatoshis += splice_amnt * 1000;
-	channel->msat_to_us_max.millisatoshis += splice_amnt * 1000;
+	channel->our_msat.millisatoshis += splice_amnt * 1000; /* Raw: splicing */
+	channel->msat_to_us_min.millisatoshis += splice_amnt * 1000; /* Raw: splicing */
+	channel->msat_to_us_max.millisatoshis += splice_amnt * 1000; /* Raw: splicing */
 
 	inflight = channel_inflight_find(channel, &locked_txid);
 	if(!inflight)

lightningd/peer_control.c

@@ -1738,7 +1738,7 @@ void update_channel_from_inflight(struct lightningd *ld,
 	channel->funding_sats = inflight->funding->total_funds;
 
 	channel->our_funds = inflight->funding->our_funds;
-	channel->our_funds.satoshis += inflight->funding->splice_amnt;
+	channel->our_funds.satoshis += inflight->funding->splice_amnt; /* Raw: splicing */
 
 	/* Lease infos ! */
 	channel->lease_expiry = inflight->lease_expiry;