f - remove secp256k1 dependency

Author: jkczyz

lightning/Cargo.toml

@@ -41,7 +41,6 @@ default = ["std", "grind_signatures"]
 
 [dependencies]
 bitcoin = { version = "0.30.2", default-features = false, features = ["secp-recovery"] }
-secp256k1 = { version = "0.27", features = ["global-context", "recovery"] }
 
 hashbrown = { version = "0.8", optional = true }
 hex = { package = "hex-conservative", version = "0.1.1", default-features = false }

lightning/src/ln/channelmanager.rs

@@ -102,7 +102,7 @@ use crate::ln::script::ShutdownScript;
 type OfferBuilder<'a> =
 	crate::offers::offer::OfferBuilder<'a, crate::offers::offer::DerivedMetadata, secp256k1::All>;
 #[cfg(c_bindings)]
-type OfferBuilder = crate::offers::offer::OfferWithDerivedMetadataBuilder;
+type OfferBuilder<'a> = crate::offers::offer::OfferWithDerivedMetadataBuilder<'a>;
 
 // We hold various information about HTLC relay in the HTLC objects in Channel itself:
 //

lightning/src/offers/offer.rs

@@ -123,8 +123,9 @@ pub struct OfferBuilder<'a, M: MetadataStrategy, T: secp256k1::Signing> {
 ///
 /// [module-level documentation]: self
 #[cfg(c_bindings)]
-pub struct OfferWithExplicitMetadataBuilder {
+pub struct OfferWithExplicitMetadataBuilder<'a> {
 	offer: OfferContents,
+	secp_ctx: Option<&'a Secp256k1<secp256k1::All>>,
 }
 
 /// Builds an [`Offer`] for the "offer to be paid" flow.
@@ -133,8 +134,9 @@ pub struct OfferWithExplicitMetadataBuilder {
 ///
 /// [module-level documentation]: self
 #[cfg(c_bindings)]
-pub struct OfferWithDerivedMetadataBuilder {
+pub struct OfferWithDerivedMetadataBuilder<'a> {
 	offer: OfferContents,
+	secp_ctx: Option<&'a Secp256k1<secp256k1::All>>,
 }
 
 /// Indicates how [`Offer::metadata`] may be set.
@@ -180,7 +182,6 @@ macro_rules! offer_explicit_metadata_builder_methods { (
 			},
 			#[cfg(not(c_bindings))]
 			metadata_strategy: core::marker::PhantomData,
-			#[cfg(not(c_bindings))]
 			secp_ctx: None,
 		}
 	}
@@ -211,7 +212,7 @@ macro_rules! offer_derived_metadata_builder_methods { () => {
 		#[cfg(not(c_bindings))]
 		secp_ctx: &'a Secp256k1<T>,
 		#[cfg(c_bindings)]
-		_secp_ctx: &Secp256k1<secp256k1::All>,
+		secp_ctx: &'a Secp256k1<secp256k1::All>,
 	) -> Self where ES::Target: EntropySource {
 		let nonce = Nonce::from_entropy_source(entropy_source);
 		let derivation_material = MetadataMaterial::new(nonce, expanded_key, IV_BYTES, None);
@@ -224,7 +225,6 @@ macro_rules! offer_derived_metadata_builder_methods { () => {
 			},
 			#[cfg(not(c_bindings))]
 			metadata_strategy: core::marker::PhantomData,
-			#[cfg(not(c_bindings))]
 			secp_ctx: Some(secp_ctx),
 		}
 	}
@@ -345,7 +345,7 @@ macro_rules! offer_builder_methods { (
 					tlv_stream.node_id = None;
 				}
 
-				let (derived_metadata, keys) = metadata.derive_from(tlv_stream, $self.secp_ctx());
+				let (derived_metadata, keys) = metadata.derive_from(tlv_stream, $self.secp_ctx);
 				metadata = derived_metadata;
 				if let Some(keys) = keys {
 					$self.offer.signing_pubkey = keys.public_key();
@@ -390,10 +390,6 @@ macro_rules! offer_builder_test_methods { (
 impl<'a, M: MetadataStrategy, T: secp256k1::Signing> OfferBuilder<'a, M, T> {
 	offer_builder_methods!(self, Self, Self, self);
 
-	fn secp_ctx(&self) -> Option<&Secp256k1<T>> {
-		self.secp_ctx
-	}
-
 	#[cfg(test)]
 	offer_builder_test_methods!(self, Self, Self, self);
 }
@@ -409,7 +405,7 @@ impl<'a, T: secp256k1::Signing> OfferBuilder<'a, DerivedMetadata, T> {
 }
 
 #[cfg(c_bindings)]
-impl OfferWithExplicitMetadataBuilder {
+impl<'a> OfferWithExplicitMetadataBuilder<'a> {
 	#[cfg(not(test))]
 	offer_explicit_metadata_builder_methods!(self, &mut Self, (), ());
 	#[cfg(not(test))]
@@ -419,28 +415,18 @@ impl OfferWithExplicitMetadataBuilder {
 	offer_explicit_metadata_builder_methods!(self, &mut Self, &mut Self, self);
 	#[cfg(test)]
 	offer_builder_methods!(self, &mut Self, &mut Self, self);
-
-	fn secp_ctx(&self) -> Option<&Secp256k1<secp256k1::All>> {
-		None
-	}
-
 	#[cfg(test)]
 	offer_builder_test_methods!(self, &mut Self, &mut Self, self);
 }
 
 #[cfg(c_bindings)]
-impl OfferWithDerivedMetadataBuilder {
+impl<'a> OfferWithDerivedMetadataBuilder<'a> {
 	offer_derived_metadata_builder_methods!();
 	#[cfg(not(test))]
 	offer_builder_methods!(self, &mut Self, (), ());
 
 	#[cfg(test)]
 	offer_builder_methods!(self, &mut Self, &mut Self, self);
-
-	fn secp_ctx(&self) -> Option<&Secp256k1<secp256k1::All>> {
-		Some(secp256k1::SECP256K1.deref())
-	}
-
 	#[cfg(test)]
 	offer_builder_test_methods!(self, &mut Self, &mut Self, self);
 }