Remove musig2 crate

Taproot support is not planned we see an increase in demand for it by
users. The `musig2` crate is now owned by a third-party, and ultimately
won't be used by the production version of Taproot that we end up
releasing.

Author: wpaulino

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=lsps1_service" cargo test --quiet --color always -p lightning-liquidity

fuzz/Cargo.toml

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

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

lightning/src/ln/channel.rs

@@ -6002,8 +6002,6 @@ impl<SP: SignerProvider> ChannelContext<SP> {
 		signature.map(|(signature, _)| msgs::FundingSigned {
 			channel_id: self.channel_id(),
 			signature,
-			#[cfg(taproot)]
-			partial_signature_with_nonce: None,
 		})
 	}
 
@@ -6129,8 +6127,6 @@ impl<SP: SignerProvider> ChannelContext<SP> {
 				htlc_signatures,
 				signature,
 				funding_txid: funding.get_funding_txo().map(|funding_txo| funding_txo.txid),
-				#[cfg(taproot)]
-				partial_signature_with_nonce: None,
 			})
 		} else {
 			log_debug!(
@@ -9463,8 +9459,6 @@ where
 					channel_id: self.context.channel_id,
 					per_commitment_secret,
 					next_per_commitment_point: self.holder_commitment_point.next_point(),
-					#[cfg(taproot)]
-					next_local_nonce: None,
 					release_htlc_message_paths,
 				});
 			}
@@ -11519,7 +11513,7 @@ where
 						bitcoin_signature_2: if were_node_one { their_bitcoin_sig } else { our_bitcoin_sig },
 						contents: announcement,
 					})
-				}
+				},
 			}
 		} else {
 			Err(ChannelError::Ignore("Attempted to sign channel announcement before we'd received announcement_signatures".to_string()))
@@ -12729,8 +12723,6 @@ where
 					signature,
 					htlc_signatures,
 					funding_txid: funding.get_funding_txo().map(|funding_txo| funding_txo.txid),
-					#[cfg(taproot)]
-					partial_signature_with_nonce: None,
 				})
 				}
 			}
@@ -13310,10 +13302,6 @@ impl<SP: SignerProvider> OutboundV1Channel<SP> {
 			funding_txid: self.funding.channel_transaction_parameters.funding_outpoint.as_ref().unwrap().txid,
 			funding_output_index: self.funding.channel_transaction_parameters.funding_outpoint.as_ref().unwrap().index,
 			signature,
-			#[cfg(taproot)]
-			partial_signature_with_nonce: None,
-			#[cfg(taproot)]
-			next_local_nonce: None,
 		})
 	}
 
@@ -13718,8 +13706,6 @@ impl<SP: SignerProvider> InboundV1Channel<SP> {
 				channel_type: Some(self.funding.get_channel_type().clone()),
 			},
 			channel_reserve_satoshis: self.funding.holder_selected_channel_reserve_satoshis,
-			#[cfg(taproot)]
-			next_local_nonce: None,
 		})
 	}
 

lightning/src/ln/functional_tests.rs

@@ -6699,8 +6699,6 @@ pub fn test_counterparty_raa_skip_no_crash() {
 		channel_id,
 		per_commitment_secret,
 		next_per_commitment_point,
-		#[cfg(taproot)]
-		next_local_nonce: None,
 		release_htlc_message_paths: Vec::new(),
 	};
 	nodes[1].node.handle_revoke_and_ack(node_a_id, &raa);

lightning/src/ln/htlc_reserve_unit_tests.rs

@@ -930,8 +930,6 @@ pub fn do_test_fee_spike_buffer(cfg: Option<UserConfig>, htlc_fails: bool) {
 		signature: res.0,
 		htlc_signatures: res.1,
 		funding_txid: None,
-		#[cfg(taproot)]
-		partial_signature_with_nonce: None,
 	};
 
 	// Send the commitment_signed message to the nodes[1].
@@ -943,8 +941,6 @@ pub fn do_test_fee_spike_buffer(cfg: Option<UserConfig>, htlc_fails: bool) {
 		channel_id: chan.2,
 		per_commitment_secret: local_secret,
 		next_per_commitment_point: next_local_point,
-		#[cfg(taproot)]
-		next_local_nonce: None,
 		release_htlc_message_paths: Vec::new(),
 	};
 	nodes[1].node.handle_revoke_and_ack(node_a_id, &raa_msg);
@@ -2388,8 +2384,6 @@ pub fn do_test_dust_limit_fee_accounting(can_afford: bool) {
 			signature: res.0,
 			htlc_signatures: res.1,
 			funding_txid: None,
-			#[cfg(taproot)]
-			partial_signature_with_nonce: None,
 		};
 
 		// Send the commitment_signed message to the nodes[1].
@@ -2401,8 +2395,6 @@ pub fn do_test_dust_limit_fee_accounting(can_afford: bool) {
 			channel_id: chan_id,
 			per_commitment_secret: local_secret,
 			next_per_commitment_point: next_local_point,
-			#[cfg(taproot)]
-			next_local_nonce: None,
 			release_htlc_message_paths: Vec::new(),
 		};
 		nodes[1].node.handle_revoke_and_ack(node_a_id, &raa_msg);