Merge pull request #4481 from wpaulino/remove-taproot

Remove TaprootChannelSigner and musig2 crate

Author: TheBlueMatt

Cargo.toml

@@ -63,7 +63,6 @@ check-cfg = [
     "cfg(c_bindings)",
     "cfg(ldk_bench)",
     "cfg(ldk_test_vectors)",
-    "cfg(taproot)",
     "cfg(require_route_graph_test)",
     "cfg(simple_close)",
     "cfg(peer_storage)",

ci/ci-tests-cfg-flags.sh

@@ -5,8 +5,6 @@ set -eox pipefail
 source "$(dirname "$0")/ci-tests-common.sh"
 
 echo -e "\n\nTest cfg-flag builds"
-RUSTFLAGS="--cfg=taproot" cargo test --quiet --color always -p lightning
-[ "$CI_MINIMIZE_DISK_USAGE" != "" ] && cargo clean
 RUSTFLAGS="--cfg=simple_close" cargo test --quiet --color always -p lightning
 [ "$CI_MINIMIZE_DISK_USAGE" != "" ] && cargo clean
 RUSTFLAGS="--cfg=peer_storage" cargo test --quiet --color always -p lightning

fuzz/Cargo.toml

@@ -62,5 +62,4 @@ check-cfg = [
     "cfg(fuzzing)",
     "cfg(secp256k1_fuzz)",
     "cfg(hashes_fuzz)",
-    "cfg(taproot)",
 ]

fuzz/src/chanmon_consistency.rs

@@ -448,8 +448,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-tests/Cargo.toml

@@ -29,6 +29,4 @@ level = "forbid"
 #
 # Note that Cargo automatically declares corresponding cfgs for every feature
 # defined in the member-level [features] tables as "expected".
-check-cfg = [
-    "cfg(taproot)",
-]
+check-cfg = []

lightning-tests/src/lib.rs

@@ -1,5 +1,5 @@
 #[cfg_attr(test, macro_use)]
 extern crate lightning;
 
-#[cfg(all(test, not(taproot)))]
+#[cfg(test)]
 pub mod upgrade_downgrade_tests;

lightning/Cargo.toml

@@ -65,8 +65,5 @@ features = ["bitcoinconsensus", "secp-recovery"]
 [target.'cfg(ldk_bench)'.dependencies]
 criterion = { version = "0.4", optional = true, default-features = false }
 
-[target.'cfg(taproot)'.dependencies]
-musig2 = { git = "https://github.com/arik-so/rust-musig2", rev = "6f95a05718cbb44d8fe3fa6021aea8117aa38d50" }
-
 [lints]
 workspace = true