f - UnsignedBolt12Invoice impl for c_bindings

Author: jkczyz

lightning/src/ln/channelmanager.rs

@@ -9299,7 +9299,9 @@ where
 						builder.map(|b| b.into());
 					let response = builder.and_then(|builder| builder.allow_mpp().build())
 						.map_err(|e| OffersMessage::InvoiceError(e.into()))
-						.and_then(|invoice|
+						.and_then(|invoice| {
+							#[cfg(c_bindings)]
+							let mut invoice = invoice;
 							match invoice.sign(|invoice| self.node_signer.sign_bolt12_invoice(invoice)) {
 								Ok(invoice) => Ok(OffersMessage::Invoice(invoice)),
 								Err(SignError::Signing(())) => Err(OffersMessage::InvoiceError(
@@ -9308,7 +9310,8 @@ where
 								Err(SignError::Verification(_)) => Err(OffersMessage::InvoiceError(
 										InvoiceError::from_string("Failed invoice signature verification".to_string())
 								)),
-							});
+							}
+						});
 					match response {
 						Ok(invoice) => Some(invoice),
 						Err(error) => Some(error),

lightning/src/offers/invoice.rs

@@ -318,7 +318,7 @@ macro_rules! invoice_derived_signing_pubkey_builder_methods { ($self: ident, $se
 		#[cfg(not(c_bindings))]
 		let unsigned_invoice = UnsignedBolt12Invoice::new(invreq_bytes, invoice);
 		#[cfg(c_bindings)]
-		let unsigned_invoice = UnsignedBolt12Invoice::new(invreq_bytes, invoice.clone());
+		let mut unsigned_invoice = UnsignedBolt12Invoice::new(invreq_bytes, invoice.clone());
 
 		let invoice = unsigned_invoice
 			.sign::<_, Infallible>(
@@ -545,18 +545,33 @@ macro_rules! unsigned_invoice_sign_method { ($self: ident, $self_type: ty $(, $s
 		signature_tlv_stream.write(&mut $self.bytes).unwrap();
 
 		Ok(Bolt12Invoice {
+			#[cfg(not(c_bindings))]
 			bytes: $self.bytes,
+			#[cfg(c_bindings)]
+			bytes: $self.bytes.clone(),
+			#[cfg(not(c_bindings))]
 			contents: $self.contents,
+			#[cfg(c_bindings)]
+			contents: $self.contents.clone(),
 			signature,
+			#[cfg(not(c_bindings))]
 			tagged_hash: $self.tagged_hash,
+			#[cfg(c_bindings)]
+			tagged_hash: $self.tagged_hash.clone(),
 		})
 	}
 } }
 
+#[cfg(not(c_bindings))]
 impl UnsignedBolt12Invoice {
 	unsigned_invoice_sign_method!(self, Self, mut);
 }
 
+#[cfg(c_bindings)]
+impl UnsignedBolt12Invoice {
+	unsigned_invoice_sign_method!(self, &mut Self);
+}
+
 impl AsRef<TaggedHash> for UnsignedBolt12Invoice {
 	fn as_ref(&self) -> &TaggedHash {
 		&self.tagged_hash
@@ -1506,6 +1521,8 @@ mod tests {
 			},
 		}
 
+		#[cfg(c_bindings)]
+		let mut unsigned_invoice = unsigned_invoice;
 		let invoice = unsigned_invoice.sign(recipient_sign).unwrap();
 
 		let mut buffer = Vec::new();