Remove ChannelSigner::provide_channel_parameters

Author: jkczyz

lightning/src/chain/onchaintx.rs

@@ -25,7 +25,7 @@ use bitcoin::secp256k1::{Secp256k1, ecdsa::Signature};
 use bitcoin::secp256k1;
 
 use crate::chain::chaininterface::{ConfirmationTarget, compute_feerate_sat_per_1000_weight};
-use crate::sign::{ChannelDerivationParameters, HTLCDescriptor, ChannelSigner, EntropySource, SignerProvider, ecdsa::EcdsaChannelSigner};
+use crate::sign::{ChannelDerivationParameters, HTLCDescriptor, EntropySource, SignerProvider, ecdsa::EcdsaChannelSigner};
 use crate::ln::msgs::DecodeError;
 use crate::types::payment::PaymentPreimage;
 use crate::ln::chan_utils::{self, ChannelTransactionParameters, HTLCOutputInCommitment, HolderCommitmentTransaction};
@@ -386,8 +386,7 @@ impl<'a, 'b, ES: EntropySource, SP: SignerProvider> ReadableArgs<(&'a ES, &'b SP
 			bytes_read += bytes_to_read;
 		}
 
-		let mut signer = signer_provider.derive_channel_signer(channel_value_satoshis, channel_keys_id);
-		signer.provide_channel_parameters(&channel_parameters);
+		let signer = signer_provider.derive_channel_signer(channel_value_satoshis, channel_keys_id);
 
 		let pending_claim_requests_len: u64 = Readable::read(reader)?;
 		let mut pending_claim_requests = hash_map_with_capacity(cmp::min(pending_claim_requests_len as usize, MAX_ALLOC_SIZE / 128));

lightning/src/events/bump_transaction.rs

@@ -97,12 +97,10 @@ impl AnchorDescriptor {
 	where
 		SP::Target: SignerProvider<EcdsaSigner= S>
 	{
-		let mut signer = signer_provider.derive_channel_signer(
+		signer_provider.derive_channel_signer(
 			self.channel_derivation_parameters.value_satoshis,
 			self.channel_derivation_parameters.keys_id,
-		);
-		signer.provide_channel_parameters(&self.channel_derivation_parameters.transaction_parameters);
-		signer
+		)
 	}
 }
 

lightning/src/ln/channel.rs

@@ -2056,8 +2056,7 @@ trait InitialRemoteCommitmentReceiver<SP: Deref> where SP::Target: SignerProvide
 		let funding_txo_script = funding_redeemscript.to_p2wsh();
 		let obscure_factor = get_commitment_transaction_number_obscure_factor(&funding.get_holder_pubkeys().payment_point, &funding.get_counterparty_pubkeys().payment_point, funding.is_outbound());
 		let shutdown_script = context.shutdown_scriptpubkey.clone().map(|script| script.into_inner());
-		let mut monitor_signer = signer_provider.derive_channel_signer(funding.get_value_satoshis(), context.channel_keys_id);
-		monitor_signer.provide_channel_parameters(&funding.channel_transaction_parameters);
+		let monitor_signer = signer_provider.derive_channel_signer(funding.get_value_satoshis(), context.channel_keys_id);
 		// TODO(RBF): When implementing RBF, the funding_txo passed here must only update
 		// ChannelMonitorImp::first_confirmed_funding_txo during channel establishment, not splicing
 		let channel_monitor = ChannelMonitor::new(context.secp_ctx.clone(), monitor_signer,
@@ -2252,7 +2251,6 @@ impl<SP: Deref> PendingV2Channel<SP> where SP::Target: SignerProvider {
 				))).map_err(|e| (self, e));
 		};
 		self.funding.channel_transaction_parameters.funding_outpoint = Some(outpoint);
-		self.context.holder_signer.as_mut().provide_channel_parameters(&self.funding.channel_transaction_parameters);
 
 		self.context.assert_no_commitment_advancement(transaction_number, "initial commitment_signed");
 		let commitment_signed = self.context.get_initial_commitment_signed(&self.funding, logger);
@@ -4465,15 +4463,14 @@ impl<SP: Deref> ChannelContext<SP> where SP::Target: SignerProvider {
 
 	#[cfg(all(test, dual_funding))]
 	pub fn get_initial_counterparty_commitment_signature_for_test<L: Deref>(
-		&mut self, funding: &mut FundingScope, logger: &L, channel_transaction_parameters: ChannelTransactionParameters,
+		&mut self, funding: &mut FundingScope, logger: &L,
 		counterparty_cur_commitment_point_override: PublicKey,
 	) -> Result<Signature, ChannelError>
 	where
 		SP::Target: SignerProvider,
 		L::Target: Logger
 	{
 		self.counterparty_cur_commitment_point = Some(counterparty_cur_commitment_point_override);
-		funding.channel_transaction_parameters = channel_transaction_parameters;
 		self.get_initial_counterparty_commitment_signature(funding, logger)
 	}
 }
@@ -8736,7 +8733,6 @@ impl<SP: Deref> OutboundV1Channel<SP> where SP::Target: SignerProvider {
 		self.context.assert_no_commitment_advancement(self.unfunded_context.transaction_number(), "funding_created");
 
 		self.funding.channel_transaction_parameters.funding_outpoint = Some(funding_txo);
-		self.context.holder_signer.as_mut().provide_channel_parameters(&self.funding.channel_transaction_parameters);
 
 		// Now that we're past error-generating stuff, update our local state:
 
@@ -9124,9 +9120,6 @@ impl<SP: Deref> InboundV1Channel<SP> where SP::Target: SignerProvider {
 
 		let funding_txo = OutPoint { txid: msg.funding_txid, index: msg.funding_output_index };
 		self.funding.channel_transaction_parameters.funding_outpoint = Some(funding_txo);
-		// This is an externally observable change before we finish all our checks.  In particular
-		// check_funding_created_signature may fail.
-		self.context.holder_signer.as_mut().provide_channel_parameters(&self.funding.channel_transaction_parameters);
 
 		let (channel_monitor, counterparty_initial_commitment_tx) = match self.initial_commitment_signed(
 			ChannelId::v1_from_funding_outpoint(funding_txo), msg.signature,
@@ -10266,12 +10259,7 @@ impl<'a, 'b, 'c, ES: Deref, SP: Deref> ReadableArgs<(&'a ES, &'b SP, u32, &'c Ch
 		});
 
 		let (channel_keys_id, holder_signer) = if let Some(channel_keys_id) = channel_keys_id {
-			let mut holder_signer = signer_provider.derive_channel_signer(channel_value_satoshis, channel_keys_id);
-			// If we've gotten to the funding stage of the channel, populate the signer with its
-			// required channel parameters.
-			if channel_state >= ChannelState::FundingNegotiated {
-				holder_signer.provide_channel_parameters(&channel_parameters);
-			}
+			let holder_signer = signer_provider.derive_channel_signer(channel_value_satoshis, channel_keys_id);
 			(channel_keys_id, holder_signer)
 		} else {
 			// `keys_data` can be `None` if we had corrupted data.
@@ -11291,7 +11279,6 @@ mod tests {
 				selected_contest_delay: 144
 			});
 		chan.funding.channel_transaction_parameters.funding_outpoint = Some(funding_info);
-		signer.provide_channel_parameters(&chan.funding.channel_transaction_parameters);
 
 		assert_eq!(counterparty_pubkeys.payment_point.serialize()[..],
 		           <Vec<u8>>::from_hex("032c0b7cf95324a07d05398b240174dc0c2be444d96b159aa6c7f7b1e668680991").unwrap()[..]);

lightning/src/ln/dual_funding_tests.rs

@@ -24,7 +24,6 @@ use {
 	crate::ln::msgs::{CommitmentSigned, TxAddInput, TxAddOutput, TxComplete},
 	crate::ln::types::ChannelId,
 	crate::prelude::*,
-	crate::sign::ChannelSigner as _,
 	crate::util::ser::TransactionU16LenLimited,
 	crate::util::test_utils,
 };
@@ -145,7 +144,7 @@ fn do_test_v2_channel_establishment(
 		(channel_funding.get_funding_txo(), channel_context.get_channel_type().clone())
 	};
 
-	let channel_transaction_parameters = ChannelTransactionParameters {
+	channel.funding.channel_transaction_parameters = ChannelTransactionParameters {
 		counterparty_parameters: Some(CounterpartyChannelTransactionParameters {
 			pubkeys: ChannelPublicKeys {
 				funding_pubkey: accept_channel_v2_msg.common_fields.funding_pubkey,
@@ -178,21 +177,13 @@ fn do_test_v2_channel_establishment(
 		channel_value_satoshis: funding_satoshis,
 	};
 
-	channel
-		.context
-		.get_mut_signer()
-		.as_mut_ecdsa()
-		.unwrap()
-		.provide_channel_parameters(&channel_transaction_parameters);
-
 	let msg_commitment_signed_from_0 = CommitmentSigned {
 		channel_id,
 		signature: channel
 			.context
 			.get_initial_counterparty_commitment_signature_for_test(
 				&mut channel.funding,
 				&&logger_a,
-				channel_transaction_parameters,
 				accept_channel_v2_msg.common_fields.first_per_commitment_point,
 			)
 			.unwrap(),