Merge pull request breez#1143 from breez/external-input-parsing

Support external input parsing in sdk-common

libs/sdk-bindings/src/uniffi_binding.rs

@@ -378,7 +378,7 @@ pub fn parse_invoice(invoice: String) -> SdkResult<LNInvoice> {
 }
 
 pub fn parse_input(s: String) -> SdkResult<InputType> {
-    rt().block_on(async move { Ok(sdk_parse_input(&s).await?) })
+    rt().block_on(async move { Ok(sdk_parse_input(&s, None).await?) })
 }
 
 pub fn mnemonic_to_seed(phrase: String) -> SdkResult<Vec<u8>> {

libs/sdk-common/Cargo.toml

@@ -32,6 +32,7 @@ tonic = { workspace = true, features = [
 url = "2.5.0"
 elements = { version = "0.24.1", optional = true }
 urlencoding = { version = "2.1.3" }
+percent-encoding = "2.3.1"
 
 [dev-dependencies]
 bitcoin = { workspace = true, features = ["rand"] }

libs/sdk-common/src/liquid/mod.rs

@@ -15,7 +15,7 @@ mod tests {
         for (amount_sat, amount_btc) in get_bip21_rounding_test_vectors() {
             let addr = format!("liquidnetwork:tlq1qqw5ur50rnvcx33vmljjtnez3hrtl6n7vs44tdj2c9fmnxrrgzgwnhw6jtpn8cljkmlr8tgfw9hemrr5y8u2nu024hhak3tpdk?amount={amount_btc}&assetid={asset_id}");
 
-            match parse(&addr).await? {
+            match parse(&addr, None).await? {
                 InputType::LiquidAddress {
                     address: addr_with_amount_parsed,
                 } => {

libs/sdk-core/src/binding.rs

@@ -504,7 +504,7 @@ pub fn parse_invoice(invoice: String) -> Result<LNInvoice> {
 }
 
 pub fn parse_input(input: String) -> Result<InputType> {
-    block_on(async { parse(&input).await })
+    block_on(async { parse(&input, None).await })
 }
 
 /*  Payment API's */

libs/sdk-core/src/breez_services.rs

@@ -3315,7 +3315,7 @@ pub(crate) mod tests {
         assert_eq!(parsed.host_str(), Some("mock.moonpay"));
         assert_eq!(parsed.path(), "/");
 
-        let wallet_address = parse(query_pairs.get("wa").unwrap()).await?;
+        let wallet_address = parse(query_pairs.get("wa").unwrap(), None).await?;
         assert!(matches!(wallet_address, InputType::BitcoinAddress { .. }));
 
         let max_amount = query_pairs.get("ma").unwrap();

tools/sdk-cli/src/command_handlers.rs

@@ -124,7 +124,7 @@ pub(crate) async fn handle_command(
             sdk()?.sync().await?;
             Ok("Sync finished successfully".to_string())
         }
-        Commands::Parse { input } => parse(&input)
+        Commands::Parse { input } => parse(&input, None)
             .await
             .map(|res| serde_json::to_string_pretty(&res))?
             .map_err(|e| e.into()),
@@ -466,7 +466,7 @@ pub(crate) async fn handle_command(
             label,
             validate_success_url,
             use_trampoline,
-        } => match parse(&lnurl).await? {
+        } => match parse(&lnurl, None).await? {
             LnUrlPay { data: pd } => {
                 let prompt = format!(
                     "Amount to pay in millisatoshi (min {} msat, max {} msat: ",
@@ -494,7 +494,7 @@ pub(crate) async fn handle_command(
             _ => Err(anyhow!("Invalid input")),
         },
         Commands::LnurlWithdraw { lnurl } => {
-            match parse(&lnurl).await? {
+            match parse(&lnurl, None).await? {
                 LnUrlWithdraw { data: wd } => {
                     info!("Endpoint description: {}", wd.default_description);
 
@@ -536,7 +536,7 @@ pub(crate) async fn handle_command(
         Commands::LnurlAuth { lnurl } => {
             let lnurl_endpoint = lnurl.trim();
 
-            match parse(lnurl_endpoint).await? {
+            match parse(lnurl_endpoint, None).await? {
                 LnUrlAuth { data: ad } => {
                     let auth_res = sdk()?.lnurl_auth(ad).await?;
                     serde_json::to_string_pretty(&auth_res).map_err(|e| e.into())