Merge pull request #2755 from arik-so/arik/taproot-2023-11-followup-2512

Followups to 2512

Author: TheBlueMatt

lightning/src/ln/channel.rs

@@ -2145,6 +2145,7 @@ impl<SP: Deref> ChannelContext<SP> where SP::Target: SignerProvider  {
 					.map(|(sig, _)| sig).ok()?
 			},
 			// TODO (taproot|arik)
+			#[cfg(taproot)]
 			_ => todo!()
 		};
 
@@ -2199,6 +2200,7 @@ impl<SP: Deref> ChannelContext<SP> where SP::Target: SignerProvider  {
 				(counterparty_initial_commitment_tx, funding_signed)
 			},
 			// TODO (taproot|arik)
+			#[cfg(taproot)]
 			_ => todo!()
 		}
 	}
@@ -3492,6 +3494,7 @@ impl<SP: Deref> Channel<SP> where
 				).map_err(|_| ChannelError::Close("Failed to validate revocation from peer".to_owned()))?;
 			},
 			// TODO (taproot|arik)
+			#[cfg(taproot)]
 			_ => todo!()
 		};
 
@@ -4447,6 +4450,7 @@ impl<SP: Deref> Channel<SP> where
 				}), None, None))
 			},
 			// TODO (taproot|arik)
+			#[cfg(taproot)]
 			_ => todo!()
 		}
 	}
@@ -4700,6 +4704,7 @@ impl<SP: Deref> Channel<SP> where
 						}), signed_tx, shutdown_result))
 					},
 					// TODO (taproot|arik)
+					#[cfg(taproot)]
 					_ => todo!()
 				}
 			}
@@ -5333,6 +5338,7 @@ impl<SP: Deref> Channel<SP> where
 				})
 			},
 			// TODO (taproot|arik)
+			#[cfg(taproot)]
 			_ => todo!()
 		}
 	}
@@ -5362,6 +5368,7 @@ impl<SP: Deref> Channel<SP> where
 					})
 				},
 				// TODO (taproot|arik)
+				#[cfg(taproot)]
 				_ => todo!()
 			}
 		} else {
@@ -5737,6 +5744,7 @@ impl<SP: Deref> Channel<SP> where
 				}, (counterparty_commitment_txid, commitment_stats.htlcs_included)))
 			},
 			// TODO (taproot|arik)
+			#[cfg(taproot)]
 			_ => todo!()
 		}
 	}
@@ -9105,7 +9113,7 @@ use crate::ln::channelmanager::{self, HTLCSource, PaymentId};
 		assert_eq!(chan_utils::build_commitment_secret(&seed, 1),
 		           <Vec<u8>>::from_hex("915c75942a26bb3a433a8ce2cb0427c29ec6c1775cfc78328b57f6ba7bfeaa9c").unwrap()[..]);
 	}
-	
+
 	#[test]
 	fn test_key_derivation() {
 		// Test vectors from BOLT 3 Appendix E:

lightning/src/sign/ecdsa.rs

@@ -40,11 +40,6 @@ pub trait EcdsaChannelSigner: ChannelSigner {
 	fn sign_counterparty_commitment(&self, commitment_tx: &CommitmentTransaction,
 		preimages: Vec<PaymentPreimage>, secp_ctx: &Secp256k1<secp256k1::All>
 	) -> Result<(Signature, Vec<Signature>), ()>;
-	/// Validate the counterparty's revocation.
-	///
-	/// This is required in order for the signer to make sure that the state has moved
-	/// forward and it is safe to sign the next counterparty commitment.
-	fn validate_counterparty_revocation(&self, idx: u64, secret: &SecretKey) -> Result<(), ()>;
 	/// Creates a signature for a holder's commitment transaction.
 	///
 	/// This will be called

lightning/src/sign/mod.rs

@@ -57,7 +57,7 @@ use core::convert::TryInto;
 use core::ops::Deref;
 use core::sync::atomic::{AtomicUsize, Ordering};
 #[cfg(taproot)]
-use musig2::types::{PartialSignature, PublicNonce, SecretNonce};
+use musig2::types::{PartialSignature, PublicNonce};
 use crate::io::{self, Error};
 use crate::ln::features::ChannelTypeFeatures;
 use crate::ln::msgs::{DecodeError, MAX_VALUE_MSAT};
@@ -603,6 +603,12 @@ pub trait ChannelSigner {
 	fn validate_holder_commitment(&self, holder_tx: &HolderCommitmentTransaction,
 		preimages: Vec<PaymentPreimage>) -> Result<(), ()>;
 
+	/// Validate the counterparty's revocation.
+	///
+	/// This is required in order for the signer to make sure that the state has moved
+	/// forward and it is safe to sign the next counterparty commitment.
+	fn validate_counterparty_revocation(&self, idx: u64, secret: &SecretKey) -> Result<(), ()>;
+
 	/// Returns the holder's channel public keys and basepoints.
 	fn pubkeys(&self) -> &ChannelPublicKeys;
 
@@ -1084,6 +1090,10 @@ impl ChannelSigner for InMemorySigner {
 		Ok(())
 	}
 
+	fn validate_counterparty_revocation(&self, _idx: u64, _secret: &SecretKey) -> Result<(), ()> {
+		Ok(())
+	}
+
 	fn pubkeys(&self) -> &ChannelPublicKeys { &self.holder_channel_pubkeys }
 
 	fn channel_keys_id(&self) -> [u8; 32] { self.channel_keys_id }
@@ -1131,10 +1141,6 @@ impl EcdsaChannelSigner for InMemorySigner {
 		Ok((commitment_sig, htlc_sigs))
 	}
 
-	fn validate_counterparty_revocation(&self, _idx: u64, _secret: &SecretKey) -> Result<(), ()> {
-		Ok(())
-	}
-
 	fn sign_holder_commitment(&self, commitment_tx: &HolderCommitmentTransaction, secp_ctx: &Secp256k1<secp256k1::All>) -> Result<Signature, ()> {
 		let funding_pubkey = PublicKey::from_secret_key(secp_ctx, &self.funding_key);
 		let counterparty_keys = self.counterparty_pubkeys().expect(MISSING_PARAMS_ERR);
@@ -1258,7 +1264,7 @@ impl TaprootChannelSigner for InMemorySigner {
 		todo!()
 	}
 
-	fn finalize_holder_commitment(&self, commitment_number: u64, commitment_tx: &HolderCommitmentTransaction, counterparty_partial_signature: PartialSignatureWithNonce, secp_ctx: &Secp256k1<All>) -> Result<PartialSignature, ()> {
+	fn finalize_holder_commitment(&self, commitment_tx: &HolderCommitmentTransaction, counterparty_partial_signature: PartialSignatureWithNonce, secp_ctx: &Secp256k1<All>) -> Result<PartialSignature, ()> {
 		todo!()
 	}
 

lightning/src/sign/taproot.rs

@@ -51,8 +51,7 @@ pub trait TaprootChannelSigner: ChannelSigner {
 	/// An external signer implementation should check that the commitment has not been revoked.
 	///
 	// TODO: Document the things someone using this interface should enforce before signing.
-	fn finalize_holder_commitment(&self, commitment_number: u64,
-		commitment_tx: &HolderCommitmentTransaction,
+	fn finalize_holder_commitment(&self, commitment_tx: &HolderCommitmentTransaction,
 		counterparty_partial_signature: PartialSignatureWithNonce,
 		secp_ctx: &Secp256k1<secp256k1::All>
 	) -> Result<PartialSignature, ()>;

lightning/src/util/test_channel_signer.rs

@@ -146,6 +146,16 @@ impl ChannelSigner for TestChannelSigner {
 		Ok(())
 	}
 
+	fn validate_counterparty_revocation(&self, idx: u64, _secret: &SecretKey) -> Result<(), ()> {
+		if !*self.available.lock().unwrap() {
+			return Err(());
+		}
+		let mut state = self.state.lock().unwrap();
+		assert!(idx == state.last_counterparty_revoked_commitment || idx == state.last_counterparty_revoked_commitment - 1, "expecting to validate the current or next counterparty revocation - trying {}, current {}", idx, state.last_counterparty_revoked_commitment);
+		state.last_counterparty_revoked_commitment = idx;
+		Ok(())
+	}
+
 	fn pubkeys(&self) -> &ChannelPublicKeys { self.inner.pubkeys() }
 
 	fn channel_keys_id(&self) -> [u8; 32] { self.inner.channel_keys_id() }
@@ -178,16 +188,6 @@ impl EcdsaChannelSigner for TestChannelSigner {
 		Ok(self.inner.sign_counterparty_commitment(commitment_tx, preimages, secp_ctx).unwrap())
 	}
 
-	fn validate_counterparty_revocation(&self, idx: u64, _secret: &SecretKey) -> Result<(), ()> {
-		if !*self.available.lock().unwrap() {
-			return Err(());
-		}
-		let mut state = self.state.lock().unwrap();
-		assert!(idx == state.last_counterparty_revoked_commitment || idx == state.last_counterparty_revoked_commitment - 1, "expecting to validate the current or next counterparty revocation - trying {}, current {}", idx, state.last_counterparty_revoked_commitment);
-		state.last_counterparty_revoked_commitment = idx;
-		Ok(())
-	}
-
 	fn sign_holder_commitment(&self, commitment_tx: &HolderCommitmentTransaction, secp_ctx: &Secp256k1<secp256k1::All>) -> Result<Signature, ()> {
 		if !*self.available.lock().unwrap() {
 			return Err(());
@@ -292,7 +292,7 @@ impl TaprootChannelSigner for TestChannelSigner {
 		todo!()
 	}
 
-	fn finalize_holder_commitment(&self, commitment_number: u64, commitment_tx: &HolderCommitmentTransaction, counterparty_partial_signature: PartialSignatureWithNonce, secp_ctx: &Secp256k1<All>) -> Result<PartialSignature, ()> {
+	fn finalize_holder_commitment(&self, commitment_tx: &HolderCommitmentTransaction, counterparty_partial_signature: PartialSignatureWithNonce, secp_ctx: &Secp256k1<All>) -> Result<PartialSignature, ()> {
 		todo!()
 	}