f - check amount_msats after authentication

Author: jkczyz

lightning/src/ln/channelmanager.rs

@@ -10527,13 +10527,6 @@ where
 					_ => return ResponseInstruction::NoResponse,
 				};
 
-				let amount_msats = match InvoiceBuilder::<DerivedSigningPubkey>::amount_msats(
-					&invoice_request
-				) {
-					Ok(amount_msats) => amount_msats,
-					Err(error) => return responder.respond(OffersMessage::InvoiceError(error.into())),
-				};
-
 				let invoice_request = match nonce {
 					Some(nonce) => match invoice_request.verify_using_recipient_data(
 						nonce, expanded_key, secp_ctx,
@@ -10550,6 +10543,13 @@ where
 					},
 				};
 
+				let amount_msats = match InvoiceBuilder::<DerivedSigningPubkey>::amount_msats(
+					&invoice_request.inner
+				) {
+					Ok(amount_msats) => amount_msats,
+					Err(error) => return responder.respond(OffersMessage::InvoiceError(error.into())),
+				};
+
 				let relative_expiry = DEFAULT_RELATIVE_EXPIRY.as_secs() as u32;
 				let (payment_hash, payment_secret) = match self.create_inbound_payment(
 					Some(amount_msats), relative_expiry, None

lightning/src/offers/invoice_request.rs

@@ -613,7 +613,7 @@ pub struct VerifiedInvoiceRequest {
 	pub offer_id: OfferId,
 
 	/// The verified request.
-	inner: InvoiceRequest,
+	pub(crate) inner: InvoiceRequest,
 
 	/// Keys used for signing a [`Bolt12Invoice`] if they can be derived.
 	///