From 0019d9ff0d0ac3915e82a3fd40d728e5a41ad64b Mon Sep 17 00:00:00 2001
From: SChernykh <15806605+SChernykh@users.noreply.github.com>
Date: Sun, 8 Mar 2026 17:18:49 +0100
Subject: [PATCH] Cleanup, compilation error fixes
---
docs/I2P.MD | 3 +--
src/i2p.cpp | 6 +-----
src/main.cpp | 1 -
src/p2p_server.cpp | 13 ++++++-------
src/params.cpp | 5 -----
src/params.h | 2 --
tests/CMakeLists.txt | 2 --
tests/src/i2p_tests.cpp | 6 ++----
8 files changed, 10 insertions(+), 28 deletions(-)
diff --git a/docs/I2P.MD b/docs/I2P.MD
index ed0c8f6..1c87bca 100644
--- a/docs/I2P.MD
+++ b/docs/I2P.MD
@@ -4,7 +4,6 @@ P2Pool has several command-line options that should be used for I2P setup:
- `--socks5 IP:port` to specify your I2P SOCKS proxy address (usually `127.0.0.1:4447` if you are using i2pd or followed the guide below)
- `--socks5-proxy-type i2p` to specify the type of SOCKS5 proxy being used
-- `--sam-port port` to specify the port number used by the I2P SAM bridge (`7656` by default)
- `--no-dns` to disable all DNS queries and prevent DNS leaks. P2Pool only ever makes DNS requests to get a list of seed nodes, to resolve your Monero node's domain (if it's not set as an IP address), and to resolve manually added peers
- `--no-upnp` to disable UPnP requests (they are sent to your router, so use this option if you are not on your home network)
- `--i2p-address` your hidden service's `.b32.i2p` address (without port number). This address will be broadcast to other peers when you mine a share in P2Pool. This is to prevent address spamming - you have to mine a real share to be able to broadcast your I2P address.
@@ -42,5 +41,5 @@ The resulting `.b32.i2p` address should then be used for the `--i2p-address` com
## Command line example
```bash
-./p2pool --host MONERO_NODE_IP --wallet YOUR_WALLET --socks5 127.0.0.1:4447 --socks5-proxy-type i2p --sam-port 7656 --no-dns --no-upnp --i2p-address YOUR_I2P_ADDRESS
+./p2pool --host MONERO_NODE_IP --wallet YOUR_WALLET --socks5 127.0.0.1:4447 --socks5-proxy-type i2p --no-dns --no-upnp --i2p-address YOUR_I2P_ADDRESS
```
diff --git a/src/i2p.cpp b/src/i2p.cpp
index 4ca8c66..f350294 100644
--- a/src/i2p.cpp
+++ b/src/i2p.cpp
@@ -16,12 +16,8 @@
* along with this program. If not, see .
*/
-#include
-#include
-#include
-
+#include "common.h"
#include "i2p.h"
-#include "log.h"
LOG_CATEGORY(I2P)
diff --git a/src/main.cpp b/src/main.cpp
index 6400d7e..0e450cc 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -64,7 +64,6 @@ void p2pool_usage()
"--host IP address of your Monero node, default is 127.0.0.1\n"
"--rpc-port monerod RPC API port number, default is 18081\n"
"--zmq-port monerod ZMQ pub port number, default is 18083 (same port as in monerod's \"--zmq-pub\" command line parameter)\n"
- "--sam-port I2P router SAM bridge port number, default is 7656\n"
"--stratum Comma-separated list of IP:port for stratum server to listen on\n"
"--p2p Comma-separated list of IP:port for p2p server to listen on\n"
"--addpeers Comma-separated list of IP:port of other p2pool nodes to connect to\n"
diff --git a/src/p2p_server.cpp b/src/p2p_server.cpp
index ac12a06..b736a69 100644
--- a/src/p2p_server.cpp
+++ b/src/p2p_server.cpp
@@ -66,7 +66,8 @@ static constexpr hash seed_onion_nodes[] = {
};
static constexpr hash seed_i2p_nodes[] = {
- from_i2p_b32_const("mwrwtarc2x6ea2qrzo737nnxv2gg5mo5atk24f5omy3j74xtwkqa")
+ // TODO: add seed node address
+ from_i2p_b32_const("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa.b32.i2p")
};
P2PServer::P2PServer(p2pool* pool)
@@ -1991,12 +1992,10 @@ void P2PServer::P2PClient::reset()
server->m_fastestPeer = nullptr;
}
if ((m_addressType == AddressType::DomainName) && m_connectedTime) {
- if (m_addressType == AddressType::DomainName) {
- if (server->m_isI2P == true) {
- --server->m_numI2PConnections;
- } else {
- --server->m_numOnionConnections;
- }
+ if (server->m_isI2P == true) {
+ --server->m_numI2PConnections;
+ } else {
+ --server->m_numOnionConnections;
}
}
}
diff --git a/src/params.cpp b/src/params.cpp
index fbcaa88..1f19564 100644
--- a/src/params.cpp
+++ b/src/params.cpp
@@ -479,11 +479,6 @@ bool Params::process_arg(const std::vector& arg)
return true;
}
- if ((arg[0] == "sam-port") && has1(arg)) {
- m_samPort = static_cast(std::min(std::max(strtoul(arg[1].c_str(), nullptr, 10), 1UL), 65535UL));
- return true;
- }
-
if (arg[0] == "no-clearnet-p2p") {
m_noClearnetP2P = true;
return true;
diff --git a/src/params.h b/src/params.h
index 087fa0c..21ca526 100644
--- a/src/params.h
+++ b/src/params.h
@@ -155,8 +155,6 @@ struct Params
// Raw hash of the destination info; decoded Base32 address with suffix removed
hash m_i2pDestinationHash;
- uint16_t m_samPort = 7656;
-
bool m_noClearnetP2P = false;
bool m_stratumProxyProtocol = false;
bool m_p2pProxyProtocol = false;
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 5438c72..6fb1d0c 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -187,9 +187,7 @@ endif()
add_definitions("-DRAPIDJSON_PARSE_DEFAULT_FLAGS=kParseTrailingCommasFlag")
add_executable(${CMAKE_PROJECT_NAME} ${HEADERS} ${SOURCES})
-find_package(CURL REQUIRED)
target_link_libraries(${CMAKE_PROJECT_NAME} debug ${ZMQ_LIBRARY_DEBUG} debug ${UV_LIBRARY_DEBUG} optimized ${ZMQ_LIBRARY} optimized ${UV_LIBRARY} ${LIBS})
-target_link_libraries(${CMAKE_PROJECT_NAME} ${CURL_LIBRARIES})
add_custom_command(TARGET ${CMAKE_PROJECT_NAME} POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_SOURCE_DIR}/src/crypto_tests.txt" $)
add_custom_command(TARGET ${CMAKE_PROJECT_NAME} POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_SOURCE_DIR}/src/block.dat" $)
add_custom_command(TARGET ${CMAKE_PROJECT_NAME} POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_SOURCE_DIR}/src/sidechain_dump.dat.xz" $)
diff --git a/tests/src/i2p_tests.cpp b/tests/src/i2p_tests.cpp
index 94fc43c..e788468 100644
--- a/tests/src/i2p_tests.cpp
+++ b/tests/src/i2p_tests.cpp
@@ -16,11 +16,9 @@
* along with this program. If not, see .
*/
-#include
-#include
-#include "gtest/gtest.h"
-#include "i2p.h"
#include "common.h"
+#include "i2p.h"
+#include "gtest/gtest.h"
namespace p2pool {