Add RefundingV2 phase (for splicing)

Author: optout21

lightning/src/ln/channel.rs

@@ -1183,6 +1183,9 @@ enum ChannelPhase<SP: Deref> where SP::Target: SignerProvider {
 	UnfundedInboundV1(InboundV1Channel<SP>),
 	UnfundedV2(PendingV2Channel<SP>),
 	Funded(FundedChannel<SP>),
+	/// Used during splicing, channel is funded but a new funding is being renegotiated.
+	#[cfg(splicing)]
+	RefundingV2(FundedChannel<SP>),
 }
 
 impl<SP: Deref> Channel<SP> where
@@ -1196,6 +1199,8 @@ impl<SP: Deref> Channel<SP> where
 			ChannelPhase::UnfundedOutboundV1(chan) => &chan.context,
 			ChannelPhase::UnfundedInboundV1(chan) => &chan.context,
 			ChannelPhase::UnfundedV2(chan) => &chan.context,
+			#[cfg(splicing)]
+			ChannelPhase::RefundingV2(chan) => &chan.context,
 		}
 	}
 
@@ -1206,6 +1211,8 @@ impl<SP: Deref> Channel<SP> where
 			ChannelPhase::UnfundedOutboundV1(chan) => &mut chan.context,
 			ChannelPhase::UnfundedInboundV1(chan) => &mut chan.context,
 			ChannelPhase::UnfundedV2(chan) => &mut chan.context,
+			#[cfg(splicing)]
+			ChannelPhase::RefundingV2(chan) => &mut chan.context,
 		}
 	}
 
@@ -1216,6 +1223,8 @@ impl<SP: Deref> Channel<SP> where
 			ChannelPhase::UnfundedOutboundV1(chan) => &chan.funding,
 			ChannelPhase::UnfundedInboundV1(chan) => &chan.funding,
 			ChannelPhase::UnfundedV2(chan) => &chan.funding,
+			#[cfg(splicing)]
+			ChannelPhase::RefundingV2(chan) => &chan.funding,
 		}
 	}
 
@@ -1227,6 +1236,8 @@ impl<SP: Deref> Channel<SP> where
 			ChannelPhase::UnfundedOutboundV1(chan) => &mut chan.funding,
 			ChannelPhase::UnfundedInboundV1(chan) => &mut chan.funding,
 			ChannelPhase::UnfundedV2(chan) => &mut chan.funding,
+			#[cfg(splicing)]
+			ChannelPhase::RefundingV2(chan) => &mut chan.funding,
 		}
 	}
 
@@ -1237,6 +1248,8 @@ impl<SP: Deref> Channel<SP> where
 			ChannelPhase::UnfundedOutboundV1(chan) => (&chan.funding, &mut chan.context),
 			ChannelPhase::UnfundedInboundV1(chan) => (&chan.funding, &mut chan.context),
 			ChannelPhase::UnfundedV2(chan) => (&chan.funding, &mut chan.context),
+			#[cfg(splicing)]
+			ChannelPhase::RefundingV2(chan) => (&chan.funding, &mut chan.context),
 		}
 	}
 
@@ -1247,6 +1260,8 @@ impl<SP: Deref> Channel<SP> where
 			ChannelPhase::UnfundedOutboundV1(chan) => Some(&mut chan.unfunded_context),
 			ChannelPhase::UnfundedInboundV1(chan) => Some(&mut chan.unfunded_context),
 			ChannelPhase::UnfundedV2(chan) => Some(&mut chan.unfunded_context),
+			#[cfg(splicing)]
+			ChannelPhase::RefundingV2(_) => { debug_assert!(false); None },
 		}
 	}
 
@@ -1354,6 +1369,8 @@ impl<SP: Deref> Channel<SP> where
 				})
 			},
 			ChannelPhase::UnfundedV2(_) => None,
+			#[cfg(splicing)]
+			ChannelPhase::RefundingV2(chan) => Some(chan.signer_maybe_unblocked(logger)),
 		}
 	}
 
@@ -1373,6 +1390,8 @@ impl<SP: Deref> Channel<SP> where
 			ChannelPhase::UnfundedOutboundV1(chan) => chan.is_resumable(),
 			ChannelPhase::UnfundedInboundV1(_) => false,
 			ChannelPhase::UnfundedV2(_) => false,
+			#[cfg(splicing)]
+			ChannelPhase::RefundingV2(chan) => chan.remove_uncommitted_htlcs_and_mark_paused(logger).is_ok(),
 		}
 	}
 
@@ -1410,6 +1429,9 @@ impl<SP: Deref> Channel<SP> where
 					ReconnectionMsg::None
 				}
 			},
+			#[cfg(splicing)]
+			ChannelPhase::RefundingV2(chan) =>
+				ReconnectionMsg::Reestablish(chan.get_channel_reestablish(logger)),
 		}
 	}
 
@@ -1437,6 +1459,8 @@ impl<SP: Deref> Channel<SP> where
 					Ok(None)
 				}
 			},
+			#[cfg(splicing)]
+			ChannelPhase::RefundingV2(_) => Ok(None),
 		}
 	}