diff --git a/src/plugins/atomic/AtomicWidget.cpp b/src/plugins/atomic/AtomicWidget.cpp index 9011259..60d577e 100644 --- a/src/plugins/atomic/AtomicWidget.cpp +++ b/src/plugins/atomic/AtomicWidget.cpp @@ -180,9 +180,13 @@ void AtomicWidget::list(const QString& rendezvous) { } arguments << "-j"; arguments << "list-sellers"; - if(conf()->get(Config::proxy).toInt() != Config::Proxy::None) { + //Temporary fix till comit xmr btc updates libp2p to work with modern rendezvous points + if(!ui->btn_clearnet->isChecked() && conf()->get(Config::proxy).toInt() != Config::Proxy::None) { arguments << "--tor-socks5-port"; arguments << conf()->get(Config::socks5Port).toString(); + } else if (ui->btn_clearnet->isChecked()) { + arguments << "--tor-socks5-port"; + arguments << "0"; } arguments << "--rendezvous-point"; arguments << rendezvous; diff --git a/src/plugins/atomic/AtomicWidget.ui b/src/plugins/atomic/AtomicWidget.ui index 88b1404..13568ba 100644 --- a/src/plugins/atomic/AtomicWidget.ui +++ b/src/plugins/atomic/AtomicWidget.ui @@ -62,10 +62,10 @@ - Qt::Orientation::Horizontal + Qt::Horizontal - QSizePolicy::Policy::Expanding + QSizePolicy::Expanding @@ -85,7 +85,7 @@ - Qt::Orientation::Horizontal + Qt::Horizontal @@ -113,17 +113,37 @@ + + + + Swap Over Clearnet + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + - No swap tool configured, click configure to set up + No swap tool configured - Qt::Orientation::Horizontal + Qt::Horizontal diff --git a/src/utils/config.cpp b/src/utils/config.cpp index 29aa7d8..f08d6ae 100644 --- a/src/utils/config.cpp +++ b/src/utils/config.cpp @@ -143,10 +143,8 @@ static const QHash configStrings = { // Atomic {Config::rendezVous, {QS("rendezVous"), QStringList{"/dns4/atomicswaps.majesticbank.at/tcp/8888/p2p/12D3KooWKJUwP45K7fLbwGY1VM5V3U7LseU8EwJiAozUFrq5ihoF", - "/dnsaddr/rendezvous.coblox.tech/p2p/12D3KooWQUt9DkNZxEn2R5ymJzWj15MpG6mTW84kyd8vDaRZi46o", "/dns4/discover.unstoppableswap.net/tcp/8888/p2p/12D3KooWA6cnqJpVnreBVnoro8midDL9Lpzmg8oJPoAGi7YYaamE", - "/dns4/eratosthen.es/tcp/7798/p2p/12D3KooWAh7EXXa2ZyegzLGdjvj1W4G3EXrTGrf6trraoT1MEobs", - "/dns4/swap.sethforprivacy.com/tcp/8888/p2p/12D3KooWCULyZKuV9YEkb6BX8FuwajdvktSzmMg4U5ZX2uYZjHeu"}}}, + "/dns4/eratosthen.es/tcp/7798/p2p/12D3KooWAh7EXXa2ZyegzLGdjvj1W4G3EXrTGrf6trraoT1MEobs"}}}, {Config::swapPath, {QS("swapPath"), ""}}, {Config::operatingSystem, {QS("operatingSystem"), OS}}, {Config::pendingSwap, {QS("pendingSwap"), QStringList{}}},