Ecosystem/feather
Ecosystem/feather
1
0
Fork 0
mirror of https://github.com/feather-wallet/feather.git synced 2024-12-23 03:59:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Removed dead rendezvous points

Browse source 
Added a over clearnet checkbox to force the swap tool into listing sellers without tor. This is a temporary fix till comit xmr<->btc maintainers can update libp2p version.
This commit is contained in:
twiddle 2024-10-07 18:59:24 -04:00
parent ac89dfcb22
commit 971e5c4716
3 changed files with 31 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/plugins/atomic/AtomicWidget.cpp
View file

@ -180,9 +180,13 @@ void AtomicWidget::list(const QString& rendezvous) {
} }
arguments << "-j"; arguments << "-j";
arguments << "list-sellers"; 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 << "--tor-socks5-port";
arguments << conf()->get(Config::socks5Port).toString(); arguments << conf()->get(Config::socks5Port).toString();
} else if (ui->btn_clearnet->isChecked()) {
arguments << "--tor-socks5-port";
arguments << "0";
} }
arguments << "--rendezvous-point"; arguments << "--rendezvous-point";
arguments << rendezvous; arguments << rendezvous;

30
src/plugins/atomic/AtomicWidget.ui
View file

@ -62,10 +62,10 @@
<item> <item>
<spacer name="horizontalSpacer_2"> <spacer name="horizontalSpacer_2">
<property name="orientation"> <property name="orientation">
<enum>Qt::Orientation::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
<property name="sizeType"> <property name="sizeType">
<enum>QSizePolicy::Policy::Expanding</enum> <enum>QSizePolicy::Expanding</enum>
</property> </property>
<property name="sizeHint" stdset="0"> <property name="sizeHint" stdset="0">
<size> <size>
@ -85,7 +85,7 @@
<item> <item>
<spacer name="horizontalSpacer_3"> <spacer name="horizontalSpacer_3">
<property name="orientation"> <property name="orientation">
<enum>Qt::Orientation::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
<property name="sizeHint" stdset="0"> <property name="sizeHint" stdset="0">
<size> <size>
@ -113,17 +113,37 @@
</property> </property>
</widget> </widget>
</item> </item>
<item>
<widget class="QCheckBox" name="btn_clearnet">
<property name="text">
<string>Swap Over Clearnet</string>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_4">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item> <item>
<widget class="QLabel" name="meta_label"> <widget class="QLabel" name="meta_label">
<property name="text"> <property name="text">
<string>No swap tool configured, click configure to set up</string> <string>No swap tool configured</string>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<spacer name="horizontalSpacer"> <spacer name="horizontalSpacer">
<property name="orientation"> <property name="orientation">
<enum>Qt::Orientation::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
<property name="sizeHint" stdset="0"> <property name="sizeHint" stdset="0">
<size> <size>

4
src/utils/config.cpp
View file

@ -143,10 +143,8 @@ static const QHash<Config::ConfigKey, ConfigDirective> configStrings = {
// Atomic // Atomic
{Config::rendezVous, {QS("rendezVous"), QStringList{"/dns4/atomicswaps.majesticbank.at/tcp/8888/p2p/12D3KooWKJUwP45K7fLbwGY1VM5V3U7LseU8EwJiAozUFrq5ihoF", {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/discover.unstoppableswap.net/tcp/8888/p2p/12D3KooWA6cnqJpVnreBVnoro8midDL9Lpzmg8oJPoAGi7YYaamE",
"/dns4/eratosthen.es/tcp/7798/p2p/12D3KooWAh7EXXa2ZyegzLGdjvj1W4G3EXrTGrf6trraoT1MEobs", "/dns4/eratosthen.es/tcp/7798/p2p/12D3KooWAh7EXXa2ZyegzLGdjvj1W4G3EXrTGrf6trraoT1MEobs"}}},
"/dns4/swap.sethforprivacy.com/tcp/8888/p2p/12D3KooWCULyZKuV9YEkb6BX8FuwajdvktSzmMg4U5ZX2uYZjHeu"}}},
{Config::swapPath, {QS("swapPath"), ""}}, {Config::swapPath, {QS("swapPath"), ""}},
{Config::operatingSystem, {QS("operatingSystem"), OS}}, {Config::operatingSystem, {QS("operatingSystem"), OS}},
{Config::pendingSwap, {QS("pendingSwap"), QStringList{}}}, {Config::pendingSwap, {QS("pendingSwap"), QStringList{}}},