Rename; remove redeem_script, signer can derive it

lightning/src/sign/ecdsa.rs

@@ -1,6 +1,6 @@
 //! Defines ECDSA-specific signer types.
 
-use bitcoin::{Script, Transaction};
+use bitcoin::transaction::Transaction;
 
 use bitcoin::secp256k1;
 use bitcoin::secp256k1::ecdsa::Signature;
@@ -213,8 +213,8 @@ pub trait EcdsaChannelSigner: ChannelSigner {
 	/// Used for splicing, when signing the previous funding transaction.
 	/// The previous funding transaction becomes an input to the new funding transaction,
 	/// and it is a multisig, which we also need to sign.
-	fn sign_transaction_input(
-		&self, tx: &Transaction, input_index: u16, input_value: u64, input_redeem_script: &Script,
+	fn sign_splicing_funding_input(
+		&self, tx: &Transaction, input_index: u16, input_value: u64,
 		secp_ctx: &Secp256k1<secp256k1::All>,
 	) -> Result<Signature, ()>;
 }

lightning/src/sign/mod.rs

@@ -1696,14 +1696,19 @@ impl EcdsaChannelSigner for InMemorySigner {
 		Ok(secp_ctx.sign_ecdsa(&msghash, &self.funding_key))
 	}
 
-	fn sign_transaction_input(
-		&self, tx: &Transaction, input_index: u16, input_value: u64, input_redeem_script: &Script,
+	fn sign_splicing_funding_input(
+		&self, tx: &Transaction, input_index: u16, input_value: u64,
 		secp_ctx: &Secp256k1<secp256k1::All>,
 	) -> Result<Signature, ()> {
+		let funding_pubkey = PublicKey::from_secret_key(secp_ctx, &self.funding_key);
+		let counterparty_funding_key =
+			&self.counterparty_pubkeys().expect(MISSING_PARAMS_ERR).funding_pubkey;
+		let funding_redeemscript =
+			make_funding_redeemscript(&funding_pubkey, counterparty_funding_key);
 		let sighash = &sighash::SighashCache::new(tx)
 			.p2wsh_signature_hash(
 				input_index as usize,
-				&input_redeem_script,
+				&funding_redeemscript,
 				Amount::from_sat(input_value),
 				EcdsaSighashType::All,
 			)

lightning/src/util/test_channel_signer.rs

@@ -22,7 +22,7 @@ use core::cmp;
 use crate::sync::{Mutex, Arc};
 #[cfg(test)] use crate::sync::MutexGuard;
 
-use bitcoin::{Script, Transaction};
+use bitcoin::transaction::Transaction;
 use bitcoin::hashes::Hash;
 use bitcoin::sighash;
 use bitcoin::sighash::EcdsaSighashType;
@@ -354,16 +354,11 @@ impl EcdsaChannelSigner for TestChannelSigner {
 		self.inner.sign_channel_announcement_with_funding_key(msg, secp_ctx)
 	}
 
-	fn sign_transaction_input(
-		&self, tx: &Transaction, input_index: u16, input_value: u64, input_redeem_script: &Script, secp_ctx: &Secp256k1<secp256k1::All>
+	fn sign_splicing_funding_input(
+		&self, tx: &Transaction, input_index: u16, input_value: u64,
+		secp_ctx: &Secp256k1<secp256k1::All>,
 	) -> Result<Signature, ()> {
-		self.inner.sign_transaction_input(
-			tx,
-			input_index,
-			input_value,
-			input_redeem_script,
-			secp_ctx,
-		)
+		self.inner.sign_splicing_funding_input(tx, input_index, input_value, secp_ctx)
 	}
 }