diff --git a/scripts/release/images/ubuntu/prepare.sh b/scripts/release/images/ubuntu/prepare.sh index eb34698..deb1fe5 100755 --- a/scripts/release/images/ubuntu/prepare.sh +++ b/scripts/release/images/ubuntu/prepare.sh @@ -3,14 +3,14 @@ set -e # Software versions to install -_7ZIP_VERSION=2600 +_7ZIP_VERSION=2601 BINUTILS_VERSION=2_46 CLANG_VERSION=21.1.8 -CMAKE_VERSION=4.3.1 +CMAKE_VERSION=4.3.2 FREEBSD_VERSION=12.4 GCC_VERSION=15.2.0 GLIBC_VERSION=2.43 -LINUX_HEADERS_VERSION=6.19.12 +LINUX_HEADERS_VERSION=6.19.14 MACOSX_SDK_VERSION=26.1 OSXCROSS_VERSION=2bc739ebe45db5d72e176d2a4e1c7dd95464e8e2 MAKE_VERSION=4.4.1 @@ -18,12 +18,12 @@ MINGW_VERSION=14.0.0 XZ_VERSION=5.8.3 TAR_VERSION=1.35 -_7ZIP_SHA256="c74dc4a48492cde43f5fec10d53fb2a66f520e4a62a69d630c44cb22c477edc6" -CMAKE_SHA256="208d76804009cbe8ec9aea0aa052c857c6e59bd289b43b9941c99324dc78b1d8" +_7ZIP_SHA256="8ea0fc8a135e7b848e80a4116fe22dff56c8c4518dde1f43cce67f4e340b437a" +CMAKE_SHA256="791ae3604841ca03cb3889a3ad89165346e4b180ae3448efd4b0caa9ef46d245" FREEBSD_AARCH64_SHA256="6c401819bfb93e810c9f9aa670a1e4685f924df5e7e0c9c6397dd6c16c954fa2" FREEBSD_X86_64_SHA256="581c7edacfd2fca2bdf5791f667402d22fccd8a5e184635e0cac075564d57aa8" GLIBC_SHA256="d9c86c6b5dbddb43a3e08270c5844fc5177d19442cf5b8df4be7c07cd5fa3831" -HEADERS_SHA256="ce5c4f1205f9729286b569b037649591555f31ca1e03cc504bd3b70b8e58a8d5" +HEADERS_SHA256="cde8bf6739be4a0777fedbbba5330b8188c55680c45a922a4dfa289cbec6f185" MACOSX_SDK_SHA256="beee7212d265a6d2867d0236cc069314b38d5fb3486a6515734e76fa210c784c" MAKE_SHA256="dd16fb1d67bfab79a72f5e8390735c49e3e8e70b4945a15ab1f81ddb78658fb3" TAR_SHA256="4d62ff37342ec7aed748535323930c7cf94acf71c3591882b26a7ea50f3edc16" diff --git a/src/p2p_server.cpp b/src/p2p_server.cpp index 5926a7d..f653ce9 100644 --- a/src/p2p_server.cpp +++ b/src/p2p_server.cpp @@ -66,6 +66,8 @@ static constexpr hash seed_onion_nodes[] = { }; static constexpr hash seed_i2p_nodes[] = { + from_i2p_b32_const("p2pseeds2ggmpw62wdua6ll27awcndorshcg7nsbinc5xlhp6tqa.b32.i2p"), + from_i2p_b32_const("p2pse3irgfuks5eazbcwkcijsv6u3qtffl6zudct4t4kn2sinotq.b32.i2p"), from_i2p_b32_const("h6jrh53yvlvzqqyy7abzjp2t4kidtheee7e7nfbynecroc7yvbjq.b32.i2p") }; @@ -895,6 +897,10 @@ void P2PServer::load_peer_list() void P2PServer::load_monerod_peer_list() { + if (m_pool->params().m_noClearnetP2P) { + return; + } + const Params::Host& host = m_pool->current_host(); JSONRPCRequest::call(host.m_address, host.m_rpcPort, "/get_peer_list", host.m_rpcLogin, m_socks5Proxy, host.m_rpcSSL, host.m_rpcSSL_Fingerprint,