Refactor for clarity and improve error handling

This commit fixes a handful of minor comments/nits
that include:
  - Updates to set the `bip21`  crates default-features to false,
    to minimize dependencies.
  - Enable the `std` feature since we use/benefit from it.

  - In `receive` return `InvoiceCreationFailed` or `OfferCreationFailed`
    when creating an invoice or offer. Rather than silently logging the
    error.
  - Also in `receive` we first check if an amount is specified, and if
    not, return an error and abort.
  - Pass in `Config` to `UnifiedQrPayment` struct to use the users config
    network.
  - In `send` instead of checking each network for the `NetworkChecked`
    URI, we pass in the `Config::Network`.
  - Simplifed param parsing in `deserialize_temp` by directly finding
    the key and parsing the corresponding value.

  - General documentation fixes.
  - In parsing tests, moved longer invoice/offer strings into.
    variables that start with expected_ for clarity.

Author: slanesuke

Cargo.toml

@@ -61,7 +61,7 @@ reqwest = { version = "0.11", default-features = false, features = ["json", "rus
 rusqlite = { version = "0.28.0", features = ["bundled"] }
 bitcoin = "0.30.2"
 bip39 = "2.0.0"
-bip21 = "0.3.1"
+bip21 = { version = "0.3.1", features = ["std"], default-features = false }
 
 rand = "0.8.5"
 chrono = { version = "0.4", default-features = false, features = ["clock"] }

src/lib.rs

@@ -1085,6 +1085,7 @@ impl Node {
 			self.onchain_payment().into(),
 			self.bolt11_payment().into(),
 			self.bolt12_payment().into(),
+			Arc::clone(&self.config),
 			Arc::clone(&self.logger),
 		)
 	}
@@ -1099,6 +1100,7 @@ impl Node {
 			self.onchain_payment(),
 			self.bolt11_payment(),
 			self.bolt12_payment(),
+			Arc::clone(&self.config),
 			Arc::clone(&self.logger),
 		))
 	}

src/payment/unified_qr.rs

@@ -16,16 +16,17 @@
 use crate::error::Error;
 use crate::logger::{log_error, FilesystemLogger, Logger};
 use crate::payment::{Bolt11Payment, Bolt12Payment, OnchainPayment};
+use crate::Config;
 
 use lightning::ln::channelmanager::PaymentId;
+use lightning::offers::offer::Offer;
 use lightning_invoice::Bolt11Invoice;
 
-use bitcoin::address::{NetworkChecked, NetworkUnchecked};
-use bitcoin::{Amount, Network, Txid};
-
 use bip21::de::ParamKind;
 use bip21::{DeserializationError, DeserializeParams, Param, SerializeParams};
-use lightning::offers::offer::Offer;
+use bitcoin::address::{NetworkChecked, NetworkUnchecked};
+use bitcoin::{Amount, Txid};
+
 use std::sync::Arc;
 use std::vec::IntoIter;
 
@@ -50,30 +51,40 @@ pub struct UnifiedQrPayment {
 	onchain_payment: Arc<OnchainPayment>,
 	bolt11_invoice: Arc<Bolt11Payment>,
 	bolt12_payment: Arc<Bolt12Payment>,
+	config: Arc<Config>,
 	logger: Arc<FilesystemLogger>,
 }
 
 impl UnifiedQrPayment {
 	pub(crate) fn new(
 		onchain_payment: Arc<OnchainPayment>, bolt11_invoice: Arc<Bolt11Payment>,
-		bolt12_payment: Arc<Bolt12Payment>, logger: Arc<FilesystemLogger>,
+		bolt12_payment: Arc<Bolt12Payment>, config: Arc<Config>, logger: Arc<FilesystemLogger>,
 	) -> Self {
-		Self { onchain_payment, bolt11_invoice, bolt12_payment, logger }
+		Self { onchain_payment, bolt11_invoice, bolt12_payment, config, logger }
 	}
 
 	/// Generates a URI with an on-chain address, [BOLT 11] invoice and [BOLT 12] offer.
 	///
 	/// The URI allows users to send the payment request allowing the wallet to decide
 	/// which payment method to use. This enables a fallback mechanism: older wallets
 	/// can always pay using the provided on-chain address, while newer wallets will
-	/// typically opt to use the provided invoice.
+	/// typically opt to use the provided BOLT11 invoice or BOLT12 offer.
+	///
+	/// # Parameters
+	/// - `amount_sats`: The amount to be received, specified in satoshis.
+	/// - `message`: A description or note associated with the payment.
+	///   This message is visible to the payee and can provide context or details about the payment.
+	/// - `expiry_sec`: The expiration time for the payment, specified in seconds.
 	///
-	/// Returns a URI `String` if successful or an `Error` if there was an issue generating
-	/// the on-chain address or lightning invoice.
+	/// # Return Value
+	/// - **Success**: Returns a URI string.
+	/// - **Error**: Returns an error if there was an issue generating the on-chain address or
+	///    lightning invoice.
 	///
-	/// The error types that may be returned are:
+	/// # Error Types
 	/// - `Error::WalletOperationFailed` if there is an issue generating the on-chain address.
-	/// - `Error::InvoiceCreationFailed` if there is an issue generating the BOLT 11 invoice.
+	/// - `Error::InvoiceCreationFailed` if there is an issue generating the BOLT11 invoice.
+	/// - `Error::OfferCreationFailed` if there is an issue generating the BOLT12 offer.
 	///
 	/// The generated URI can then be given to a QR code library.
 	///
@@ -90,15 +101,15 @@ impl UnifiedQrPayment {
 			Ok(offer) => Some(offer),
 			Err(e) => {
 				log_error!(self.logger, "Failed to create offer: {}", e);
-				None
+				return Err(Error::OfferCreationFailed);
 			},
 		};
 
 		let bolt11_invoice = match self.bolt11_invoice.receive(amount_msats, message, expiry_sec) {
 			Ok(invoice) => Some(invoice),
 			Err(e) => {
 				log_error!(self.logger, "Failed to create invoice {}", e);
-				None
+				return Err(Error::InvoiceCreationFailed);
 			},
 		};
 
@@ -124,36 +135,39 @@ impl UnifiedQrPayment {
 		let uri: bip21::Uri<NetworkUnchecked, Extras> =
 			uri_str.parse().map_err(|_| Error::InvalidUri)?;
 
-		let uri = uri
-			.clone()
-			.require_network(Network::Bitcoin)
-			.or_else(|_| uri.clone().require_network(Network::Testnet))
-			.or_else(|_| uri.clone().require_network(Network::Regtest))
-			.or_else(|_| uri.clone().require_network(Network::Signet))
-			.map_err(|_| Error::InvalidNetwork)?;
+		let uri_network_checked =
+			uri.clone().require_network(self.config.network).map_err(|_| Error::InvalidNetwork)?;
 
-		if let Some(offer) = uri.extras.bolt12_offer {
+		if let Some(offer) = uri_network_checked.extras.bolt12_offer {
 			match self.bolt12_payment.send(&offer, None) {
 				Ok(payment_id) => return Ok(QrPaymentResult::Bolt12 { payment_id }),
-				Err(e) => log_error!(self.logger, "Failed to send BOLT12 offer: {:?}", e),
+				Err(e) => log_error!(self.logger, "Failed to send BOLT12 offer: {:?}. This is part of a unified QR code payment. Falling back to the BOLT11 invoice.", e),
 			}
 		}
 
-		if let Some(invoice) = uri.extras.bolt11_invoice {
+		if let Some(invoice) = uri_network_checked.extras.bolt11_invoice {
 			match self.bolt11_invoice.send(&invoice) {
 				Ok(payment_id) => return Ok(QrPaymentResult::Bolt11 { payment_id }),
-				Err(e) => log_error!(self.logger, "Failed to send BOLT11 invoice: {:?}", e),
+				Err(e) => log_error!(self.logger, "Failed to send BOLT11 invoice: {:?}. This is part of a unified QR code payment. Falling back to the on-chain transaction.", e),
 			}
 		}
 
-		let txid = self
-			.onchain_payment
-			.send_to_address(&uri.address, uri.amount.unwrap_or_default().to_sat())?;
+		let amount = match uri_network_checked.amount {
+			Some(amount) => amount,
+			None => {
+				log_error!(self.logger, "No amount specified in the URI. Aborting the payment.");
+				return Err(Error::InvalidAmount);
+			},
+		};
+
+		let txid =
+			self.onchain_payment.send_to_address(&uri_network_checked.address, amount.to_sat())?;
+
 		Ok(QrPaymentResult::Onchain { txid })
 	}
 }
 
-/// `QrPaymentResult` represents the result of a payment made using a [BIP 21] QR code.
+/// Represents the result of a payment made using a [BIP 21] QR code.
 ///
 /// After a successful on-chain transaction, the transaction ID ([`Txid`]) is returned.
 /// For BOLT11 and BOLT12 payments, the corresponding [`PaymentId`] is returned.
@@ -246,22 +260,22 @@ impl<'a> bip21::de::DeserializationState<'a> for DeserializationState {
 			"lightning" => {
 				let bolt11_value =
 					String::try_from(value).map_err(|_| Error::UriParameterParsingFailed)?;
-				for param in bolt11_value.split('&') {
-					if let Ok(invoice) = param.parse::<Bolt11Invoice>() {
-						self.bolt11_invoice = Some(invoice);
-					}
+				if let Ok(invoice) = bolt11_value.parse::<Bolt11Invoice>() {
+					self.bolt11_invoice = Some(invoice);
+					Ok(bip21::de::ParamKind::Known)
+				} else {
+					Ok(bip21::de::ParamKind::Unknown)
 				}
-				Ok(bip21::de::ParamKind::Known)
 			},
 			"lno" => {
 				let bolt12_value =
 					String::try_from(value).map_err(|_| Error::UriParameterParsingFailed)?;
-				for param in bolt12_value.split('&') {
-					if let Ok(offer) = param.parse::<Offer>() {
-						self.bolt12_offer = Some(offer);
-					}
+				if let Ok(offer) = bolt12_value.parse::<Offer>() {
+					self.bolt12_offer = Some(offer);
+					Ok(bip21::de::ParamKind::Known)
+				} else {
+					Ok(bip21::de::ParamKind::Unknown)
 				}
-				Ok(bip21::de::ParamKind::Known)
 			},
 			_ => Ok(bip21::de::ParamKind::Unknown),
 		}
@@ -286,6 +300,7 @@ mod tests {
 	#[test]
 	fn parse_uri() {
 		let uri_test1 = "BITCOIN:TB1QRSCD05XNY6QZ63TF9GJELGVK6D3UDJFEKK62VU?amount=1&message=Test%20message&lightning=LNTB1000M1PNXWM7MDQ523JHXAPQD4JHXUMPVAJSNP4QWP9QD2JFP8DUZ46JQG5LTKVDH04YG52G6UF2YAXP8H7YZPZM3DM5PP5KUP7YT429UP9Z4ACPA60R7WETSTL66549MG05P0JN0C4L2NCC40SSP5R0LH86DJCL0NK8HZHNZHX92VVUAAVNE48Z5RVKVY5DKTRQ0DMP7S9QYYSGQCQPCXQRRAQYR59FGN2VVC5R6DS0AZMETH493ZU56H0WSVMGYCW9LEPZ032PGQNZMQ6XKVEH90Z02C0NH3J5QGDAWCS2YC2ZNP22J0ZD0PPF78N4QQQEXTYS2";
+		let expected_bolt11_invoice_1 = "LNTB1000M1PNXWM7MDQ523JHXAPQD4JHXUMPVAJSNP4QWP9QD2JFP8DUZ46JQG5LTKVDH04YG52G6UF2YAXP8H7YZPZM3DM5PP5KUP7YT429UP9Z4ACPA60R7WETSTL66549MG05P0JN0C4L2NCC40SSP5R0LH86DJCL0NK8HZHNZHX92VVUAAVNE48Z5RVKVY5DKTRQ0DMP7S9QYYSGQCQPCXQRRAQYR59FGN2VVC5R6DS0AZMETH493ZU56H0WSVMGYCW9LEPZ032PGQNZMQ6XKVEH90Z02C0NH3J5QGDAWCS2YC2ZNP22J0ZD0PPF78N4QQQEXTYS2";
 		let parsed_uri = uri_test1
 			.parse::<bip21::Uri<NetworkUnchecked, Extras>>()
 			.expect("Failed Parsing")
@@ -300,21 +315,25 @@ mod tests {
 				.unwrap()
 		);
 
-		assert_eq!(Amount::from_sat(100000000), Amount::from(parsed_uri.amount.unwrap()));
+		assert_eq!(Amount::from_sat(100_000_000), Amount::from(parsed_uri.amount.unwrap()));
 
 		if let Some(invoice) = parsed_uri.extras.bolt11_invoice {
-			assert_eq!(invoice, Bolt11Invoice::from_str("LNTB1000M1PNXWM7MDQ523JHXAPQD4JHXUMPVAJSNP4QWP9QD2JFP8DUZ46JQG5LTKVDH04YG52G6UF2YAXP8H7YZPZM3DM5PP5KUP7YT429UP9Z4ACPA60R7WETSTL66549MG05P0JN0C4L2NCC40SSP5R0LH86DJCL0NK8HZHNZHX92VVUAAVNE48Z5RVKVY5DKTRQ0DMP7S9QYYSGQCQPCXQRRAQYR59FGN2VVC5R6DS0AZMETH493ZU56H0WSVMGYCW9LEPZ032PGQNZMQ6XKVEH90Z02C0NH3J5QGDAWCS2YC2ZNP22J0ZD0PPF78N4QQQEXTYS2").unwrap());
+			assert_eq!(invoice, Bolt11Invoice::from_str(expected_bolt11_invoice_1).unwrap());
 		} else {
 			panic!("No Lightning invoice found");
 		}
 
 		let uri_with_offer =  "BITCOIN:BCRT1QM0NW9S05QDPGC6F52FPKA9U6Q6VWTT5WVS30R2?amount=0.001&message=asdf&lightning=LNBCRT1M1PNGMY98DQ8V9EKGESNP4QDH5SL00QK4842UZMZVJVX2NLUZT4E6P2ZC2DLAGCU565TP42AUDYPP5XD0PRS5CRDLZVU8DNQQU08W9F4YP0XRXW06ZSHCLCHZU9X28HSSSSP5ES30JG9J4VK2CRW80YXTLRJU2M097TXMFTHR00VC5V0LGKVMURRQ9QYYSGQCQPCXQRRAQRZJQ0Q0K9CDYFSVZAJ5V3PDWYWDMHLEYCVD7TG0SVMY4AM4P6GQZJZ5XQQQQYQQX2QQQUQQQQLGQQQQQQQQFQWDQZX24PSHN68A9D4X4HD89F3XVC7DGGRDTFCA5WH4KZ546GSRTJVACA34QQ3DZ9W4JHLJD3XZRW44RA0RET6RDSRJCEZQC6AXANX6QPHZKHJK&lno=LNO1QGSQVGNWGCG35Z6EE2H3YCZRADDM72XRFUA9UVE2RLRM9DEU7XYFZRCYZPGTGRDWMGU44QPYUXLHLLMLWN4QSPQ97HSSQZSYV9EKGESSWCPK7JRAAUZ6574TSTVFJFSE20LSFWH8G9GTPFHL4RRJN23VX4TH35SRWKCNQ6S8R9ZW9HU5RXMPXVYCJVK2KY3NTEA8VXZTMWJF4NAJCCAQZQ7YZ7KDDZ600LAW2S2E7Q6XDYLPSMLMV4YAY0QXX5NC8QH05JRNUYQPQCAHK8Y5KQ8H9X624LS6A9GWFTGKYYPUZVUKKM93DWETTL8A7NE84L7SNHCSGR006EACQRQP8YWY6WPS0TS";
+		let expected_bolt11_invoice_2 = "LNBCRT1M1PNGMY98DQ8V9EKGESNP4QDH5SL00QK4842UZMZVJVX2NLUZT4E6P2ZC2DLAGCU565TP42AUDYPP5XD0PRS5CRDLZVU8DNQQU08W9F4YP0XRXW06ZSHCLCHZU9X28HSSSSP5ES30JG9J4VK2CRW80YXTLRJU2M097TXMFTHR00VC5V0LGKVMURRQ9QYYSGQCQPCXQRRAQRZJQ0Q0K9CDYFSVZAJ5V3PDWYWDMHLEYCVD7TG0SVMY4AM4P6GQZJZ5XQQQQYQQX2QQQUQQQQLGQQQQQQQQFQWDQZX24PSHN68A9D4X4HD89F3XVC7DGGRDTFCA5WH4KZ546GSRTJVACA34QQ3DZ9W4JHLJD3XZRW44RA0RET6RDSRJCEZQC6AXANX6QPHZKHJK";
+		let expected_bolt12_offer_2 = "LNO1QGSQVGNWGCG35Z6EE2H3YCZRADDM72XRFUA9UVE2RLRM9DEU7XYFZRCYZPGTGRDWMGU44QPYUXLHLLMLWN4QSPQ97HSSQZSYV9EKGESSWCPK7JRAAUZ6574TSTVFJFSE20LSFWH8G9GTPFHL4RRJN23VX4TH35SRWKCNQ6S8R9ZW9HU5RXMPXVYCJVK2KY3NTEA8VXZTMWJF4NAJCCAQZQ7YZ7KDDZ600LAW2S2E7Q6XDYLPSMLMV4YAY0QXX5NC8QH05JRNUYQPQCAHK8Y5KQ8H9X624LS6A9GWFTGKYYPUZVUKKM93DWETTL8A7NE84L7SNHCSGR006EACQRQP8YWY6WPS0TS";
 		let parsed_uri_with_offer = uri_with_offer
 			.parse::<bip21::Uri<NetworkUnchecked, Extras>>()
 			.expect("Failed Parsing")
 			.require_network(Network::Regtest)
 			.expect("Invalid Network");
 
+		assert_eq!(Amount::from_sat(100_000), Amount::from(parsed_uri_with_offer.amount.unwrap()));
+
 		assert_eq!(
 			parsed_uri_with_offer.address,
 			bitcoin::Address::from_str("BCRT1QM0NW9S05QDPGC6F52FPKA9U6Q6VWTT5WVS30R2")
@@ -324,18 +343,19 @@ mod tests {
 		);
 
 		if let Some(invoice) = parsed_uri_with_offer.extras.bolt11_invoice {
-			assert_eq!(invoice, Bolt11Invoice::from_str("LNBCRT1M1PNGMY98DQ8V9EKGESNP4QDH5SL00QK4842UZMZVJVX2NLUZT4E6P2ZC2DLAGCU565TP42AUDYPP5XD0PRS5CRDLZVU8DNQQU08W9F4YP0XRXW06ZSHCLCHZU9X28HSSSSP5ES30JG9J4VK2CRW80YXTLRJU2M097TXMFTHR00VC5V0LGKVMURRQ9QYYSGQCQPCXQRRAQRZJQ0Q0K9CDYFSVZAJ5V3PDWYWDMHLEYCVD7TG0SVMY4AM4P6GQZJZ5XQQQQYQQX2QQQUQQQQLGQQQQQQQQFQWDQZX24PSHN68A9D4X4HD89F3XVC7DGGRDTFCA5WH4KZ546GSRTJVACA34QQ3DZ9W4JHLJD3XZRW44RA0RET6RDSRJCEZQC6AXANX6QPHZKHJK").unwrap());
+			assert_eq!(invoice, Bolt11Invoice::from_str(expected_bolt11_invoice_2).unwrap());
 		} else {
 			panic!("No invoice found.")
 		}
 
 		if let Some(offer) = parsed_uri_with_offer.extras.bolt12_offer {
-			assert_eq!(offer, Offer::from_str("LNO1QGSQVGNWGCG35Z6EE2H3YCZRADDM72XRFUA9UVE2RLRM9DEU7XYFZRCYZPGTGRDWMGU44QPYUXLHLLMLWN4QSPQ97HSSQZSYV9EKGESSWCPK7JRAAUZ6574TSTVFJFSE20LSFWH8G9GTPFHL4RRJN23VX4TH35SRWKCNQ6S8R9ZW9HU5RXMPXVYCJVK2KY3NTEA8VXZTMWJF4NAJCCAQZQ7YZ7KDDZ600LAW2S2E7Q6XDYLPSMLMV4YAY0QXX5NC8QH05JRNUYQPQCAHK8Y5KQ8H9X624LS6A9GWFTGKYYPUZVUKKM93DWETTL8A7NE84L7SNHCSGR006EACQRQP8YWY6WPS0TS").unwrap());
+			assert_eq!(offer, Offer::from_str(expected_bolt12_offer_2).unwrap());
 		} else {
 			panic!("No offer found.");
 		}
 
 		let zeus_test = "bitcoin:TB1QQ32G6LM2XKT0U2UGASH5DC4CFT3JTPEW65PZZ5?lightning=LNTB500U1PN89HH6PP5MA7K6DRM5SYVD05NTXMGSRNM728J7EHM8KV6VC96YNLKN7G7VDYQDQQCQZRCXQR8Q7SP5HU30L0EEXKYYPQSQYEZELZWUPT62HLJ0KV2662CALGPAML50QPXQ9QXPQYSGQDKTVFXEC8H2DG2GY3C95ETAJ0QKX50XAUCU304PPFV2SQVGFHZ6RMZWJV8MC3M0LXF3GW852C5VSK0DELK0JHLYUTYZDF7QKNAMT4PQQQN24WM&amount=0.0005";
+		let expected_bolt11_invoice_3 = "LNTB500U1PN89HH6PP5MA7K6DRM5SYVD05NTXMGSRNM728J7EHM8KV6VC96YNLKN7G7VDYQDQQCQZRCXQR8Q7SP5HU30L0EEXKYYPQSQYEZELZWUPT62HLJ0KV2662CALGPAML50QPXQ9QXPQYSGQDKTVFXEC8H2DG2GY3C95ETAJ0QKX50XAUCU304PPFV2SQVGFHZ6RMZWJV8MC3M0LXF3GW852C5VSK0DELK0JHLYUTYZDF7QKNAMT4PQQQN24WM";
 		let uri_test2 = zeus_test
 			.parse::<bip21::Uri<NetworkUnchecked, Extras>>()
 			.expect("Failed Parsing")
@@ -351,13 +371,14 @@ mod tests {
 		);
 
 		if let Some(invoice) = uri_test2.extras.bolt11_invoice {
-			assert_eq!(invoice, Bolt11Invoice::from_str("LNTB500U1PN89HH6PP5MA7K6DRM5SYVD05NTXMGSRNM728J7EHM8KV6VC96YNLKN7G7VDYQDQQCQZRCXQR8Q7SP5HU30L0EEXKYYPQSQYEZELZWUPT62HLJ0KV2662CALGPAML50QPXQ9QXPQYSGQDKTVFXEC8H2DG2GY3C95ETAJ0QKX50XAUCU304PPFV2SQVGFHZ6RMZWJV8MC3M0LXF3GW852C5VSK0DELK0JHLYUTYZDF7QKNAMT4PQQQN24WM").unwrap());
+			assert_eq!(invoice, Bolt11Invoice::from_str(expected_bolt11_invoice_3).unwrap());
 		} else {
 			panic!("No invoice found.");
 		}
 		assert_eq!(Amount::from(uri_test2.amount.unwrap()), Amount::from_sat(50000));
 
 		let muun_test = "bitcoin:bc1q6fmtam67h8wxfwtpumhazhtwyrh3uf039n058zke9xt5hr4ljzwsdcm2pj?amount=0.01&lightning=lnbc10m1pn8g2j4pp575tg4wt8jwgu2lvtk3aj6hy7mc6tnupw07wwkxcvyhtt3wlzw0zsdqqcqzzgxqyz5vqrzjqwnvuc0u4txn35cafc7w94gxvq5p3cu9dd95f7hlrh0fvs46wpvhdv6dzdeg0ww2eyqqqqryqqqqthqqpysp5fkd3k2rzvwdt2av068p58evf6eg50q0eftfhrpugaxkuyje4d25q9qrsgqqkfmnn67s5g6hadrcvf5h0l7p92rtlkwrfqdvc7uuf6lew0czxksvqhyux3zjrl3tlakwhtvezwl24zshnfumukwh0yntqsng9z6glcquvw7kc";
+		let expected_bolt11_invoice_4 = "lnbc10m1pn8g2j4pp575tg4wt8jwgu2lvtk3aj6hy7mc6tnupw07wwkxcvyhtt3wlzw0zsdqqcqzzgxqyz5vqrzjqwnvuc0u4txn35cafc7w94gxvq5p3cu9dd95f7hlrh0fvs46wpvhdv6dzdeg0ww2eyqqqqryqqqqthqqpysp5fkd3k2rzvwdt2av068p58evf6eg50q0eftfhrpugaxkuyje4d25q9qrsgqqkfmnn67s5g6hadrcvf5h0l7p92rtlkwrfqdvc7uuf6lew0czxksvqhyux3zjrl3tlakwhtvezwl24zshnfumukwh0yntqsng9z6glcquvw7kc";
 		let uri_test3 = muun_test
 			.parse::<bip21::Uri<NetworkUnchecked, Extras>>()
 			.expect("Failed Parsing")
@@ -374,13 +395,14 @@ mod tests {
 		);
 
 		if let Some(invoice) = uri_test3.extras.bolt11_invoice {
-			assert_eq!(invoice, Bolt11Invoice::from_str("lnbc10m1pn8g2j4pp575tg4wt8jwgu2lvtk3aj6hy7mc6tnupw07wwkxcvyhtt3wlzw0zsdqqcqzzgxqyz5vqrzjqwnvuc0u4txn35cafc7w94gxvq5p3cu9dd95f7hlrh0fvs46wpvhdv6dzdeg0ww2eyqqqqryqqqqthqqpysp5fkd3k2rzvwdt2av068p58evf6eg50q0eftfhrpugaxkuyje4d25q9qrsgqqkfmnn67s5g6hadrcvf5h0l7p92rtlkwrfqdvc7uuf6lew0czxksvqhyux3zjrl3tlakwhtvezwl24zshnfumukwh0yntqsng9z6glcquvw7kc").unwrap());
+			assert_eq!(invoice, Bolt11Invoice::from_str(expected_bolt11_invoice_4).unwrap());
 		} else {
 			panic!("No invoice found");
 		}
 		assert_eq!(Amount::from(uri_test3.amount.unwrap()), Amount::from_sat(1_000_000));
 
 		let muun_test_no_amount = "bitcoin:bc1qwe94y974pjl9kg5afg8tmsc0nz4hct04u78hdhukxvnnphgu48hs9lx3k5?lightning=lnbc1pn8g249pp5f6ytj32ty90jhvw69enf30hwfgdhyymjewywcmfjevflg6s4z86qdqqcqzzgxqyz5vqrzjqwnvuc0u4txn35cafc7w94gxvq5p3cu9dd95f7hlrh0fvs46wpvhdfjjzh2j9f7ye5qqqqryqqqqthqqpysp5mm832athgcal3m7h35sc29j63lmgzvwc5smfjh2es65elc2ns7dq9qrsgqu2xcje2gsnjp0wn97aknyd3h58an7sjj6nhcrm40846jxphv47958c6th76whmec8ttr2wmg6sxwchvxmsc00kqrzqcga6lvsf9jtqgqy5yexa";
+		let expected_bolt11_invoice_5 = "lnbc1pn8g249pp5f6ytj32ty90jhvw69enf30hwfgdhyymjewywcmfjevflg6s4z86qdqqcqzzgxqyz5vqrzjqwnvuc0u4txn35cafc7w94gxvq5p3cu9dd95f7hlrh0fvs46wpvhdfjjzh2j9f7ye5qqqqryqqqqthqqpysp5mm832athgcal3m7h35sc29j63lmgzvwc5smfjh2es65elc2ns7dq9qrsgqu2xcje2gsnjp0wn97aknyd3h58an7sjj6nhcrm40846jxphv47958c6th76whmec8ttr2wmg6sxwchvxmsc00kqrzqcga6lvsf9jtqgqy5yexa";
 		let uri_test4 = muun_test_no_amount
 			.parse::<bip21::Uri<NetworkUnchecked, Extras>>()
 			.expect("Failed Parsing")
@@ -394,7 +416,7 @@ mod tests {
 				.unwrap()
 		);
 		if let Some(invoice) = uri_test4.extras.bolt11_invoice {
-			assert_eq!(invoice, Bolt11Invoice::from_str("lnbc1pn8g249pp5f6ytj32ty90jhvw69enf30hwfgdhyymjewywcmfjevflg6s4z86qdqqcqzzgxqyz5vqrzjqwnvuc0u4txn35cafc7w94gxvq5p3cu9dd95f7hlrh0fvs46wpvhdfjjzh2j9f7ye5qqqqryqqqqthqqpysp5mm832athgcal3m7h35sc29j63lmgzvwc5smfjh2es65elc2ns7dq9qrsgqu2xcje2gsnjp0wn97aknyd3h58an7sjj6nhcrm40846jxphv47958c6th76whmec8ttr2wmg6sxwchvxmsc00kqrzqcga6lvsf9jtqgqy5yexa").unwrap());
+			assert_eq!(invoice, Bolt11Invoice::from_str(expected_bolt11_invoice_5).unwrap());
 		} else {
 			panic!("No invoice found");
 		}