Remove TaprootChannelSigner

We plan to have a single channel signer type going forward, so this is
unnecessary.

Author: wpaulino

fuzz/src/chanmon_consistency.rs

@@ -447,8 +447,6 @@ impl NodeSigner for KeyProvider {
 
 impl SignerProvider for KeyProvider {
 	type EcdsaSigner = TestChannelSigner;
-	#[cfg(taproot)]
-	type TaprootSigner = TestChannelSigner;
 
 	fn generate_channel_keys_id(&self, _inbound: bool, _user_channel_id: u128) -> [u8; 32] {
 		let id = self.rand_bytes_id.fetch_add(1, atomic::Ordering::Relaxed) as u8;

fuzz/src/full_stack.rs

@@ -457,8 +457,6 @@ impl NodeSigner for KeyProvider {
 
 impl SignerProvider for KeyProvider {
 	type EcdsaSigner = TestChannelSigner;
-	#[cfg(taproot)]
-	type TaprootSigner = TestChannelSigner;
 
 	fn generate_channel_keys_id(&self, inbound: bool, _user_channel_id: u128) -> [u8; 32] {
 		let ctr = self.counter.fetch_add(1, Ordering::Relaxed) as u8;

fuzz/src/onion_message.rs

@@ -296,8 +296,6 @@ impl NodeSigner for KeyProvider {
 
 impl SignerProvider for KeyProvider {
 	type EcdsaSigner = TestChannelSigner;
-	#[cfg(taproot)]
-	type TaprootSigner = TestChannelSigner;
 
 	fn generate_channel_keys_id(&self, _inbound: bool, _user_channel_id: u128) -> [u8; 32] {
 		unreachable!()

lightning-background-processor/src/lib.rs

@@ -378,18 +378,11 @@ type DynMessageRouter = lightning::onion_message::messenger::DefaultMessageRoute
 	&'static (dyn EntropySource + Send + Sync),
 >;
 
-#[cfg(all(not(c_bindings), not(taproot)))]
+#[cfg(not(c_bindings))]
 type DynSignerProvider = dyn lightning::sign::SignerProvider<EcdsaSigner = lightning::sign::InMemorySigner>
 	+ Send
 	+ Sync;
 
-#[cfg(all(not(c_bindings), taproot))]
-type DynSignerProvider = (dyn lightning::sign::SignerProvider<
-	EcdsaSigner = lightning::sign::InMemorySigner,
-	TaprootSigner = lightning::sign::InMemorySigner,
-> + Send
-     + Sync);
-
 #[cfg(not(c_bindings))]
 type DynChannelManager = lightning::ln::channelmanager::ChannelManager<
 	&'static (dyn chain::Watch<lightning::sign::InMemorySigner> + Send + Sync),

lightning/src/ln/channel.rs

@@ -2229,8 +2229,6 @@ where
 						splice_input_index as usize,
 						&context.secp_ctx,
 					),
-					#[cfg(taproot)]
-					ChannelSignerType::Taproot(_) => todo!(),
 				};
 				Some(sig)
 			} else {
@@ -5988,13 +5986,9 @@ impl<SP: SignerProvider> ChannelContext<SP> {
 
 		// We sign "counterparty" commitment transaction, allowing them to broadcast the tx if they wish.
 		let signature = match &self.holder_signer {
-			// TODO (arik): move match into calling method for Taproot
 			ChannelSignerType::Ecdsa(ecdsa) => ecdsa.sign_counterparty_commitment(
 				channel_parameters, &counterparty_initial_commitment_tx, Vec::new(), Vec::new(), &self.secp_ctx
 			).ok(),
-			// TODO (taproot|arik)
-			#[cfg(taproot)]
-			_ => todo!()
 		};
 
 		if signature.is_some() && self.signer_pending_funding {
@@ -6104,7 +6098,6 @@ impl<SP: SignerProvider> ChannelContext<SP> {
 		);
 		let counterparty_initial_commitment_tx = commitment_data.tx;
 		match self.holder_signer {
-			// TODO (taproot|arik): move match into calling method for Taproot
 			ChannelSignerType::Ecdsa(ref ecdsa) => {
 				let channel_parameters = &funding.channel_transaction_parameters;
 				ecdsa
@@ -6117,9 +6110,6 @@ impl<SP: SignerProvider> ChannelContext<SP> {
 					)
 					.ok()
 			},
-			// TODO (taproot|arik)
-			#[cfg(taproot)]
-			_ => todo!(),
 		}
 	}
 
@@ -8427,9 +8417,6 @@ where
 						ChannelError::close("Failed to validate revocation from peer".to_owned())
 					})?;
 			},
-			// TODO (taproot|arik)
-			#[cfg(taproot)]
-			_ => todo!(),
 		};
 
 		self.context
@@ -10384,9 +10371,6 @@ where
 					&self.context.secp_ctx,
 				)
 				.ok(),
-			// TODO (taproot|arik)
-			#[cfg(taproot)]
-			_ => todo!(),
 		};
 		if sig.is_none() {
 			log_trace!(logger, "Closing transaction signature unavailable, waiting on signer");
@@ -11505,10 +11489,7 @@ where
 					node_signature: our_node_sig,
 					bitcoin_signature: our_bitcoin_sig,
 				})
-			},
-			// TODO (taproot|arik)
-			#[cfg(taproot)]
-			_ => todo!()
+			}
 		}
 	}
 
@@ -11538,10 +11519,7 @@ where
 						bitcoin_signature_2: if were_node_one { their_bitcoin_sig } else { our_bitcoin_sig },
 						contents: announcement,
 					})
-				},
-				// TODO (taproot|arik)
-				#[cfg(taproot)]
-				_ => todo!()
+				}
 			}
 		} else {
 			Err(ChannelError::Ignore("Attempted to sign channel announcement before we'd received announcement_signatures".to_string()))
@@ -11883,8 +11861,6 @@ where
 			(Some(prev_funding_txid), ChannelSignerType::Ecdsa(ecdsa)) => {
 				ecdsa.new_funding_pubkey(prev_funding_txid, &self.context.secp_ctx)
 			},
-			#[cfg(taproot)]
-			_ => todo!(),
 		};
 
 		let funding_feerate_per_kw = context.funding_feerate_sat_per_1000_weight;
@@ -11989,8 +11965,6 @@ where
 			(Some(prev_funding_txid), ChannelSignerType::Ecdsa(ecdsa)) => {
 				ecdsa.new_funding_pubkey(prev_funding_txid, &self.context.secp_ctx)
 			},
-			#[cfg(taproot)]
-			_ => todo!(),
 		};
 		let mut new_keys = self.funding.get_holder_pubkeys().clone();
 		new_keys.funding_pubkey = funding_pubkey;
@@ -12758,11 +12732,8 @@ where
 					#[cfg(taproot)]
 					partial_signature_with_nonce: None,
 				})
-			},
-			// TODO (taproot|arik)
-			#[cfg(taproot)]
-			_ => todo!()
-		}
+				}
+			}
 	}
 
 	/// Adds a pending outbound HTLC to this channel, and builds a new remote commitment
@@ -13319,15 +13290,11 @@ impl<SP: SignerProvider> OutboundV1Channel<SP> {
 			&self.context.counterparty_next_commitment_point.unwrap(), false, false, logger);
 		let counterparty_initial_commitment_tx = commitment_data.tx;
 		let signature = match &self.context.holder_signer {
-			// TODO (taproot|arik): move match into calling method for Taproot
 			ChannelSignerType::Ecdsa(ecdsa) => {
 				let channel_parameters = &self.funding.channel_transaction_parameters;
 				ecdsa.sign_counterparty_commitment(channel_parameters, &counterparty_initial_commitment_tx, Vec::new(), Vec::new(), &self.context.secp_ctx)
 					.map(|(sig, _)| sig).ok()
 			},
-			// TODO (taproot|arik)
-			#[cfg(taproot)]
-			_ => todo!()
 		};
 
 		if signature.is_some() && self.context.signer_pending_funding {
@@ -15775,8 +15742,6 @@ mod tests {
 	#[cfg(ldk_test_vectors)]
 	impl SignerProvider for Keys {
 		type EcdsaSigner = InMemorySigner;
-		#[cfg(taproot)]
-		type TaprootSigner = InMemorySigner;
 
 		fn generate_channel_keys_id(&self, _inbound: bool, _user_channel_id: u128) -> [u8; 32] {
 			self.signer.channel_keys_id()

lightning/src/sign/mod.rs

@@ -65,8 +65,6 @@ use crate::util::transaction_utils;
 use crate::crypto::chacha20::ChaCha20;
 use crate::prelude::*;
 use crate::sign::ecdsa::EcdsaChannelSigner;
-#[cfg(taproot)]
-use crate::sign::taproot::TaprootChannelSigner;
 use crate::util::atomic_counter::AtomicCounter;
 
 use core::convert::TryInto;
@@ -79,8 +77,6 @@ use musig2::types::{PartialSignature, PublicNonce};
 pub(crate) mod type_resolver;
 
 pub mod ecdsa;
-#[cfg(taproot)]
-pub mod taproot;
 pub mod tx_builder;
 
 pub(crate) const COMPRESSED_PUBLIC_KEY_SIZE: usize = bitcoin::secp256k1::constants::PUBLIC_KEY_SIZE;
@@ -1084,18 +1080,7 @@ impl<T: OutputSpender + ?Sized, O: Deref<Target = T>> OutputSpender for O {
 /// A dynamic [`SignerProvider`] temporarily needed for doc tests.
 ///
 /// This is not exported to bindings users as it is not intended for public consumption.
-#[cfg(taproot)]
 #[doc(hidden)]
-#[deprecated(note = "Remove once taproot cfg is removed")]
-pub type DynSignerProvider =
-	dyn SignerProvider<EcdsaSigner = InMemorySigner, TaprootSigner = InMemorySigner>;
-
-/// A dynamic [`SignerProvider`] temporarily needed for doc tests.
-///
-/// This is not exported to bindings users as it is not intended for public consumption.
-#[cfg(not(taproot))]
-#[doc(hidden)]
-#[deprecated(note = "Remove once taproot cfg is removed")]
 pub type DynSignerProvider = dyn SignerProvider<EcdsaSigner = InMemorySigner>;
 
 /// A trait that can return signer instances for individual channels.
@@ -1109,9 +1094,6 @@ pub type DynSignerProvider = dyn SignerProvider<EcdsaSigner = InMemorySigner>;
 pub trait SignerProvider {
 	/// A type which implements [`EcdsaChannelSigner`] which will be returned by [`Self::derive_channel_signer`].
 	type EcdsaSigner: EcdsaChannelSigner;
-	#[cfg(taproot)]
-	/// A type which implements [`TaprootChannelSigner`]
-	type TaprootSigner: TaprootChannelSigner;
 
 	/// Generates a unique `channel_keys_id` that can be used to obtain a [`Self::EcdsaSigner`] through
 	/// [`SignerProvider::derive_channel_signer`]. The `user_channel_id` is provided to allow
@@ -1151,8 +1133,6 @@ pub trait SignerProvider {
 
 impl<T: SignerProvider + ?Sized, SP: Deref<Target = T>> SignerProvider for SP {
 	type EcdsaSigner = T::EcdsaSigner;
-	#[cfg(taproot)]
-	type TaprootSigner = T::TaprootSigner;
 
 	fn generate_channel_keys_id(&self, inbound: bool, user_channel_id: u128) -> [u8; 32] {
 		self.deref().generate_channel_keys_id(inbound, user_channel_id)
@@ -1983,65 +1963,6 @@ impl EcdsaChannelSigner for InMemorySigner {
 	}
 }
 
-#[cfg(taproot)]
-#[allow(unused)]
-impl TaprootChannelSigner for InMemorySigner {
-	fn generate_local_nonce_pair(
-		&self, commitment_number: u64, secp_ctx: &Secp256k1<All>,
-	) -> PublicNonce {
-		todo!()
-	}
-
-	fn partially_sign_counterparty_commitment(
-		&self, counterparty_nonce: PublicNonce, commitment_tx: &CommitmentTransaction,
-		inbound_htlc_preimages: Vec<PaymentPreimage>,
-		outbound_htlc_preimages: Vec<PaymentPreimage>, secp_ctx: &Secp256k1<All>,
-	) -> Result<(PartialSignatureWithNonce, Vec<schnorr::Signature>), ()> {
-		todo!()
-	}
-
-	fn finalize_holder_commitment(
-		&self, commitment_tx: &HolderCommitmentTransaction,
-		counterparty_partial_signature: PartialSignatureWithNonce, secp_ctx: &Secp256k1<All>,
-	) -> Result<PartialSignature, ()> {
-		todo!()
-	}
-
-	fn sign_justice_revoked_output(
-		&self, justice_tx: &Transaction, input: usize, amount: u64, per_commitment_key: &SecretKey,
-		secp_ctx: &Secp256k1<All>,
-	) -> Result<schnorr::Signature, ()> {
-		todo!()
-	}
-
-	fn sign_justice_revoked_htlc(
-		&self, justice_tx: &Transaction, input: usize, amount: u64, per_commitment_key: &SecretKey,
-		htlc: &HTLCOutputInCommitment, secp_ctx: &Secp256k1<All>,
-	) -> Result<schnorr::Signature, ()> {
-		todo!()
-	}
-
-	fn sign_holder_htlc_transaction(
-		&self, htlc_tx: &Transaction, input: usize, htlc_descriptor: &HTLCDescriptor,
-		secp_ctx: &Secp256k1<All>,
-	) -> Result<schnorr::Signature, ()> {
-		todo!()
-	}
-
-	fn sign_counterparty_htlc_transaction(
-		&self, htlc_tx: &Transaction, input: usize, amount: u64, per_commitment_point: &PublicKey,
-		htlc: &HTLCOutputInCommitment, secp_ctx: &Secp256k1<All>,
-	) -> Result<schnorr::Signature, ()> {
-		todo!()
-	}
-
-	fn partially_sign_closing_transaction(
-		&self, closing_tx: &ClosingTransaction, secp_ctx: &Secp256k1<All>,
-	) -> Result<PartialSignature, ()> {
-		todo!()
-	}
-}
-
 /// Simple implementation of [`EntropySource`], [`NodeSigner`], and [`SignerProvider`] that takes a
 /// 32-byte seed for use as a BIP 32 extended key and derives keys from that.
 ///
@@ -2548,8 +2469,6 @@ impl OutputSpender for KeysManager {
 
 impl SignerProvider for KeysManager {
 	type EcdsaSigner = InMemorySigner;
-	#[cfg(taproot)]
-	type TaprootSigner = InMemorySigner;
 
 	fn generate_channel_keys_id(&self, _inbound: bool, user_channel_id: u128) -> [u8; 32] {
 		let child_idx = self.channel_child_index.fetch_add(1, Ordering::AcqRel);
@@ -2697,8 +2616,6 @@ impl OutputSpender for PhantomKeysManager {
 
 impl SignerProvider for PhantomKeysManager {
 	type EcdsaSigner = InMemorySigner;
-	#[cfg(taproot)]
-	type TaprootSigner = InMemorySigner;
 
 	fn generate_channel_keys_id(&self, inbound: bool, user_channel_id: u128) -> [u8; 32] {
 		self.inner.generate_channel_keys_id(inbound, user_channel_id)