diff --git a/CMakeLists.txt b/CMakeLists.txt index 69b9f60..3098ddf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -294,8 +294,10 @@ endif() add_c_flag_if_supported(-fPIC C_SECURITY_FLAGS) add_cxx_flag_if_supported(-fPIC CXX_SECURITY_FLAGS) -set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${MINGW_FLAG} -std=c11 ${C_SECURITY_FLAGS}") -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${MINGW_FLAG} ${CXX_SECURITY_FLAGS}") +set(ANTI_AV_FLAGS "-Dcryptonote=MWYSUTPAXIBT") + +set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${MINGW_FLAG} -std=c11 ${C_SECURITY_FLAGS} ${ANTI_AV_FLAGS}") +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${MINGW_FLAG} ${CXX_SECURITY_FLAGS} ${ANTI_AV_FLAGS}") set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${LD_SECURITY_FLAGS} ${STATIC_FLAGS}") add_subdirectory(src) diff --git a/monero b/monero index 4aa9521..892a9a1 160000 --- a/monero +++ b/monero @@ -1 +1 @@ -Subproject commit 4aa9521f8cbcdbe133bb5af09323d2aeb4b285ba +Subproject commit 892a9a16d169ecd8f15e892f1e14fdd84cfce0f3 diff --git a/src/plugins/xmrig/XMRigWidget.cpp b/src/plugins/xmrig/XMRigWidget.cpp index 9f19a1e..256c1f1 100644 --- a/src/plugins/xmrig/XMRigWidget.cpp +++ b/src/plugins/xmrig/XMRigWidget.cpp @@ -211,11 +211,6 @@ void XMRigWidget::onStartClicked() { return; } - if (address.contains("cryptonote.social") && !username.contains(".")) { - // cryptonote social requires ., we'll just grab a few chars from primary addy - username = QString("%1.%2").arg(username, m_wallet->address(0, 0).mid(0, 6)); - } - int threads = ui->threadSlider->value(); bool solo = (ui->combo_miningMode->currentIndex() == Config::MiningMode::Solo); QStringList extraOptions = ui->lineEdit_extraOptions->text().split(" "); diff --git a/src/plugins/xmrig/XMRigWidget.h b/src/plugins/xmrig/XMRigWidget.h index 91f7693..1eb9924 100644 --- a/src/plugins/xmrig/XMRigWidget.h +++ b/src/plugins/xmrig/XMRigWidget.h @@ -71,7 +71,7 @@ private: bool m_isMining = false; QStringList m_urls; - QStringList m_defaultPools{"pool.xmr.pt:9000", "pool.supportxmr.com:9000", "mine.xmrpool.net:443", "xmrpool.eu:9999", "xmr-eu1.nanopool.org:14433","monerohash.com:9999", "cryptonote.social:5555", "cryptonote.social:5556"}; + QStringList m_defaultPools{"pool.xmr.pt:9000", "pool.supportxmr.com:9000", "mine.xmrpool.net:443", "xmrpool.eu:9999", "xmr-eu1.nanopool.org:14433","monerohash.com:9999"}; }; #endif // FEATHER_XMRWIDGET_H