f derive keys from offer metadata

Author: valentinewallace

lightning/src/offers/static_invoice.rs

@@ -595,13 +595,13 @@ mod tests {
 				.build()
 				.unwrap();
 
-		let (_offer_id, keys_opt) = offer.verify(&expanded_key, &secp_ctx).unwrap();
 		let invoice = StaticInvoiceBuilder::for_offer_using_keys(
 			&offer,
 			payment_paths.clone(),
 			vec![blinded_path()],
 			now,
-			keys_opt.unwrap(),
+			&expanded_key,
+			&secp_ctx,
 		)
 		.unwrap()
 		.build_and_sign(&secp_ctx)
@@ -630,6 +630,7 @@ mod tests {
 		assert!(invoice.fallbacks().is_empty());
 		assert_eq!(invoice.invoice_features(), &Bolt12InvoiceFeatures::empty());
 
+		let keys_opt = offer.verify(&expanded_key, &secp_ctx).unwrap().1;
 		let message = TaggedHash::from_valid_tlv_stream_bytes(SIGNATURE_TAG, &invoice.bytes);
 		assert!(merkle::verify_signature(
 			&invoice.signature,
@@ -662,13 +663,13 @@ mod tests {
 				.build()
 				.unwrap();
 
-		let (_offer_id, keys_opt) = valid_offer.verify(&expanded_key, &secp_ctx).unwrap();
 		let invoice = StaticInvoiceBuilder::for_offer_using_keys(
 			&valid_offer,
 			payment_paths(),
 			vec![blinded_path()],
 			now,
-			keys_opt.unwrap(),
+			&expanded_key,
+			&secp_ctx,
 		)
 		.unwrap()
 		.build_and_sign(&secp_ctx)
@@ -682,13 +683,13 @@ mod tests {
 				.absolute_expiry(past_expiry)
 				.build()
 				.unwrap();
-		let (_offer_id, keys_opt) = expired_offer.verify(&expanded_key, &secp_ctx).unwrap();
 		if let Err(e) = StaticInvoiceBuilder::for_offer_using_keys(
 			&expired_offer,
 			payment_paths(),
 			vec![blinded_path()],
 			now,
-			keys_opt.unwrap(),
+			&expanded_key,
+			&secp_ctx,
 		)
 		.unwrap()
 		.build_and_sign(&secp_ctx)
@@ -720,7 +721,8 @@ mod tests {
 			Vec::new(),
 			vec![blinded_path()],
 			now,
-			keys_opt.unwrap(),
+			&expanded_key,
+			&secp_ctx,
 		) {
 			assert_eq!(e, Bolt12SemanticError::MissingPaths);
 		} else {
@@ -733,7 +735,8 @@ mod tests {
 			payment_paths(),
 			Vec::new(),
 			now,
-			keys_opt.unwrap(),
+			&expanded_key,
+			&secp_ctx,
 		) {
 			assert_eq!(e, Bolt12SemanticError::MissingPaths);
 		} else {
@@ -752,7 +755,8 @@ mod tests {
 			payment_paths(),
 			vec![blinded_path()],
 			now,
-			keys_opt.unwrap(),
+			&expanded_key,
+			&secp_ctx,
 		) {
 			assert_eq!(e, Bolt12SemanticError::MissingPaths);
 		} else {
@@ -773,7 +777,6 @@ mod tests {
 				.path(blinded_path())
 				.build()
 				.unwrap();
-		let (_offer_id, keys_opt) = valid_offer.verify(&expanded_key, &secp_ctx).unwrap();
 
 		// Error if offer signing pubkey is missing.
 		let mut offer_missing_signing_pubkey = valid_offer.clone();
@@ -788,14 +791,15 @@ mod tests {
 			payment_paths(),
 			vec![blinded_path()],
 			now,
-			keys_opt.unwrap(),
+			&expanded_key,
+			&secp_ctx,
 		) {
 			assert_eq!(e, Bolt12SemanticError::MissingSigningPubkey);
 		} else {
 			panic!("expected error")
 		}
 
-		// Error if the offer's signing pubkey doesn't match the invoice's.
+		// Error if the offer's metadata cannot be verified.
 		let mut offer_invalid_signing_pubkey = valid_offer.clone();
 		let mut offer_tlv_stream = offer_invalid_signing_pubkey.as_tlv_stream();
 		let invalid_node_id = payer_pubkey();
@@ -809,9 +813,10 @@ mod tests {
 			payment_paths(),
 			vec![blinded_path()],
 			now,
-			keys_opt.unwrap(),
+			&expanded_key,
+			&secp_ctx,
 		) {
-			assert_eq!(e, Bolt12SemanticError::InvalidSigningPubkey);
+			assert_eq!(e, Bolt12SemanticError::InvalidMetadata);
 		} else {
 			panic!("expected error")
 		}
@@ -832,15 +837,14 @@ mod tests {
 				.chain(Network::Testnet)
 				.build()
 				.unwrap();
-		let (_offer_id, keys_opt) =
-			offer_with_extra_chain.verify(&expanded_key, &secp_ctx).unwrap();
 
 		if let Err(e) = StaticInvoiceBuilder::for_offer_using_keys(
 			&offer_with_extra_chain,
 			payment_paths(),
 			vec![blinded_path()],
 			now,
-			keys_opt.unwrap(),
+			&expanded_key,
+			&secp_ctx,
 		) {
 			assert_eq!(e, Bolt12SemanticError::UnexpectedChain);
 		} else {