diff --git a/CHANGELOG.md b/CHANGELOG.md index ab52afad26..7d4992df2b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +- GUI + ASB: Remove nine unusable Electrum defaults and add healthy Mullvad, + Cake Wallet, Blockstream, DIYnodes, and ACINQ mainnet servers. + ## [4.13.1] - 2026-07-23 ## [4.13.0] - 2026-07-23 diff --git a/src-gui/src/store/defaults.ts b/src-gui/src/store/defaults.ts index 74d459e46d..df7d05b58e 100644 --- a/src-gui/src/store/defaults.ts +++ b/src-gui/src/store/defaults.ts @@ -31,6 +31,12 @@ export const NEGATIVE_NODES_MAINNET = [ "tcp://electrum.coinucopia.io:50001", "tcp://se-mma-crypto-payments-001.mullvad.net:50001", "tcp://electrum2.bluewallet.io:50777", + "ssl://b.1209k.com:50002", + "ssl://mainnet.foundationdevices.com:50002", + "ssl://electrum.coinfinity.co:50002", + "tcp://electrum1.bluewallet.io:50001", + "tcp://electrum2.bluewallet.io:50001", + "tcp://electrum3.bluewallet.io:50001", ]; export const NEGATIVE_NODES_TESTNET = [ @@ -42,18 +48,18 @@ export const NEGATIVE_NODES_TESTNET = [ "tcp://testnet.qtornado.com:51001", "ssl://bitcoin.devmole.eu:5010", "tcp://bitcoin.devmole.eu:5000", + "ssl://v22019051929289916.bestsrv.de:50002", + "tcp://v22019051929289916.bestsrv.de:50001", + "ssl://testnet.aranguren.org:51002", ]; export const DEFAULT_NODES: Record> = { [Network.Testnet]: { [Blockchain.Bitcoin]: [ "ssl://blackie.c3-soft.com:57006", - "ssl://v22019051929289916.bestsrv.de:50002", - "tcp://v22019051929289916.bestsrv.de:50001", "ssl://electrum.blockstream.info:60002", "ssl://blockstream.info:993", "tcp://testnet.aranguren.org:51001", - "ssl://testnet.aranguren.org:51002", ], [Blockchain.Monero]: [], }, @@ -62,15 +68,14 @@ export const DEFAULT_NODES: Record> = { "tcp://electrum.eigenwallet.org:22293", "ssl://electrum.blockstream.info:50002", "ssl://bitcoin.stackwallet.com:50002", - "ssl://b.1209k.com:50002", - "ssl://mainnet.foundationdevices.com:50002", "tcp://bitcoin.lu.ke:50001", - "ssl://electrum.coinfinity.co:50002", - "tcp://electrum1.bluewallet.io:50001", - "tcp://electrum2.bluewallet.io:50001", - "tcp://electrum3.bluewallet.io:50001", "ssl://btc-electrum.cakewallet.com:50002", "tcp://bitcoin.aranguren.org:50001", + "ssl://bitcoin.mullvad.net:5010", + "tcp://electrs.cakewallet.com:50001", + "ssl://blockstream.info:700", + "ssl://electrum.diynodes.com:50022", + "ssl://electrum.acinq.co:50002", ], [Blockchain.Monero]: [], }, diff --git a/swap-env/src/defaults.rs b/swap-env/src/defaults.rs index f2cf809292..0e5edb3c9d 100644 --- a/swap-env/src/defaults.rs +++ b/swap-env/src/defaults.rs @@ -65,21 +65,19 @@ pub fn default_electrum_servers_mainnet() -> Vec { .expect("default electrum server url to be valid"), Url::parse("ssl://bitcoin.stackwallet.com:50002") .expect("default electrum server url to be valid"), - Url::parse("ssl://b.1209k.com:50002").expect("default electrum server url to be valid"), - Url::parse("ssl://mainnet.foundationdevices.com:50002") - .expect("default electrum server url to be valid"), Url::parse("tcp://bitcoin.lu.ke:50001").expect("default electrum server url to be valid"), - Url::parse("ssl://electrum.coinfinity.co:50002") + Url::parse("ssl://btc-electrum.cakewallet.com:50002") .expect("default electrum server url to be valid"), - Url::parse("tcp://electrum1.bluewallet.io:50001") + Url::parse("tcp://bitcoin.aranguren.org:50001") .expect("default electrum server url to be valid"), - Url::parse("tcp://electrum2.bluewallet.io:50001") + Url::parse("ssl://bitcoin.mullvad.net:5010") .expect("default electrum server url to be valid"), - Url::parse("tcp://electrum3.bluewallet.io:50001") + Url::parse("tcp://electrs.cakewallet.com:50001") .expect("default electrum server url to be valid"), - Url::parse("ssl://btc-electrum.cakewallet.com:50002") + Url::parse("ssl://blockstream.info:700").expect("default electrum server url to be valid"), + Url::parse("ssl://electrum.diynodes.com:50022") .expect("default electrum server url to be valid"), - Url::parse("tcp://bitcoin.aranguren.org:50001") + Url::parse("ssl://electrum.acinq.co:50002") .expect("default electrum server url to be valid"), ] } @@ -88,17 +86,11 @@ pub fn default_electrum_servers_testnet() -> Vec { vec![ Url::parse("ssl://blackie.c3-soft.com:57006") .expect("default electrum server url to be valid"), - Url::parse("ssl://v22019051929289916.bestsrv.de:50002") - .expect("default electrum server url to be valid"), - Url::parse("tcp://v22019051929289916.bestsrv.de:50001") - .expect("default electrum server url to be valid"), Url::parse("ssl://electrum.blockstream.info:60002") .expect("default electrum server url to be valid"), Url::parse("ssl://blockstream.info:993").expect("default electrum server url to be valid"), Url::parse("tcp://testnet.aranguren.org:51001") .expect("default electrum server url to be valid"), - Url::parse("ssl://testnet.aranguren.org:51002") - .expect("default electrum server url to be valid"), ] }