Add ChannelSigner::provide_funding_outpoint

Author: tankyleo

lightning/src/sign/mod.rs

@@ -811,6 +811,9 @@ pub trait ChannelSigner {
 	/// Provide counterparty parameters
 	fn provide_counterparty_parameters(&mut self, counterparty_keys: &ChannelTransactionParameters);
 
+	/// Provide funding outpoint
+	fn provide_funding_outpoint(&mut self, channel_parameters: &ChannelTransactionParameters);
+
 	/// Returns the parameters of this signer
 	fn get_channel_parameters(&self) -> Option<&ChannelTransactionParameters>;
 
@@ -1985,6 +1988,19 @@ impl ChannelSigner for InMemorySigner {
 		self.channel_parameters = Some(channel_parameters.clone());
 	}
 
+	fn provide_funding_outpoint(&mut self, channel_parameters: &ChannelTransactionParameters) {
+		assert!(channel_parameters.is_populated());
+		assert!(self.channel_parameters.as_ref().unwrap().counterparty_parameters.is_some());
+		if self.channel_parameters.as_ref().unwrap().funding_outpoint.is_some() {
+			assert_eq!(self.channel_parameters.as_ref().unwrap(), channel_parameters);
+		} else {
+			self.channel_parameters.as_mut().unwrap().funding_outpoint =
+				channel_parameters.funding_outpoint;
+			// Check that no other fields changed
+			assert_eq!(self.channel_parameters.as_ref(), Some(channel_parameters));
+		}
+	}
+
 	fn get_channel_parameters(&self) -> Option<&ChannelTransactionParameters> {
 		self.channel_parameters.as_ref()
 	}

lightning/src/util/test_channel_signer.rs

@@ -226,6 +226,10 @@ impl ChannelSigner for TestChannelSigner {
 		self.inner.get_channel_parameters()
 	}
 
+	fn provide_funding_outpoint(&mut self, channel_parameters: &ChannelTransactionParameters) {
+		self.inner.provide_funding_outpoint(channel_parameters);
+	}
+
 	fn punish_revokeable_output(
 		&self, justice_tx: &Transaction, input: usize, amount: u64, per_commitment_key: &SecretKey,
 		secp_ctx: &Secp256k1<secp256k1::All>, per_commitment_point: &PublicKey,