bindings: accept a string as electrum url

Author: RCasatta

lwk_bindings/src/electrum_client.rs

@@ -12,12 +12,6 @@ pub struct ElectrumClient {
     url: lwk_wollet::ElectrumUrl,
 }
 
-/// An url to an electrum server
-#[derive(uniffi::Object, Debug)]
-pub struct ElectrumUrl {
-    inner: lwk_wollet::ElectrumUrl,
-}
-
 #[uniffi::export]
 impl ElectrumClient {
     /// Construct an Electrum client
@@ -38,11 +32,14 @@ impl ElectrumClient {
 
     #[uniffi::constructor]
     /// Construct an electrum client from an Electrum URL
-    pub fn from_url(electrum_url: &ElectrumUrl) -> Result<Arc<Self>, LwkError> {
-        let client = lwk_wollet::ElectrumClient::new(&electrum_url.inner)?;
+    pub fn from_url(electrum_url: &str) -> Result<Arc<Self>, LwkError> {
+        let url = electrum_url
+            .parse::<lwk_wollet::ElectrumUrl>()
+            .map_err(|e| LwkError::Generic { msg: e.to_string() })?;
+        let client = lwk_wollet::ElectrumClient::new(&url)?;
         Ok(Arc::new(Self {
             inner: Arc::new(Mutex::new(client)),
-            url: electrum_url.inner.clone(),
+            url,
         }))
     }
 
@@ -111,17 +108,6 @@ impl ElectrumClient {
     }
 }
 
-#[uniffi::export]
-impl ElectrumUrl {
-    /// Create a new electrum url
-    #[uniffi::constructor]
-    pub fn new(url: &str, tls: bool, validate_domain: bool) -> Result<Self, LwkError> {
-        let url = lwk_wollet::ElectrumUrl::new(url, tls, validate_domain)
-            .map_err(lwk_wollet::Error::Url)?;
-        Ok(Self { inner: url })
-    }
-}
-
 impl ElectrumClient {
     /// Create a new electrum client with the same connection parameters
     #[allow(unused)] // TODO remove once lwk_boltz is integrated

lwk_bindings/src/lib.rs

@@ -54,7 +54,7 @@ pub use crate::signer::{Bip, Signer};
 pub use crate::wollet::Wollet;
 pub use chain::Chain;
 pub use desc::WolletDescriptor;
-pub use electrum_client::{ElectrumClient, ElectrumUrl};
+pub use electrum_client::ElectrumClient;
 pub use error::LwkError;
 pub use esplora_client::{EsploraClient, EsploraClientBuilder};
 pub use liquidex::{AssetAmount, UnvalidatedLiquidexProposal, ValidatedLiquidexProposal};

lwk_bindings/src/lightning.rs

@@ -7,8 +7,8 @@ use std::{
 };
 
 use crate::{
-    Address, Bolt11Invoice, ElectrumClient, ElectrumUrl, EsploraClient, LightningPayment, LwkError,
-    Mnemonic, Network,
+    Address, Bolt11Invoice, ElectrumClient, EsploraClient, LightningPayment, LwkError, Mnemonic,
+    Network,
 };
 use elements::bitcoin;
 use log::{Level, Metadata, Record};
@@ -102,7 +102,7 @@ pub struct BoltzSessionBuilder {
     #[uniffi(default = None)]
     referral_id: Option<String>,
     #[uniffi(default = None)]
-    bitcoin_electrum_client: Option<Arc<ElectrumUrl>>,
+    bitcoin_electrum_client_url: Option<String>,
 }
 
 /// A session to pay and receive lightning payments.
@@ -198,7 +198,7 @@ impl BoltzSession {
             timeout_advance: None,
             next_index_to_use: None,
             referral_id: None,
-            bitcoin_electrum_client: None,
+            bitcoin_electrum_client_url: None,
         };
         Self::from_builder(builder)
     }

lwk_boltz/src/error.rs

@@ -5,6 +5,9 @@ use lightning::bitcoin::XKeyIdentifier;
 
 #[derive(Debug, thiserror::Error)]
 pub enum Error {
+    #[error("Invalid electrum url: {0}")]
+    InvalidElectrumUrl(#[from] lwk_wollet::UrlError),
+
     #[error("Invalid swap state: {0}")]
     InvalidSwapState(String),
 

lwk_boltz/src/lib.rs

@@ -342,9 +342,10 @@ impl BoltzSessionBuilder {
     }
 
     /// Set the url of the bitcoin electrum client
-    pub fn bitcoin_electrum_client(mut self, bitcoin_electrum_client: ElectrumUrl) -> Self {
-        self.bitcoin_electrum_client = Some(bitcoin_electrum_client);
-        self
+    pub fn bitcoin_electrum_client(mut self, bitcoin_electrum_client: &str) -> Result<Self, Error> {
+        let url = bitcoin_electrum_client.parse::<ElectrumUrl>()?;
+        self.bitcoin_electrum_client = Some(url);
+        Ok(self)
     }
 
     /// Build the `BoltzSession`

lwk_boltz/tests/chain_swaps.rs

@@ -24,10 +24,10 @@ mod tests {
         clients::{AnyClient, ElectrumClient},
         BoltzSession,
     };
+    use lwk_wollet::bitcoin;
     use lwk_wollet::elements;
     use lwk_wollet::secp256k1::rand::thread_rng;
     use lwk_wollet::ElementsNetwork;
-    use lwk_wollet::{bitcoin, ElectrumUrl};
     use std::str::FromStr;
     use std::sync::Arc;
     use std::time::Duration;
@@ -420,7 +420,8 @@ mod tests {
         // Test polling mode
         let session_polling = BoltzSession::builder(network, AnyClient::Electrum(client.clone()))
             .polling(true)
-            .bitcoin_electrum_client(ElectrumUrl::new(DEFAULT_REGTEST_NODE, false, false).unwrap()) // it's the same endpoint, just testing the builder setting
+            .bitcoin_electrum_client(&format!("tcp://{}", DEFAULT_REGTEST_NODE)) // it's the same endpoint, just testing the builder setting
+            .unwrap()
             .build()
             .await
             .unwrap();