Return BIP21 URI also when only non-bitcoin asset_id is defined

Author: dangeross

cli/Cargo.lock

@@ -31,7 +31,7 @@ lwk_wollet = { git = "https://github.com/dangeross/lwk", branch = "savage-full-s
 #lwk_wollet = "0.8.0"
 rusqlite = { version = "0.31", features = ["backup", "bundled"] }
 rusqlite_migration = "1.0"
-sdk-common = { git = "https://github.com/breez/breez-sdk", rev = "2d1b3193e838fd245c78806ec5b68826b0d7b156", features = ["liquid"] }
+sdk-common = { git = "https://github.com/breez/breez-sdk", rev = "5a20b38b4c3b574282e8d6e5a61750bb7f4bebed", features = ["liquid"] }
 serde = { version = "1.0.197", features = ["derive"] }
 serde_json = "1.0.116"
 strum = "0.25"

lib/Cargo.lock

@@ -2042,35 +2042,37 @@ impl LiquidSdk {
                 self.receive_onchain(amount_sat, *fees_sat).await
             }
             PaymentMethod::LiquidAddress => {
+                let lbtc_asset_id = self.config.lbtc_asset_id();
                 let (asset_id, amount, amount_sat) = match amount.clone() {
                     Some(ReceiveAmount::Asset {
                         asset_id,
                         payer_amount,
                     }) => (asset_id, payer_amount, None),
                     Some(ReceiveAmount::Bitcoin { payer_amount_sat }) => {
-                        (self.config.lbtc_asset_id(), None, Some(payer_amount_sat))
+                        (lbtc_asset_id.clone(), None, Some(payer_amount_sat))
                     }
-                    None => (self.config.lbtc_asset_id(), None, None),
+                    None => (lbtc_asset_id.clone(), None, None),
                 };
 
                 let address = self.onchain_wallet.next_unused_address().await?.to_string();
-                let receive_destination = if amount.is_some() || amount_sat.is_some() {
-                    LiquidAddressData {
-                        address: address.to_string(),
-                        network: self.config.network.into(),
-                        amount,
-                        amount_sat,
-                        asset_id: Some(asset_id.clone()),
-                        label: None,
-                        message: req.description.clone(),
-                    }
-                    .to_uri()
-                    .map_err(|e| PaymentError::Generic {
-                        err: format!("Could not build BIP21 URI: {e:?}"),
-                    })?
-                } else {
-                    address
-                };
+                let receive_destination =
+                    if asset_id.ne(&lbtc_asset_id) || amount.is_some() || amount_sat.is_some() {
+                        LiquidAddressData {
+                            address: address.to_string(),
+                            network: self.config.network.into(),
+                            amount,
+                            amount_sat,
+                            asset_id: Some(asset_id),
+                            label: None,
+                            message: req.description.clone(),
+                        }
+                        .to_uri()
+                        .map_err(|e| PaymentError::Generic {
+                            err: format!("Could not build BIP21 URI: {e:?}"),
+                        })?
+                    } else {
+                        address
+                    };
 
                 Ok(ReceivePaymentResponse {
                     destination: receive_destination,
@@ -3303,7 +3305,7 @@ impl LiquidSdk {
 
         let res = match input_type {
             InputType::LiquidAddress { ref address } => match &address.asset_id {
-                Some(asset_id) if asset_id.eq(&self.config.lbtc_asset_id()).not() => {
+                Some(asset_id) if asset_id.ne(&self.config.lbtc_asset_id()) => {
                     let asset_metadata = self.persister.get_asset_metadata(asset_id)?.ok_or(
                         PaymentError::AssetError {
                             err: format!("Asset {asset_id} is not supported"),