diff --git a/liana-gui/src/app/state/settings/bitcoind.rs b/liana-gui/src/app/state/settings/bitcoind.rs index 9be01bb50..a73ea7fc1 100644 --- a/liana-gui/src/app/state/settings/bitcoind.rs +++ b/liana-gui/src/app/state/settings/bitcoind.rs @@ -461,6 +461,7 @@ impl ElectrumSettings { daemon_config.bitcoin_backend = Some(lianad::config::BitcoinBackend::Electrum(ElectrumConfig { addr: self.addr.value.clone(), + validate_domain: self.electrum_config.validate_domain, })); self.processing = true; return Command::perform(async move { daemon_config }, |cfg| { diff --git a/liana-gui/src/installer/message.rs b/liana-gui/src/installer/message.rs index 96f5acd15..3d093f933 100644 --- a/liana-gui/src/installer/message.rs +++ b/liana-gui/src/installer/message.rs @@ -81,6 +81,7 @@ pub enum DefineBitcoind { #[derive(Debug, Clone)] pub enum DefineElectrum { ConfigFieldEdited(electrum::ConfigField, String), + ValidDomainChanged(bool), } #[derive(Debug, Clone)] diff --git a/liana-gui/src/installer/step/node/electrum.rs b/liana-gui/src/installer/step/node/electrum.rs index f594e6a22..5aeb8bf9d 100644 --- a/liana-gui/src/installer/step/node/electrum.rs +++ b/liana-gui/src/installer/step/node/electrum.rs @@ -14,9 +14,19 @@ use crate::{ node::electrum::ConfigField, }; -#[derive(Clone, Default)] +#[derive(Clone)] pub struct DefineElectrum { address: form::Value, + validate_domain: bool, +} + +impl Default for DefineElectrum { + fn default() -> Self { + Self { + address: Default::default(), + validate_domain: true, + } + } } impl DefineElectrum { @@ -38,6 +48,7 @@ impl DefineElectrum { crate::node::electrum::is_electrum_address_valid(&value); } }, + message::DefineElectrum::ValidDomainChanged(v) => self.validate_domain = v, }; }; Command::none() @@ -47,6 +58,7 @@ impl DefineElectrum { if self.can_try_ping() { ctx.bitcoin_backend = Some(lianad::config::BitcoinBackend::Electrum(ElectrumConfig { addr: self.address.value.clone(), + validate_domain: self.validate_domain, })); return true; } @@ -54,12 +66,15 @@ impl DefineElectrum { } pub fn view(&self) -> Element { - view::define_electrum(&self.address) + view::define_electrum(&self.address, self.validate_domain) } pub fn ping(&self) -> Result<(), Error> { let builder = electrum_client::Config::builder(); - let config = builder.timeout(Some(3)).build(); + let config = builder + .timeout(Some(3)) + .validate_domain(self.validate_domain) + .build(); let client = electrum_client::Client::from_config(&self.address.value, config) .map_err(|e| Error::Electrum(e.to_string()))?; client diff --git a/liana-gui/src/installer/view/mod.rs b/liana-gui/src/installer/view/mod.rs index acd3b7d79..0434604de 100644 --- a/liana-gui/src/installer/view/mod.rs +++ b/liana-gui/src/installer/view/mod.rs @@ -1134,7 +1134,10 @@ pub fn define_bitcoind<'a>( .into() } -pub fn define_electrum<'a>(address: &form::Value) -> Element<'a, Message> { +pub fn define_electrum<'a>( + address: &form::Value, + validate_domain: bool, +) -> Element<'a, Message> { let col_address = Column::new() .push(text("Address:").bold()) .push( @@ -1150,7 +1153,11 @@ pub fn define_electrum<'a>(address: &form::Value) -> Element<'a, Message .size(text::P1_SIZE) .padding(10), ) - .push(text(electrum::ADDRESS_NOTES).size(text::P2_SIZE)) + .push( + checkbox("Not validate SSL Domain, check this only if you want connect to a self sign certificate", !validate_domain) + .on_toggle(|b| { + Message::DefineNode(DefineNode::DefineElectrum(message::DefineElectrum::ValidDomainChanged(!b))) + })) .spacing(10); Column::new().push(col_address).spacing(50).into()